From 56d305b966b77ada7caa47ad78abdad2a356daa6 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 13 Oct 2020 00:07:52 +0530 Subject: [PATCH 1/4] fix: update italy fiscal year --- erpnext/public/js/setup_wizard.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 9beba6adf8d..5d21190e378 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -309,7 +309,6 @@ erpnext.setup.fiscal_years = { "Hong Kong": ["04-01", "03-31"], "India": ["04-01", "03-31"], "Iran": ["06-23", "06-22"], - "Italy": ["07-01", "06-30"], "Myanmar": ["04-01", "03-31"], "New Zealand": ["04-01", "03-31"], "Pakistan": ["07-01", "06-30"], From 968f61d8bac65373d7659642e547e013a180f4b4 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 13 Oct 2020 00:25:46 +0530 Subject: [PATCH 2/4] fix: add multiple VAT rates for Italy --- .../setup_wizard/data/country_wise_tax.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json index 19318df38e0..00fcaa87447 100644 --- a/erpnext/setup/setup_wizard/data/country_wise_tax.json +++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json @@ -648,10 +648,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": { From 1b329aaa7b08a906cb97dba697fc84a352c4cb82 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 13 Oct 2020 19:10:09 +0530 Subject: [PATCH 3/4] fix: json format fixes --- erpnext/setup/setup_wizard/data/country_wise_tax.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json index 00fcaa87447..2e45b6927ea 100644 --- a/erpnext/setup/setup_wizard/data/country_wise_tax.json +++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json @@ -655,11 +655,11 @@ }, "Italy VAT 10%":{ "account_name": "IVA 10%", - "tax_rate": 10.00, + "tax_rate": 10.00 }, "Italy VAT 4%":{ "account_name": "IVA 4%", - "tax_rate": 4.00, + "tax_rate": 4.00 } }, From 3eec4e61ab8255be6426ed9ce807c3f22896461c Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 13 Oct 2020 19:23:48 +0530 Subject: [PATCH 4/4] fix: GST rates for Australia --- erpnext/setup/setup_wizard/data/country_wise_tax.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json index 2e45b6927ea..beddaeed793 100644 --- a/erpnext/setup/setup_wizard/data/country_wise_tax.json +++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json @@ -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 } },