From 499fbe90dc16eaf4c80ea7f4d79ab891afdde19d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 5 Sep 2017 15:16:32 +0530 Subject: [PATCH] Test case fixed for multi-currency and multi-uom BOM (#10679) --- erpnext/manufacturing/doctype/bom/test_bom.py | 3 +++ .../doctype/production_order/test_production_order.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py index b2684e342a..8bd98b2a78 100644 --- a/erpnext/manufacturing/doctype/bom/test_bom.py +++ b/erpnext/manufacturing/doctype/bom/test_bom.py @@ -93,6 +93,8 @@ class TestBOM(unittest.TestCase): def test_bom_cost_multi_uom_multi_currency(self): for item_code, rate in (("_Test Item", 3600), ("_Test Item Home Desktop Manufactured", 3000)): + frappe.db.sql("delete from `tabItem Price` where price_list='_Test Price List' and item_code=%s", + item_code) item_price = frappe.new_doc("Item Price") item_price.price_list = "_Test Price List" item_price.item_code = item_code @@ -100,6 +102,7 @@ class TestBOM(unittest.TestCase): item_price.insert() bom = frappe.copy_doc(test_records[2]) + bom.set_rate_of_sub_assembly_item_based_on_bom = 0 bom.rm_cost_as_per = "Price List" bom.buying_price_list = "_Test Price List" bom.items[0].uom = "_Test UOM 1" diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py index 1d555f7c0c..002f03b920 100644 --- a/erpnext/manufacturing/doctype/production_order/test_production_order.py +++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py @@ -92,7 +92,8 @@ class TestProductionOrder(unittest.TestCase): self.assertEqual(prod_order.name, time_sheet_doc.production_order) - self.assertEqual((prod_order.qty - d.completed_qty), sum([d.completed_qty for d in time_sheet_doc.time_logs])) + self.assertEqual((prod_order.qty - d.completed_qty), + sum([d.completed_qty for d in time_sheet_doc.time_logs])) manufacturing_settings = frappe.get_doc({ "doctype": "Manufacturing Settings", @@ -106,7 +107,7 @@ class TestProductionOrder(unittest.TestCase): self.assertEqual(prod_order.operations[0].completed_qty, prod_order.qty) self.assertEqual(prod_order.operations[0].actual_operation_time, 60) - self.assertEqual(prod_order.operations[0].actual_operating_cost, 100) + self.assertEqual(prod_order.operations[0].actual_operating_cost, 6000) time_sheet_doc1 = make_timesheet(prod_order.name, prod_order.company) self.assertEqual(len(time_sheet_doc1.get('time_logs')), 0)