From b4393bc03d68769f57678bb56a09baf7b4ec3dc0 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 21 Jan 2024 19:47:53 +0530 Subject: [PATCH 1/2] fix: added button to make serial / batch from Purchase Invoice --- .../purchase_invoice_item/purchase_invoice_item.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index 9cf4e4fd7c..26984d96ef 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -64,6 +64,7 @@ "warehouse", "from_warehouse", "quality_inspection", + "add_serial_batch_bundle", "serial_and_batch_bundle", "serial_no", "col_br_wh", @@ -913,12 +914,18 @@ "fieldtype": "Link", "label": "WIP Composite Asset", "options": "Asset" + }, + { + "depends_on": "eval:parent.update_stock === 1", + "fieldname": "add_serial_batch_bundle", + "fieldtype": "Button", + "label": "Add Serial / Batch No" } ], "idx": 1, "istable": 1, "links": [], - "modified": "2023-12-25 22:00:28.043555", + "modified": "2024-01-21 19:46:25.537861", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", From 63ffce58cce6c68c210572287024da9ca414aca9 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 21 Jan 2024 20:59:38 +0530 Subject: [PATCH 2/2] test: fixed test --- erpnext/manufacturing/doctype/work_order/test_work_order.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index aa5db57fa8..f6e9a07063 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -998,12 +998,6 @@ class TestWorkOrder(FrappeTestCase): make_job_card(wo_order.name, operations) job_card = frappe.db.get_value("Job Card", {"work_order": wo_order.name, "docstatus": 0}, "name") - update_job_card(job_card, 10, 2) - - stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10)) - for row in stock_entry.items: - if row.is_scrap_item: - self.assertEqual(row.qty, 2) def test_close_work_order(self): items = [