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

uom trigger issue in stock entry fixes #1712

Browse Source
This commit is contained in:
Nabin Hait 2014-05-29 18:36:58 +05:30
parent f3552ca737
commit 66cecf4824
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -365,17 +365,18 @@ class StockEntry(StockController):
ret.update(stock_and_rate) ret.update(stock_and_rate)
return ret return ret
def get_uom_details(self, arg = ''): def get_uom_details(self, args):
arg, ret = eval(arg), {} conversion_factor = frappe.db.get_value("UOM Conversion Detail", {"parent": args.get("item_code"),
uom = frappe.db.sql("""select conversion_factor from `tabUOM Conversion Detail` "uom": args.get("uom")}, "conversion_factor")
where parent = %s and uom = %s""", (arg['item_code'], arg['uom']), as_dict = 1)
if not uom or not flt(uom[0].conversion_factor): if not conversion_factor:
frappe.msgprint(_("UOM coversion factor required for UOM {0} in Item {1}").format(arg["uom"], arg["item_code"])) frappe.msgprint(_("UOM coversion factor required for UOM: {0} in Item: {1}")
.format(args.get("uom"), args.get("item_code")))
ret = {'uom' : ''} ret = {'uom' : ''}
else: else:
ret = { ret = {
'conversion_factor' : flt(uom[0]['conversion_factor']), 'conversion_factor' : flt(conversion_factor),
'transfer_qty' : flt(arg['qty']) * flt(uom[0]['conversion_factor']), 'transfer_qty' : flt(args.get("qty")) * flt(conversion_factor)
} }
return ret return ret