From b4b6c8e2620f36212da55206aa3ff2c9e9fe779c Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Tue, 29 Jun 2021 17:58:39 +0530 Subject: [PATCH] Revert "fix: Test" This reverts commit feed97ec53767e777b8a638d5a8e3ffc0a04e500. --- ...tracted_raw_materials_to_be_transferred.py | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py index f1784925c57..2448e17c50f 100644 --- a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py +++ b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py @@ -60,7 +60,6 @@ def transfer_subcontracted_raw_materials(po): rm_item = [ { 'name': po.supplied_items[0].name, -<<<<<<< HEAD 'item_code': item_1, 'rm_item_code': item_1, 'item_name': item_1, @@ -68,20 +67,10 @@ def transfer_subcontracted_raw_materials(po): 'warehouse': '_Test Warehouse - _TC', 'rate': 100, 'amount': 100 * transfer_qty_map[item_1], -======= - 'item_code': '_Test Item Home Desktop 100', - 'rm_item_code': '_Test Item Home Desktop 100', - 'item_name': '_Test Item Home Desktop 100', - 'qty': 2, - 'warehouse': '_Test Warehouse - _TC', - 'rate': 100, - 'amount': 200, ->>>>>>> c4d851e45f (fix: Test) 'stock_uom': 'Nos' }, { 'name': po.supplied_items[1].name, -<<<<<<< HEAD 'item_code': item_2, 'rm_item_code': item_2, 'item_name': item_2, @@ -89,15 +78,6 @@ def transfer_subcontracted_raw_materials(po): 'warehouse': '_Test Warehouse - _TC', 'rate': 100, 'amount': 100 * transfer_qty_map[item_2], -======= - 'item_code': '_Test Item', - 'rm_item_code': '_Test Item', - 'item_name': '_Test Item', - 'qty': 1, - 'warehouse': '_Test Warehouse - _TC', - 'rate': 100, - 'amount': 100, ->>>>>>> c4d851e45f (fix: Test) 'stock_uom': 'Nos' } ]