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

deal zero division possibility (#11098)

Browse Source
This commit is contained in:
tundebabzy 2017-10-09 08:14:24 +01:00 committed by Nabin Hait
parent e181dd4c24
commit 2622d370c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -128,7 +128,7 @@ class BOM(WebsiteGenerator):
'uom' : item and args['stock_uom'] or '', 'uom' : item and args['stock_uom'] or '',
'conversion_factor': 1, 'conversion_factor': 1,
'bom_no' : args['bom_no'], 'bom_no' : args['bom_no'],
'rate' : rate / self.conversion_rate, 'rate' : rate / self.conversion_rate if self.conversion_rate else rate,
'qty' : args.get("qty") or args.get("stock_qty") or 1, 'qty' : args.get("qty") or args.get("stock_qty") or 1,
'stock_qty' : args.get("qty") or args.get("stock_qty") or 1, 'stock_qty' : args.get("qty") or args.get("stock_qty") or 1,
'base_rate' : rate 'base_rate' : rate
@ -374,7 +374,7 @@ class BOM(WebsiteGenerator):
if d.workstation: if d.workstation:
if not d.hour_rate: if not d.hour_rate:
hour_rate = flt(frappe.db.get_value("Workstation", d.workstation, "hour_rate")) hour_rate = flt(frappe.db.get_value("Workstation", d.workstation, "hour_rate"))
d.hour_rate = hour_rate / flt(self.conversion_rate) d.hour_rate = hour_rate / flt(self.conversion_rate) if self.conversion_rate else hour_rate
if d.hour_rate and d.time_in_mins: if d.hour_rate and d.time_in_mins:
d.base_hour_rate = flt(d.hour_rate) * flt(self.conversion_rate) d.base_hour_rate = flt(d.hour_rate) * flt(self.conversion_rate)