nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-11-29 12:25:16 +05:30
parent 8e370876cc
commit 55e4951445
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/tests/test_subcontracting_controller.py
View File

@@ -957,12 +957,8 @@ def make_raw_materials():
"batch_number_series": "BAT.####", "batch_number_series": "BAT.####",
}, },
"Subcontracted SRM Item 4": {"has_serial_no": 1, "serial_no_series": "SRII.####"}, "Subcontracted SRM Item 4": {"has_serial_no": 1, "serial_no_series": "SRII.####"},
<<<<<<< HEAD
"Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRII.####"}, "Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRII.####"},
=======
"Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRIID.####"},
"Subcontracted SRM Item 8": {}, "Subcontracted SRM Item 8": {},
>>>>>>> fddf341f44 (fix: incorrect ordered qty for Subcontracting Order (#38415))
} }
for item, properties in raw_materials.items(): for item, properties in raw_materials.items():