From feb4038c0655b2e441251311691a1972fd4853e8 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 28 Apr 2025 11:36:24 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../purchase_invoice/purchase_invoice.json    |  9 ---------
 .../purchase_order/purchase_order.json        | 19 -------------------
 erpnext/public/scss/erpnext.scss              | 13 -------------
 3 files changed, 41 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index b4b4e403646..dfdcea5357a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1629,14 +1629,6 @@
    "fieldname": "update_outstanding_for_self",
    "fieldtype": "Check",
    "label": "Update Outstanding for Self"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "sender",
-   "fieldtype": "Data",
-   "label": "Sender",
-   "options": "Email"
   },
   {
    "fieldname": "dispatch_address_display",
@@ -1651,7 +1643,6 @@
    "label": "Select Dispatch Address ",
    "options": "Address",
    "print_hide": 1
->>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
   }
  ],
  "grid_page_length": 50,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index fad9f976c8a..7c9362ebaf9 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1271,20 +1271,6 @@
    "fieldtype": "Tab Break",
    "label": "Connections",
    "show_dashboard": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "advance_payment_status",
-   "fieldtype": "Select",
-   "hidden": 1,
-   "in_standard_filter": 1,
-   "label": "Advance Payment Status",
-   "no_copy": 1,
-   "oldfieldname": "status",
-   "oldfieldtype": "Select",
-   "options": "Not Initiated\nInitiated\nPartially Paid\nFully Paid",
-   "print_hide": 1
   },
   {
    "fieldname": "dispatch_address",
@@ -1299,7 +1285,6 @@
    "label": "Dispatch Address Details",
    "print_hide": 1,
    "read_only": 1
->>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
   }
  ],
  "grid_page_length": 50,
@@ -1307,11 +1292,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-20 16:03:31.611808",
-=======
  "modified": "2025-04-09 16:54:08.836106",
->>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",
diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss
index eab615db7e5..29a2696470f 100644
--- a/erpnext/public/scss/erpnext.scss
+++ b/erpnext/public/scss/erpnext.scss
@@ -590,19 +590,6 @@ body[data-route="pos"] {
 	justify-content: center;
 }
 
-<<<<<<< HEAD
 .frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
-=======
-.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor,
-.frappe-control[data-fieldname="address_display"] .ql-editor,
-.frappe-control[data-fieldname="shipping_address_display"] .ql-editor,
-.frappe-control[data-fieldname="shipping_address"] .ql-editor,
-.frappe-control[data-fieldname="dispatch_address_display"] .ql-editor,
-.frappe-control[data-fieldname="dispatch_address"] .ql-editor,
-.frappe-control[data-fieldname="source_address_display"] .ql-editor,
-.frappe-control[data-fieldname="target_address_display"] .ql-editor,
-.frappe-control[data-fieldname="billing_address_display"] .ql-editor,
-.frappe-control[data-fieldname="company_address_display"] .ql-editor {
->>>>>>> 8ccd7a3e61 (refactor: address field position)
 	white-space: normal;
 }