chore: resolve merge conflicts

2026-05-01 12:38:27 +00:00 · 2026-05-01 04:04:52 +02:00
parent 919523a245
commit 21ef142ef2
4 changed files with 0 additions and 16 deletions
--- 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",
--- 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",
--- 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",
--- 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",