nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflicts

Browse Source
This commit is contained in:
barredterra
2026-05-01 04:04:52 +02:00
parent 919523a245
commit 21ef142ef2
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/pos_invoice/pos_invoice.json
View File

@@ -1641,11 +1641,7 @@
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:06:14.283612",
=======
"modified": "2026-05-01 02:37:30.580568", "modified": "2026-05-01 02:37:30.580568",
>>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Invoice", "name": "POS Invoice",

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -2367,11 +2367,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2026-04-28 13:08:19.849783",
=======
"modified": "2026-05-01 02:37:29.742764", "modified": "2026-05-01 02:37:29.742764",
>>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -1765,11 +1765,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:30:35.902868",
=======
"modified": "2026-05-01 02:37:30.937916", "modified": "2026-05-01 02:37:30.937916",
>>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -1466,11 +1466,7 @@
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:37:33.600775",
=======
"modified": "2026-05-01 02:37:31.430649", "modified": "2026-05-01 02:37:31.430649",
>>>>>>> c120cc7ed1 (fix: add missing fields in set_currency_labels (#54689))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",