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

Merge pull request #2870 from nabinhait/fix1

Browse Source 
Fixes
This commit is contained in:
Nabin Hait 2015-02-26 11:41:10 +05:30
commit 2ed025e62d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -59,6 +59,7 @@ class SalesInvoice(SellingController):
if cint(self.update_stock): if cint(self.update_stock):
self.validate_item_code() self.validate_item_code()
self.validate_warehouse()
self.update_current_stock() self.update_current_stock()
self.validate_delivery_note() self.validate_delivery_note()
@ -350,6 +351,11 @@ class SalesInvoice(SellingController):
if not d.item_code: if not d.item_code:
msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True) msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True)
def validate_warehouse(self):
for d in self.get('entries'):
if not d.warehouse:
frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
def validate_delivery_note(self): def validate_delivery_note(self):
for d in self.get("entries"): for d in self.get("entries"):
if d.delivery_note: if d.delivery_note:

3
erpnext/stock/get_item_details.py
View File

@ -171,7 +171,8 @@ def get_basic_details(args, item_doc):
# if default specified in item is for another company, fetch from company # if default specified in item is for another company, fetch from company
for d in [["Account", "income_account", "default_income_account"], ["Account", "expense_account", "default_expense_account"], for d in [["Account", "income_account", "default_income_account"], ["Account", "expense_account", "default_expense_account"],
["Cost Center", "cost_center", "cost_center"], ["Warehouse", "warehouse", ""]]: ["Cost Center", "cost_center", "cost_center"], ["Warehouse", "warehouse", ""]]:
if not out[d[1]] or args.company != frappe.db.get_value(d[0], out.get(d[1]), "company"): company = frappe.db.get_value(d[0], out.get(d[1]), "company")
if not out[d[1]] or (company and args.company != company):
out[d[1]] = frappe.db.get_value("Company", args.company, d[2]) if d[2] else None out[d[1]] = frappe.db.get_value("Company", args.company, d[2]) if d[2] else None
for fieldname in ("item_name", "item_group", "barcode", "brand", "stock_uom"): for fieldname in ("item_name", "item_group", "barcode", "brand", "stock_uom"):