From 196812017ee5641d6a39bf33930fe3b2b33b5d2d Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 21 Aug 2025 23:24:35 +0530 Subject: [PATCH 1/2] fix: Serial Nos popup only appears 1 time (cherry picked from commit 5503d4b05b9621fabf262df63c35d9997262101a) # Conflicts: # erpnext/public/js/controllers/transaction.js --- erpnext/public/js/controllers/transaction.js | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 79d85c20a0b..22a23b041fd 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -551,6 +551,32 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe item_code(doc, cdt, cdn) { var me = this; +<<<<<<< HEAD +======= + frappe.flags.dialog_set = false; + + // Experimental: This will be removed once stability is achieved. + if (frappe.boot.sysdefaults.use_server_side_reactivity) { + var item = frappe.get_doc(cdt, cdn); + frappe.call({ + doc: doc, + method: "process_item_selection", + args: { + item_idx: item.idx, + }, + callback: function (r) { + if (!r.exc) { + me.frm.refresh_fields(); + } + }, + }); + } else { + me.process_item_selection(doc, cdt, cdn); + } + } + + process_item_selection(doc, cdt, cdn) { +>>>>>>> 5503d4b05b (fix: Serial Nos popup only appears 1 time) var item = frappe.get_doc(cdt, cdn); var update_stock = 0, show_batch_dialog = 0; From be01c4fafed0fc2d75e5d539eb047029b8be905f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 21 Aug 2025 23:34:38 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/public/js/controllers/transaction.js | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 22a23b041fd..e3680549cc0 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -551,32 +551,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe item_code(doc, cdt, cdn) { var me = this; -<<<<<<< HEAD -======= frappe.flags.dialog_set = false; - // Experimental: This will be removed once stability is achieved. - if (frappe.boot.sysdefaults.use_server_side_reactivity) { - var item = frappe.get_doc(cdt, cdn); - frappe.call({ - doc: doc, - method: "process_item_selection", - args: { - item_idx: item.idx, - }, - callback: function (r) { - if (!r.exc) { - me.frm.refresh_fields(); - } - }, - }); - } else { - me.process_item_selection(doc, cdt, cdn); - } - } - - process_item_selection(doc, cdt, cdn) { ->>>>>>> 5503d4b05b (fix: Serial Nos popup only appears 1 time) var item = frappe.get_doc(cdt, cdn); var update_stock = 0, show_batch_dialog = 0;