From 0d462745d28cf1a940350c9f271786d2119233b6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 6 Aug 2013 15:26:52 +0530 Subject: [PATCH 1/3] Update sales_invoice.js --- accounts/doctype/sales_invoice/sales_invoice.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index a8894c5918..55460c4680 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -25,10 +25,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte 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); - // } }, refresh: function(doc, dt, dn) { From d9f4d174d10724b66477acdaacdfd9074d360514 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 6 Aug 2013 15:28:55 +0530 Subject: [PATCH 2/3] [minor] [fix] --- accounts/doctype/sales_invoice/sales_invoice.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 55460c4680..bc36f58a48 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -25,6 +25,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte 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); + // } }, refresh: function(doc, dt, dn) { From c1541526d67fcf5aaafcac0db0312cbd08967687 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 6 Aug 2013 16:10:30 +0530 Subject: [PATCH 3/3] [fix] [minor] validate reserved warehouse --- stock/doctype/delivery_note/delivery_note.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py index 26b7f25e79..679d743d28 100644 --- a/stock/doctype/delivery_note/delivery_note.py +++ b/stock/doctype/delivery_note/delivery_note.py @@ -289,6 +289,9 @@ class DocType(SellingController): 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,