Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2013-08-06 17:01:52 +05:30
commit cf8e2cbde0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -25,9 +25,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
this.frm.set_df_property("debit_to", "print_hide", 0); this.frm.set_df_property("debit_to", "print_hide", 0);
} }
} }
// if(this.frm.doc.is_pos && this.frm.doc.docstatus===0) { // if(this.frm.doc.is_pos && this.frm.doc.docstatus===0) {
// cur_frm.cscript.toggle_pos(true); // cur_frm.cscript.toggle_pos(true);
// } // }
}, },

3
stock/doctype/delivery_note/delivery_note.py
View File

@ -289,6 +289,9 @@ class DocType(SellingController):
if d['reserved_qty'] < 0 : if d['reserved_qty'] < 0 :
# Reduce reserved qty from reserved warehouse mentioned in so # Reduce reserved qty from reserved warehouse mentioned in so
if not d["reserved_warehouse"]:
webnotes.throw(_("Reserved Warehouse is missing in Sales Order"))
args = { args = {
"item_code": d['item_code'], "item_code": d['item_code'],
"voucher_type": self.doc.doctype, "voucher_type": self.doc.doctype,