nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
This commit is contained in:
Anand Doshi
2013-10-02 16:52:52 +05:30
parent ea9f845814 efa94ce1bf
commit fa228e9c9b
68 changed files with 1296 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stock/doctype/bin/bin.py
View File

@@ -15,7 +15,7 @@ class DocType:
self.doclist = doclist
def validate(self):
if not self.doc.stock_uom:
if self.doc.fields.get("__islocal") or not self.doc.stock_uom:
self.doc.stock_uom = webnotes.conn.get_value('Item', self.doc.item_code, 'stock_uom')
self.validate_mandatory()