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

[fix] [minor] merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-09-12 14:02:37 +05:30
parent a7a06a77dd 6656acff52
commit b9c12eff17
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,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