From ba55d0ede778f79ec2f24e462e30c31166594165 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:19:19 +0100
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/public/js/controllers/transaction.js | 38 ++------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 3e731759838..05f512f5c4a 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -798,51 +798,17 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 					}
 					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) {
+					selling_doctypes_for_tc.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) {
+					buying_doctypes_for_tc.includes(me.frm.doc.doctype) && !me.frm.doc.tc_name) {
 						me.frm.set_value("tc_name", company_doc.default_buying_terms);
 					}
 				}
-<<<<<<< HEAD
-=======
-
-				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);
-				}
-
-				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);
-				}
-
->>>>>>> 77b044f1a6 (fix: don't overwrite existing terms in transaction)
 				frappe.run_serially([
 					() => me.frm.script_manager.trigger("currency"),
 					() => me.update_item_tax_map(),