From 5d1aa4050d37304247a4f00a5a7e6e75c06b6e2f Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 13 Oct 2025 16:36:36 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/public/js/controllers/transaction.js | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 6f74f5c81d1..66c54ec6639 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1022,28 +1022,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } else { set_pricing(); } + }; -<<<<<<< HEAD - } - - if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && - ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'].includes(this.frm.doctype)) { - let is_drop_ship = me.frm.doc.items.some(item => item.delivered_by_supplier); - - if (!is_drop_ship) { - erpnext.utils.get_shipping_address(this.frm, function() { - set_party_account(set_pricing); - }); - } -======= if ( frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && ["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype) && !this.frm.doc.shipping_address ) { let is_drop_ship = me.frm.doc.items.some((item) => item.delivered_by_supplier); ->>>>>>> 0678638106 (fix: preserve address if present) + if (!is_drop_ship) { + erpnext.utils.get_shipping_address(this.frm, function() { + set_party_account(set_pricing); + }); + } } else { set_party_account(set_pricing); }