From 21ef142ef2e616b3f2d4f59825af51dbb2d3b3f0 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 1 May 2026 04:04:52 +0200
Subject: [PATCH] chore: resolve merge conflicts

---
 erpnext/accounts/doctype/pos_invoice/pos_invoice.json     | 4 ----
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ----
 erpnext/selling/doctype/sales_order/sales_order.json      | 4 ----
 erpnext/stock/doctype/delivery_note/delivery_note.json    | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
index dcf059c01f9..bf8713de63f 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -1641,11 +1641,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-28 06:06:14.283612",
-=======
  "modified": "2026-05-01 02:37:30.580568",
->>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 6baf0d258c1..2f8e538a601 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2367,11 +2367,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
-<<<<<<< HEAD
- "modified": "2026-04-28 13:08:19.849783",
-=======
  "modified": "2026-05-01 02:37:29.742764",
->>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7a871170492..60ae95172cd 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1765,11 +1765,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-28 06:30:35.902868",
-=======
  "modified": "2026-05-01 02:37:30.937916",
->>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 3df87b58f74..e11853ff6fa 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1466,11 +1466,7 @@
  "idx": 146,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-04-28 06:37:33.600775",
-=======
  "modified": "2026-05-01 02:37:31.430649",
->>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Note",