From 1093e0d46f4e591c11ef4794f8973b2118246a80 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 13 Mar 2024 12:16:44 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/sales_invoice/sales_invoice.json     | 15 ---------------
 erpnext/controllers/accounts_controller.py       | 16 ----------------
 erpnext/patches.txt                              |  3 ---
 3 files changed, 34 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 7cb9a4abfa7..8fd897bddf1 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2163,16 +2163,6 @@
    "fieldname": "update_billed_amount_in_delivery_note",
    "fieldtype": "Check",
    "label": "Update Billed Amount in Delivery Note"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "0",
-   "depends_on": "loyalty_program",
-   "fieldname": "dont_create_loyalty_points",
-   "fieldtype": "Check",
-   "label": "Don't Create Loyalty Points",
-   "no_copy": 1
   },
   {
    "default": "1",
@@ -2181,7 +2171,6 @@
    "fieldname": "update_outstanding_for_self",
    "fieldtype": "Check",
    "label": "Update Outstanding for Self"
->>>>>>> 2cefe2a20e (refactor: checkbox to toggle always standalone credit note)
   }
  ],
  "icon": "fa fa-file-text",
@@ -2194,11 +2183,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
-<<<<<<< HEAD
- "modified": "2023-11-23 16:56:29.679499",
-=======
  "modified": "2024-03-11 14:20:34.874192",
->>>>>>> 2cefe2a20e (refactor: checkbox to toggle always standalone credit note)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index ea529005051..f0603a0ff69 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -218,21 +218,6 @@ class AccountsController(TransactionBase):
 				)
 
 			if self.get("is_return") and self.get("return_against") and not self.get("is_pos"):
-<<<<<<< HEAD
-				document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
-				frappe.msgprint(
-					_(
-						"{0} will be treated as a standalone {0}. If you want {1}'s outstanding to be updated, uncheck {2} checkbox. <br><br> Or you can use {3} tool to reconcile against {1} later."
-					).format(
-						document_type,
-<<<<<<< HEAD
-						get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
-=======
->>>>>>> adf13a19c4 (chore: update popup message)
-						get_link_to_form(self.doctype, self.get("return_against")),
-						frappe.bold("Update Outstanding for Self"),
-						get_link_to_form("Payment Reconciliation"),
-=======
 				if self.get("update_outstanding_for_self"):
 					document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
 					frappe.msgprint(
@@ -244,7 +229,6 @@ class AccountsController(TransactionBase):
 							frappe.bold("Update Outstanding for Self"),
 							get_link_to_form("Payment Reconciliation"),
 						)
->>>>>>> 445d2acf50 (chore: better popup message)
 					)
 
 			pos_check_field = "is_pos" if self.doctype == "Sales Invoice" else "is_paid"
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 67d4693fb5a..c024c86c5e5 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -353,11 +353,8 @@ erpnext.patches.v14_0.update_zero_asset_quantity_field
 execute:frappe.db.set_single_value("Buying Settings", "project_update_frequency", "Each Transaction")
 erpnext.patches.v14_0.update_total_asset_cost_field
 erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool
-<<<<<<< HEAD
 erpnext.patches.v15_0.allow_on_submit_dimensions_for_repostable_doctypes
-=======
 erpnext.patches.v14_0.update_flag_for_return_invoices
->>>>>>> 849f478894 (chore: patch for updating flag in Cr/Dr notes)
 # below migration patch should always run last
 erpnext.patches.v14_0.migrate_gl_to_payment_ledger
 erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20