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

Merge branch 'master' of github.com:webnotes/erpnext into website-wip

Browse Source 
Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-09-12 17:03:21 +05:30
parent 3b44ce5fb4 16447005bf
commit 155d985cd4
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stock/doctype/item/item.py
View File

@@ -70,7 +70,6 @@ class DocType(DocListController):
matched=True
ref_uom = webnotes.conn.get_value("Stock Ledger Entry",
{"item_code": self.doc.name, "is_cancelled": "No"}, "stock_uom")
if ref_uom:
if cstr(ref_uom) != cstr(self.doc.stock_uom):
matched = False