Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Merge branch 'develop' into UAE-VAT-Format

Browse Source
This commit is contained in:
hasnain2808 2020-09-28 20:43:03 +05:30
parent 23c8966e81
commit a5e8e449ee
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/desk_page/accounting/accounting.json
View File

@ -103,11 +103,7 @@
"idx": 0, "idx": 0,
"is_standard": 1, "is_standard": 1,
"label": "Accounting", "label": "Accounting",
<<<<<<< HEAD
"modified": "2020-09-28 13:19:27.703992", "modified": "2020-09-28 13:19:27.703992",
=======
"modified": "2020-09-09 11:45:33.766400",
>>>>>>> develop
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounting", "name": "Accounting",