From a694a92df9c8133510e6c09021efbfc2cb98ff65 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 26 Feb 2024 13:19:32 +0530 Subject: [PATCH] chore: fix conflicts --- .../test_subcontracting_receipt.py | 253 ------------------ 1 file changed, 253 deletions(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py index 0862970c119..b05ed755c7f 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py @@ -594,259 +594,6 @@ class TestSubcontractingReceipt(FrappeTestCase): self.assertNotEqual(scr.supplied_items[0].rate, prev_cost) self.assertEqual(scr.supplied_items[0].rate, sr.items[0].valuation_rate) -<<<<<<< HEAD -======= - def test_subcontracting_receipt_for_batch_raw_materials_without_material_transfer(self): - set_backflush_based_on("BOM") - - fg_item = make_item(properties={"is_stock_item": 1, "is_sub_contracted_item": 1}).name - rm_item1 = make_item( - properties={ - "is_stock_item": 1, - "has_batch_no": 1, - "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - } - ).name - - bom = make_bom(item=fg_item, raw_materials=[rm_item1]) - - rm_batch_no = None - for row in bom.items: - se = make_stock_entry( - item_code=row.item_code, - qty=1, - target="_Test Warehouse 1 - _TC", - rate=300, - ) - - se.reload() - rm_batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle) - - service_items = [ - { - "warehouse": "_Test Warehouse - _TC", - "item_code": "Subcontracted Service Item 1", - "qty": 1, - "rate": 100, - "fg_item": fg_item, - "fg_item_qty": 1, - }, - ] - sco = get_subcontracting_order(service_items=service_items) - scr = make_subcontracting_receipt(sco.name) - scr.save() - scr.reload() - - bundle_doc = make_serial_batch_bundle( - { - "item_code": scr.supplied_items[0].rm_item_code, - "warehouse": "_Test Warehouse 1 - _TC", - "voucher_type": "Subcontracting Receipt", - "posting_date": today(), - "posting_time": nowtime(), - "qty": -1, - "batches": frappe._dict({rm_batch_no: 1}), - "type_of_transaction": "Outward", - "do_not_submit": True, - } - ) - - scr.supplied_items[0].serial_and_batch_bundle = bundle_doc.name - scr.submit() - scr.reload() - - batch_no = get_batch_from_bundle(scr.supplied_items[0].serial_and_batch_bundle) - self.assertEqual(batch_no, rm_batch_no) - self.assertEqual(scr.items[0].rm_cost_per_qty, 300) - self.assertEqual(scr.items[0].service_cost_per_qty, 100) - - def test_subcontracting_receipt_valuation_with_auto_created_serial_batch_bundle(self): - set_backflush_based_on("BOM") - - fg_item = make_item(properties={"is_stock_item": 1, "is_sub_contracted_item": 1}).name - rm_item1 = make_item( - properties={ - "is_stock_item": 1, - "has_batch_no": 1, - "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - } - ).name - - rm_item2 = make_item( - properties={ - "is_stock_item": 1, - "has_batch_no": 1, - "has_serial_no": 1, - "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - "serial_no_series": "BNSS-.####", - } - ).name - - rm_item3 = make_item( - properties={ - "is_stock_item": 1, - "has_serial_no": 1, - "serial_no_series": "BSSSS-.####", - } - ).name - - bom = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2, rm_item3]) - - rm_batch_no = None - for row in bom.items: - make_stock_entry( - item_code=row.item_code, - qty=1, - target="_Test Warehouse 1 - _TC", - rate=300, - ) - - make_stock_entry( - item_code=row.item_code, - qty=1, - target="_Test Warehouse 1 - _TC", - rate=400, - ) - - service_items = [ - { - "warehouse": "_Test Warehouse - _TC", - "item_code": "Subcontracted Service Item 1", - "qty": 1, - "rate": 100, - "fg_item": fg_item, - "fg_item_qty": 1, - }, - ] - sco = get_subcontracting_order(service_items=service_items) - - frappe.db.set_single_value( - "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1 - ) - scr = make_subcontracting_receipt(sco.name) - scr.save() - scr.submit() - scr.reload() - - for row in scr.supplied_items: - self.assertEqual(row.rate, 300.00) - self.assertTrue(row.serial_and_batch_bundle) - auto_created_serial_batch = frappe.db.get_value( - "Stock Ledger Entry", - {"voucher_no": scr.name, "voucher_detail_no": row.name}, - "auto_created_serial_and_batch_bundle", - ) - - self.assertTrue(auto_created_serial_batch) - - self.assertEqual(scr.items[0].rm_cost_per_qty, 900) - self.assertEqual(scr.items[0].service_cost_per_qty, 100) - frappe.db.set_single_value( - "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0 - ) - - def test_subcontracting_receipt_valuation_for_fg_with_auto_created_serial_batch_bundle(self): - set_backflush_based_on("BOM") - - fg_item = make_item( - properties={ - "is_stock_item": 1, - "is_sub_contracted_item": 1, - "has_batch_no": 1, - "create_new_batch": 1, - "batch_number_series": "BSSNGS-.####", - } - ).name - - rm_item1 = make_item( - properties={ - "is_stock_item": 1, - "has_batch_no": 1, - "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - } - ).name - - rm_item2 = make_item( - properties={ - "is_stock_item": 1, - "has_batch_no": 1, - "has_serial_no": 1, - "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - "serial_no_series": "BNSS-.####", - } - ).name - - rm_item3 = make_item( - properties={ - "is_stock_item": 1, - "has_serial_no": 1, - "serial_no_series": "BSSSS-.####", - } - ).name - - bom = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2, rm_item3]) - - rm_batch_no = None - for row in bom.items: - make_stock_entry( - item_code=row.item_code, - qty=1, - target="_Test Warehouse 1 - _TC", - rate=300, - ) - - service_items = [ - { - "warehouse": "_Test Warehouse - _TC", - "item_code": "Subcontracted Service Item 1", - "qty": 1, - "rate": 100, - "fg_item": fg_item, - "fg_item_qty": 1, - }, - ] - sco = get_subcontracting_order(service_items=service_items) - - frappe.db.set_single_value( - "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1 - ) - scr = make_subcontracting_receipt(sco.name) - scr.save() - scr.submit() - scr.reload() - - for row in scr.supplied_items: - self.assertEqual(row.rate, 300.00) - self.assertTrue(row.serial_and_batch_bundle) - auto_created_serial_batch = frappe.db.get_value( - "Stock Ledger Entry", - {"voucher_no": scr.name, "voucher_detail_no": row.name}, - "auto_created_serial_and_batch_bundle", - ) - - self.assertTrue(auto_created_serial_batch) - - self.assertEqual(scr.items[0].rm_cost_per_qty, 900) - self.assertEqual(scr.items[0].service_cost_per_qty, 100) - self.assertEqual(scr.items[0].rate, 1000) - valuation_rate = frappe.db.get_value( - "Stock Ledger Entry", - {"voucher_no": scr.name, "voucher_detail_no": scr.items[0].name}, - "valuation_rate", - ) - - self.assertEqual(flt(valuation_rate), flt(1000)) - - frappe.db.set_single_value( - "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0 - ) - ->>>>>>> a73ba2c0d2 (chore: remove microsecond from posting_datetime) def test_subcontracting_receipt_raw_material_rate(self): from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom