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

Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

Browse Source
This commit is contained in:
Shivam Mishra
2020-10-21 11:38:31 +05:30
parent 2c2e7297ae ce95bc2ce0
commit 9d468a8daf
145 changed files with 4855 additions and 3112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/desk_page/home/home.json
View File

@@ -43,7 +43,7 @@
{
"hidden": 0,
"label": "Data Import and Settings",
"links": "[\n {\n \"description\": \"Import Data from CSV / Excel files.\",\n \"icon\": \"octicon octicon-cloud-upload\",\n \"label\": \"Import Data\",\n \"name\": \"Data Import\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Import Chart Of Accounts from CSV / Excel files\",\n \"labe\": \"Chart Of Accounts Importer\",\n \"label\": \"Chart of Accounts Importer\",\n \"name\": \"Chart of Accounts Importer\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Letter Heads for print templates.\",\n \"label\": \"Letter Head\",\n \"name\": \"Letter Head\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Add / Manage Email Accounts.\",\n \"label\": \"Email Account\",\n \"name\": \"Email Account\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n }\n]"
"links": "[\n {\n \"description\": \"Import Data from CSV / Excel files.\",\n \"icon\": \"octicon octicon-cloud-upload\",\n \"label\": \"Import Data\",\n \"name\": \"Data Import\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Import Chart of Accounts from CSV / Excel files\",\n \"label\": \"Chart of Accounts Importer\",\n \"label\": \"Chart of Accounts Importer\",\n \"name\": \"Chart of Accounts Importer\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Letter Heads for print templates.\",\n \"label\": \"Letter Head\",\n \"name\": \"Letter Head\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Add / Manage Email Accounts.\",\n \"label\": \"Email Account\",\n \"name\": \"Email Account\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n }\n]"
}
],
"category": "Modules",

4
erpnext/setup/doctype/company/company.json
View File

@@ -261,14 +261,14 @@
{
"fieldname": "create_chart_of_accounts_based_on",
"fieldtype": "Select",
"label": "Create Chart Of Accounts Based On",
"label": "Create Chart of Accounts Based on",
"options": "\nStandard Template\nExisting Company"
},
{
"depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
"fieldname": "chart_of_accounts",
"fieldtype": "Select",
"label": "Chart Of Accounts Template",
"label": "Chart of Accounts Template",
"no_copy": 1
},
{

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

@@ -60,14 +60,10 @@
},
"Australia": {
"Australia GST1": {
"Australia GST": {
"account_name": "GST 10%",
"tax_rate": 10.00,
"default": 1
},
"Australia GST 2%": {
"account_name": "GST 2%",
"tax_rate": 2
}
},
@@ -648,10 +644,19 @@
},
"Italy": {
"Italy Tax": {
"account_name": "VAT",
"tax_rate": 22.00
}
"Italy VAT 22%": {
"account_name": "IVA 22%",
"tax_rate": 22.00,
"default": 1
},
"Italy VAT 10%":{
"account_name": "IVA 10%",
"tax_rate": 10.00
},
"Italy VAT 4%":{
"account_name": "IVA 4%",
"tax_rate": 4.00
}
},
"Ivory Coast": {