nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Removed old implementation of make_serialized_item function and updated its definition.
This commit is contained in:
rohitwaghchaure
2026-01-24 13:51:54 +05:30
committed by GitHub
parent a4b099e481
commit c351d6b1c0
1 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -2232,44 +2232,6 @@ class TestStockEntry(FrappeTestCase):
se.save() se.save()
se.submit() se.submit()
<<<<<<< HEAD
def make_serialized_item(**args):
=======
warehouse = "_Test Warehouse - _TC"
retain_sample_item = make_item(
"Retain Sample Item",
properties={
"is_stock_item": 1,
"retain_sample": 1,
"sample_quantity": 2,
"has_batch_no": 1,
"has_serial_no": 1,
"create_new_batch": 1,
"batch_number_series": "SAMPLE-RET-.#####",
"serial_no_series": "SAMPLE-RET-SN-.#####",
},
)
material_receipt = make_stock_entry(
item_code=retain_sample_item.item_code, target=warehouse, qty=10, purpose="Material Receipt"
)
source_sabb = frappe.get_doc(
"Serial and Batch Bundle", material_receipt.items[0].serial_and_batch_bundle
)
batch = source_sabb.entries[0].batch_no
serial_nos = [entry.serial_no for entry in source_sabb.entries]
sample_entry = frappe.get_doc(
move_sample_to_retention_warehouse(material_receipt.company, material_receipt.items)
)
sample_entry.submit()
target_sabb = frappe.get_doc("Serial and Batch Bundle", sample_entry.items[0].serial_and_batch_bundle)
self.assertEqual(sample_entry.items[0].transfer_qty, 2)
self.assertEqual(target_sabb.entries[0].batch_no, batch)
self.assertEqual([entry.serial_no for entry in target_sabb.entries], serial_nos[:2])
def test_raw_material_missing_validation(self): def test_raw_material_missing_validation(self):
original_value = frappe.db.get_single_value("Manufacturing Settings", "material_consumption") original_value = frappe.db.get_single_value("Manufacturing Settings", "material_consumption")
frappe.db.set_single_value("Manufacturing Settings", "material_consumption", 0) frappe.db.set_single_value("Manufacturing Settings", "material_consumption", 0)
@@ -2293,8 +2255,7 @@ def make_serialized_item(**args):
frappe.db.set_single_value("Manufacturing Settings", "material_consumption", original_value) frappe.db.set_single_value("Manufacturing Settings", "material_consumption", original_value)
def make_serialized_item(self, **args): def make_serialized_item(**args):
>>>>>>> f003b3c378 (fix: validation to check at-least one raw material for manufacture entry)
args = frappe._dict(args) args = frappe._dict(args)
se = frappe.copy_doc(test_records[0]) se = frappe.copy_doc(test_records[0])