commit d187a6ac4855cb71dc2ac8f3fe1ca109c4a64c9c
author Marica <maricadsouza221197@gmail.com> Mon Jul 06 23:35:37 2020 +0530
committer GitHub <noreply@github.com> Mon Jul 06 23:35:37 2020 +0530
tree 6f7764ca01d92303defb39c2df7676f33dbe841d
parent 4355d3cf0fc3de447d653775f2ca79f9812b98e5
parent 5f299a08bd38c1a080636724dc035bedafb9e4d7

Merge branch 'develop' into exploded-item-rate

erpnext/manufacturing/doctype/bom/bom.py

diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 7d31a1c..58b79d1 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -494,7 +494,7 @@
 					'image'			: d.image,
 					'stock_uom'		: d.stock_uom,
 					'stock_qty'		: flt(d.stock_qty),
-					'rate'			: d.base_rate,
+					'rate'			: flt(d.base_rate) / flt(d.conversion_factor),
 					'include_item_in_manufacturing': d.include_item_in_manufacturing
 				}))