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

fix: merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-06-24 19:14:33 +05:30
parent 4704003c94 11591b3e3e
commit a57976660a
207 changed files with 5618 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/setup_wizard/data/country_wise_tax.json
View File

@@ -1867,7 +1867,7 @@
"South Africa": {
"South Africa Tax": {
"account_name": "VAT",
"tax_rate": 14.00
"tax_rate": 15.00
}
},