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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-05-05 15:47:39 +05:30
parent f69b8d7e2d
commit fc1b1ca5e2
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -535,8 +535,6 @@
"fieldtype": "Select", "fieldtype": "Select",
"label": "Posting Date Inheritance for Exchange Gain / Loss", "label": "Posting Date Inheritance for Exchange Gain / Loss",
"options": "Invoice\nPayment\nReconciliation Date" "options": "Invoice\nPayment\nReconciliation Date"
<<<<<<< HEAD
=======
}, },
{ {
"fieldname": "column_break_xrnd", "fieldname": "column_break_xrnd",
@@ -565,7 +563,6 @@
"fieldname": "legacy_section", "fieldname": "legacy_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Legacy Fields" "label": "Legacy Fields"
>>>>>>> 66fd639b52 (refactor: configurable fetch method for AR / AP report)
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -573,11 +570,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-01-23 13:15:44.077853",
=======
"modified": "2025-05-05 12:29:38.302027", "modified": "2025-05-05 12:29:38.302027",
>>>>>>> 66fd639b52 (refactor: configurable fetch method for AR / AP report)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",