From 9de2616b7505f9d2bb1f50ce76836a50cb6f16c7 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 17 Apr 2024 12:43:31 +0530 Subject: [PATCH] fix: duplicate serial and batch bundle in stock entry and stock reco --- erpnext/public/js/utils.js | 20 ++----------------- .../stock/doctype/stock_entry/stock_entry.py | 1 + .../stock_reconciliation.py | 1 + 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 245ed77fe7..bb93fddafd 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -62,24 +62,8 @@ $.extend(erpnext, { return cint(frappe.boot.sysdefaults.allow_stale); }, - setup_serial_or_batch_no: function() { - let grid_row = cur_frm.open_grid_row(); - if (!grid_row || !grid_row.grid_form.fields_dict.serial_no || - grid_row.grid_form.fields_dict.serial_no.get_status() !== "Write") return; - - frappe.model.get_value('Item', {'name': grid_row.doc.item_code}, - ['has_serial_no', 'has_batch_no'], ({has_serial_no, has_batch_no}) => { - Object.assign(grid_row.doc, {has_serial_no, has_batch_no}); - - if (has_serial_no) { - attach_selector_button(__("Add Serial No"), - grid_row.grid_form.fields_dict.serial_no.$wrapper, this, grid_row); - } else if (has_batch_no) { - attach_selector_button(__("Pick Batch No"), - grid_row.grid_form.fields_dict.batch_no.$wrapper, this, grid_row); - } - } - ); + setup_serial_or_batch_no: function () { + // Deprecated in v15 }, route_to_adjustment_jv: (args) => { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index a5d90d5278..e9a74c82de 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -197,6 +197,7 @@ class StockEntry(StockController): if self.work_order: self.pro_doc = frappe.get_doc("Work Order", self.work_order) + self.validate_duplicate_serial_and_batch_bundle("items") self.validate_posting_time() self.validate_purpose() self.validate_item() diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 49c20fda4f..539d93c8c2 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -43,6 +43,7 @@ class StockReconciliation(StockController): self.validate_posting_time() self.set_current_serial_and_batch_bundle() self.set_new_serial_and_batch_bundle() + self.validate_duplicate_serial_and_batch_bundle("items") self.remove_items_with_no_change() self.validate_data() self.validate_expense_account() -- GitLab