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

fix: bom valuation - handle lack of LPP (#30454)

Browse Source
This commit is contained in:
Ankush Menat 2022-03-28 18:18:23 +05:30 committed by GitHub
parent 77c36f6d22
commit 8dff4d66a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -780,8 +780,8 @@ def get_bom_item_rate(args, bom_doc):
if bom_doc.rm_cost_as_per == 'Valuation Rate': if bom_doc.rm_cost_as_per == 'Valuation Rate':
rate = get_valuation_rate(args) * (args.get("conversion_factor") or 1) rate = get_valuation_rate(args) * (args.get("conversion_factor") or 1)
elif bom_doc.rm_cost_as_per == 'Last Purchase Rate': elif bom_doc.rm_cost_as_per == 'Last Purchase Rate':
rate = ( flt(args.get('last_purchase_rate')) \ rate = (flt(args.get('last_purchase_rate'))
or frappe.db.get_value("Item", args['item_code'], "last_purchase_rate")) \ or flt(frappe.db.get_value("Item", args['item_code'], "last_purchase_rate"))) \
* (args.get("conversion_factor") or 1) * (args.get("conversion_factor") or 1)
elif bom_doc.rm_cost_as_per == "Price List": elif bom_doc.rm_cost_as_per == "Price List":
if not bom_doc.buying_price_list: if not bom_doc.buying_price_list:
@ -805,7 +805,7 @@ def get_bom_item_rate(args, bom_doc):
price_list_data = get_price_list_rate(bom_args, item_doc) price_list_data = get_price_list_rate(bom_args, item_doc)
rate = price_list_data.price_list_rate rate = price_list_data.price_list_rate
return rate return flt(rate)
def get_valuation_rate(args): def get_valuation_rate(args):
""" Get weighted average of valuation rate from all warehouses """ """ Get weighted average of valuation rate from all warehouses """

22
erpnext/manufacturing/doctype/bom/test_bom.py
View File

@ -509,6 +509,27 @@ class TestBOM(FrappeTestCase):
self.assertEqual(bom.quality_inspection_template, None) self.assertEqual(bom.quality_inspection_template, None)
def test_bom_pricing_based_on_lpp(self):
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
parent = frappe.generate_hash(length=10)
child = frappe.generate_hash(length=10)
bom_tree = {parent: {child: {}}
}
bom = create_nested_bom(bom_tree, prefix="")
# add last purchase price
make_purchase_receipt(item_code=child, rate=42)
bom = frappe.copy_doc(bom)
bom.docstatus = 0
bom.amended_from = None
bom.rm_cost_as_per = "Last Purchase Rate"
bom.conversion_rate = 1
bom.save()
bom.submit()
self.assertEqual(bom.items[0].rate, 42)
def get_default_bom(item_code="_Test FG Item 2"): def get_default_bom(item_code="_Test FG Item 2"):
return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1}) return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1})
@ -558,6 +579,7 @@ def create_nested_bom(tree, prefix="_Test bom "):
bom = frappe.get_doc(doctype="BOM", item=bom_item_code) bom = frappe.get_doc(doctype="BOM", item=bom_item_code)
for child_item in child_items.keys(): for child_item in child_items.keys():
bom.append("items", {"item_code": prefix + child_item}) bom.append("items", {"item_code": prefix + child_item})
bom.company = "_Test Company"
bom.currency = "INR" bom.currency = "INR"
bom.insert() bom.insert()
bom.submit() bom.submit()