From 82cfafb6100e7fbb4605f0999839a65fd97d60d2 Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Tue, 4 Feb 2025 23:39:29 +0530 Subject: [PATCH 1/4] fix: default payment terms template selected while duplicating (cherry picked from commit 18127603fe837af8856565a2deddc9d3e42ef243) --- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 4a8c8ad82a7..4972a452d9b 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -311,7 +311,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. account: this.frm.doc.credit_to, price_list: this.frm.doc.buying_price_list, fetch_payment_terms_template: cint( - (this.frm.doc.is_return == 0) & !this.frm.doc.ignore_default_payment_terms_template + (this.frm.doc.is_return == 0) & + !this.frm.doc.ignore_default_payment_terms_template & + (this.frm.doc.__run_link_triggers !== false) ), }, function () { From d0ff91b0e040d0ff31c795cc3709ffa48d8a2c2f Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Wed, 5 Feb 2025 00:06:48 +0530 Subject: [PATCH 2/4] fix: payment schedule table is empty while duplicating record (cherry picked from commit fb3f08a44139d12b0d205e3f019cedcca923397a) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js --- .../purchase_invoice/purchase_invoice.js | 23 ++++++++++++++++--- erpnext/public/js/controllers/transaction.js | 2 ++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 4972a452d9b..e0a09f4f1de 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -302,7 +302,15 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return; +<<<<<<< HEAD erpnext.utils.get_party_details(this.frm, "erpnext.accounts.party.get_party_details", +======= + let payment_terms_template = this.frm.doc.payment_terms_template; + + erpnext.utils.get_party_details( + this.frm, + "erpnext.accounts.party.get_party_details", +>>>>>>> fb3f08a441 (fix: payment schedule table is empty while duplicating record) { posting_date: this.frm.doc.posting_date, bill_date: this.frm.doc.bill_date, @@ -311,9 +319,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. account: this.frm.doc.credit_to, price_list: this.frm.doc.buying_price_list, fetch_payment_terms_template: cint( - (this.frm.doc.is_return == 0) & - !this.frm.doc.ignore_default_payment_terms_template & - (this.frm.doc.__run_link_triggers !== false) + (this.frm.doc.is_return == 0) & !this.frm.doc.ignore_default_payment_terms_template ), }, function () { @@ -322,7 +328,18 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. me.frm.doc.tax_withholding_category = me.frm.supplier_tds; me.frm.set_df_property("apply_tds", "read_only", me.frm.supplier_tds ? 0 : 1); me.frm.set_df_property("tax_withholding_category", "hidden", me.frm.supplier_tds ? 0 : 1); +<<<<<<< HEAD }) +======= + + // while duplicating, don't change payment terms + if (me.frm.doc.__run_link_triggers === false) { + me.frm.set_value("payment_terms_template", payment_terms_template); + me.frm.refresh_field("payment_terms_template"); + } + } + ); +>>>>>>> fb3f08a441 (fix: payment schedule table is empty while duplicating record) } apply_tds(frm) { diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index a424d01489d..623f331d5d0 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -2217,6 +2217,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } payment_terms_template() { + console.log("payment_terms_template outside"); + var me = this; const doc = this.frm.doc; if(doc.payment_terms_template && doc.doctype !== 'Delivery Note' && !doc.is_return) { From 95903c9f968b4ce62a982b2d9706ee33c869505a Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Wed, 5 Feb 2025 00:09:16 +0530 Subject: [PATCH 3/4] refactor: remove log (cherry picked from commit bfc01441a073c9e5658c2723b76235f5e8ed237f) --- erpnext/public/js/controllers/transaction.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 623f331d5d0..a424d01489d 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -2217,8 +2217,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } payment_terms_template() { - console.log("payment_terms_template outside"); - var me = this; const doc = this.frm.doc; if(doc.payment_terms_template && doc.doctype !== 'Delivery Note' && !doc.is_return) { From 49787b6d84e41487330296889dad86dba51364d9 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 5 Feb 2025 15:22:13 +0530 Subject: [PATCH 4/4] chore: resolve conflicts --- .../accounts/doctype/purchase_invoice/purchase_invoice.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index e0a09f4f1de..11bfc5e8dde 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -302,15 +302,11 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return; -<<<<<<< HEAD - erpnext.utils.get_party_details(this.frm, "erpnext.accounts.party.get_party_details", -======= let payment_terms_template = this.frm.doc.payment_terms_template; erpnext.utils.get_party_details( this.frm, "erpnext.accounts.party.get_party_details", ->>>>>>> fb3f08a441 (fix: payment schedule table is empty while duplicating record) { posting_date: this.frm.doc.posting_date, bill_date: this.frm.doc.bill_date, @@ -328,9 +324,6 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. me.frm.doc.tax_withholding_category = me.frm.supplier_tds; me.frm.set_df_property("apply_tds", "read_only", me.frm.supplier_tds ? 0 : 1); me.frm.set_df_property("tax_withholding_category", "hidden", me.frm.supplier_tds ? 0 : 1); -<<<<<<< HEAD - }) -======= // while duplicating, don't change payment terms if (me.frm.doc.__run_link_triggers === false) { @@ -339,7 +332,6 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. } } ); ->>>>>>> fb3f08a441 (fix: payment schedule table is empty while duplicating record) } apply_tds(frm) {