Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index a8894c5..bc36f58 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -25,9 +25,8 @@
this.frm.set_df_property("debit_to", "print_hide", 0);
}
}
-
// if(this.frm.doc.is_pos && this.frm.doc.docstatus===0) {
- // cur_frm.cscript.toggle_pos(true);
+ // cur_frm.cscript.toggle_pos(true);
// }
},
diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py
index 26b7f25..679d743 100644
--- a/stock/doctype/delivery_note/delivery_note.py
+++ b/stock/doctype/delivery_note/delivery_note.py
@@ -289,6 +289,9 @@
if d['reserved_qty'] < 0 :
# Reduce reserved qty from reserved warehouse mentioned in so
+ if not d["reserved_warehouse"]:
+ webnotes.throw(_("Reserved Warehouse is missing in Sales Order"))
+
args = {
"item_code": d['item_code'],
"voucher_type": self.doc.doctype,