nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-02 17:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflicts

Browse Source
This commit is contained in:
Shllokkk
2026-07-21 17:03:41 +05:30
parent f0e24e2f53
commit 81e865f6c7
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2729,36 +2729,6 @@ class TestStockEntry(FrappeTestCase):
# delete naming rule
frappe.delete_doc("Document Naming Rule", qc_naming_rule.name)
<<<<<<< HEAD
def make_serialized_item(**args):
=======
frappe.set_value("UOM", "Nos", "must_be_whole_number", 0)
fg_item = make_item("FG Item", properties={"is_stock_item": 1}).name
rm_item = make_item("RM Item", properties={"is_stock_item": 1}).name
scrap_item = make_item("Scrap Item", properties={"is_stock_item": 1}).name
warehouse = "_Test Warehouse - _TC"
make_stock_entry(item_code=rm_item, target=warehouse, qty=5, rate=10, purpose="Material Receipt")
bom_no = make_bom(
item=fg_item, raw_materials=[rm_item], scrap_items=[scrap_item], process_loss_percentage=10
).name
se = make_stock_entry(item_code=fg_item, qty=5, purpose="Manufacture", do_not_save=True)
se.from_bom = 1
se.bom_no = bom_no
se.fg_completed_qty = 5
se.from_warehouse = warehouse
se.to_warehouse = "_Test Warehouse 1 - _TC"
se.get_items()
se.save()
se.reload()
self.assertEqual(se.items[1].qty, 4.5)
self.assertEqual(se.items[1].amount, 45)
self.assertEqual(se.items[2].qty, 4.5)
self.assertEqual(se.items[2].amount, 5)
def test_process_loss_percentage_resyncs_from_qty(self):
# changing fg qty recomputes process_loss_qty
se = frappe.new_doc("Stock Entry")
@@ -2782,8 +2752,7 @@ def make_serialized_item(**args):
self.assertEqual(se.process_loss_qty, 50)
def make_serialized_item(self, **args):
>>>>>>> beeffee8f9 (fix: sync process loss percentage when fg qty changes)
def make_serialized_item(**args):
args = frappe._dict(args)
se = frappe.copy_doc(test_records[0])