From 77b044f1a6e7273b21ce5a884429875b10d3bb2e Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 24 Jan 2024 01:48:10 +0100
Subject: [PATCH] fix: don't overwrite existing terms in transaction

---
 erpnext/public/js/controllers/transaction.js | 34 +++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 6406735763..525e6463fc 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -795,16 +795,34 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 						me.frm.set_value("letter_head", company_doc.default_letter_head);
 					}
 				}
-				let selling_doctypes_for_tc = ["Sales Invoice", "Quotation", "Sales Order", "Delivery Note"];
-				if (company_doc.default_selling_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
-				selling_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) {
+
+				if (
+					company_doc.default_selling_terms &&
+					frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
+					[
+						"Sales Invoice",
+						"Quotation",
+						"Sales Order",
+						"Delivery Note",
+					].includes(me.frm.doc.doctype) &&
+					!me.frm.doc.tc_name
+				) {
 					me.frm.set_value("tc_name", company_doc.default_selling_terms);
 				}
-				let buying_doctypes_for_tc = ["Request for Quotation", "Supplier Quotation", "Purchase Order",
-					"Material Request", "Purchase Receipt"];
-				// Purchase Invoice is excluded as per issue #3345
-				if (company_doc.default_buying_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
-				buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) {
+
+				if (
+					company_doc.default_buying_terms &&
+					frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
+					[
+						"Request for Quotation",
+						"Supplier Quotation",
+						"Purchase Order",
+						// Purchase Invoice is excluded as per issue #3345
+						"Material Request",
+						"Purchase Receipt",
+					].includes(me.frm.doc.doctype) &&
+					!me.frm.doc.tc_name
+				) {
 					me.frm.set_value("tc_name", company_doc.default_buying_terms);
 				}