fix: duplicate serial and batch bundle in stock entry and stock reco
(cherry picked from commit 732b6e1417)
This commit is contained in:
committed by
Mergify
parent
088aa94fa1
commit
c10c21157d
@@ -51,38 +51,7 @@ $.extend(erpnext, {
|
||||
},
|
||||
|
||||
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
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
// Deprecated in v15
|
||||
},
|
||||
|
||||
route_to_adjustment_jv: (args) => {
|
||||
|
||||
@@ -194,6 +194,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()
|
||||
|
||||
@@ -70,6 +70,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()
|
||||
|
||||
Reference in New Issue
Block a user