nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-08-21 23:34:38 +05:30
committed by GitHub
parent 196812017e
commit be01c4fafe
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/public/js/controllers/transaction.js
View File

@@ -551,32 +551,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
item_code(doc, cdt, cdn) { item_code(doc, cdt, cdn) {
var me = this; var me = this;
<<<<<<< HEAD
=======
frappe.flags.dialog_set = false; 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 item = frappe.get_doc(cdt, cdn);
var update_stock = 0, show_batch_dialog = 0; var update_stock = 0, show_batch_dialog = 0;