nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: Test"

Browse Source 
This reverts commit feed97ec53.
This commit is contained in:
GangaManoj
2021-06-29 17:58:39 +05:30
parent d748e7f49c
commit b4b6c8e262
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
View File

@@ -60,7 +60,6 @@ def transfer_subcontracted_raw_materials(po):
rm_item = [ rm_item = [
{ {
'name': po.supplied_items[0].name, 'name': po.supplied_items[0].name,
<<<<<<< HEAD
'item_code': item_1, 'item_code': item_1,
'rm_item_code': item_1, 'rm_item_code': item_1,
'item_name': item_1, 'item_name': item_1,
@@ -68,20 +67,10 @@ def transfer_subcontracted_raw_materials(po):
'warehouse': '_Test Warehouse - _TC', 'warehouse': '_Test Warehouse - _TC',
'rate': 100, 'rate': 100,
'amount': 100 * transfer_qty_map[item_1], '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' 'stock_uom': 'Nos'
}, },
{ {
'name': po.supplied_items[1].name, 'name': po.supplied_items[1].name,
<<<<<<< HEAD
'item_code': item_2, 'item_code': item_2,
'rm_item_code': item_2, 'rm_item_code': item_2,
'item_name': item_2, 'item_name': item_2,
@@ -89,15 +78,6 @@ def transfer_subcontracted_raw_materials(po):
'warehouse': '_Test Warehouse - _TC', 'warehouse': '_Test Warehouse - _TC',
'rate': 100, 'rate': 100,
'amount': 100 * transfer_qty_map[item_2], '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' 'stock_uom': 'Nos'
} }
] ]