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

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2024-04-19 13:32:39 +05:30
committed by GitHub
parent 03ce9ee321
commit de3a423618
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,12 +86,7 @@
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Fiscal Year", "name": "Fiscal Year",
<<<<<<< HEAD
"owner": "Administrator", "owner": "Administrator",
=======
"naming_rule": "By fieldname",
"owner": "Administrator",
>>>>>>> 572e844a91 (fix: account and stock manager read perm)
"permissions": [ "permissions": [
{ {
"create": 1, "create": 1,
@@ -136,4 +131,4 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "name", "sort_field": "name",
"sort_order": "DESC" "sort_order": "DESC"
} }