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) {