chore: resolve conflicts

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -310,16 +310,11 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				party_type: "Supplier",
 				account: this.frm.doc.credit_to,
 				price_list: this.frm.doc.buying_price_list,
-<<<<<<< HEAD
-				fetch_payment_terms_template: cint(!this.frm.doc.ignore_default_payment_terms_template)
-			}, function() {
-=======
 				fetch_payment_terms_template: cint(
 					(this.frm.doc.is_return == 0) & !this.frm.doc.ignore_default_payment_terms_template
 				),
 			},
 			function () {
->>>>>>> 8b700eadc7 (fix: do not set payment terms for return invoices)
 				me.apply_pricing_rule();
 				me.frm.doc.apply_tds = me.frm.supplier_tds ? 1 : 0;
 				me.frm.doc.tax_withholding_category = me.frm.supplier_tds;

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -1613,11 +1613,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-09-11 12:59:19.130593",
-=======
  "modified": "2024-10-25 18:13:01.944477",
->>>>>>> 912e1e3f3d (fix: hide payment terms for return and paid purchase invoices)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -280,17 +280,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				party_type: "Customer",
 				account: this.frm.doc.debit_to,
 				price_list: this.frm.doc.selling_price_list,
-<<<<<<< HEAD
-				pos_profile: pos_profile
-			}, function() {
-=======
 				pos_profile: pos_profile,
 				fetch_payment_terms_template: cint(
 					(this.frm.doc.is_return == 0) & !this.frm.doc.ignore_default_payment_terms_template
 				),
 			},
 			function () {
->>>>>>> 8b700eadc7 (fix: do not set payment terms for return invoices)
 				me.apply_pricing_rule();
 			});