Skip to content

Commit ee2b266

Browse files
lordkrandelwilliam-andre
authored andcommitted
[IMP] l10n_*: Removal of references to deactivated taxes
Some of the fiscal positions needed to be cleaned up after deactivating duplicated tax_included taxes that were mirroring the tax_excluded ones. task-4019610 closes odoo#173906 Related: odoo/enterprise#68310 Related: odoo/upgrade#6354 Signed-off-by: William André (wan) <[email protected]>
1 parent be308e1 commit ee2b266

File tree

12 files changed

+20
-63
lines changed

12 files changed

+20
-63
lines changed

addons/l10n_au/data/template/account.fiscal.position-au.csv

-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
"id","name","tax_ids/tax_src_id","tax_ids/tax_dest_id"
22
"fiscal_position_os_partner","OS Partner","au_tax_sale_10","au_tax_sale_0"
3-
"","","au_tax_sale_inc_10","au_tax_sale_0"
43
"","","au_tax_purchase_10_service","au_tax_purchase_0_service"
5-
"","","au_tax_purchase_inc_10_service","au_tax_purchase_0_service"
64
"","","au_tax_purchase_capital_service","au_tax_purchase_0_service"
75
"fiscal_position_tpar_partner","TPAR","au_tax_purchase_10_service","au_tax_purchase_10_service_tpar"
8-
"","","au_tax_purchase_inc_10_service","au_tax_purchase_inc_10_service_tpar"
96
"","","au_tax_purchase_capital_service","au_tax_purchase_capital_service_tpar"
107
"","","au_tax_purchase_0_service","au_tax_purchase_0_service_tpar"
118
"","","au_tax_purchase_input_service","au_tax_purchase_input_service_tpar"
129
"","","au_tax_purchase_private_service","au_tax_purchase_private_service_tpar"
1310
"","","au_tax_purchase_gst_only_service","au_tax_purchase_gst_only_service_tpar"
1411
"","","au_tax_purchase_adj_service","au_tax_purchase_adj_service_tpar"
1512
"fiscal_position_tpar_partner_no_abn","TPAR without ABN","au_tax_purchase_10_service","au_tax_purchase_10_service_tpar_no_abn"
16-
"","","au_tax_purchase_inc_10_service","au_tax_purchase_inc_10_service_tpar_no_abn"
1713
"","","au_tax_purchase_capital_service","au_tax_purchase_capital_service_tpar_no_abn"
1814
"","","au_tax_purchase_0_service","au_tax_purchase_0_service_tpar_no_abn"
1915
"","","au_tax_purchase_input_service","au_tax_purchase_input_service_tpar_no_abn"

addons/l10n_cn/models/template_cn.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ def _get_cn_res_company(self):
2323
'account_default_pos_receivable_account_id': 'l10n_cn_common_112400',
2424
'income_currency_exchange_account_id': 'l10n_cn_common_605100',
2525
'expense_currency_exchange_account_id': 'l10n_cn_common_671100',
26-
'account_sale_tax_id': 'l10n_cn_sales_included_13',
26+
'account_price_include': 'tax_included',
27+
'account_sale_tax_id': 'l10n_cn_sales_excluded_13',
2728
'account_purchase_tax_id': 'l10n_cn_purchase_excluded_13',
2829
},
2930
}

addons/l10n_cn/models/template_cn_large_bis.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ def _get_cn_large_bis_company(self):
2424
'account_default_pos_receivable_account_id': 'l10n_cn_common_112400',
2525
'income_currency_exchange_account_id': 'l10n_cn_common_605100',
2626
'expense_currency_exchange_account_id': 'l10n_cn_common_671100',
27-
'account_sale_tax_id': 'l10n_cn_tax_large_bis_sales_included_13',
27+
'account_price_include': 'tax_included',
28+
'account_sale_tax_id': 'l10n_cn_tax_large_bis_sales_excluded_13',
2829
'account_purchase_tax_id': 'l10n_cn_tax_large_bis_purchase_excluded_13',
2930
'account_journal_suspense_account_id': 'l10n_cn_large_bis_100201',
3031
'account_journal_payment_debit_account_id': 'l10n_cn_large_bis_100202',

addons/l10n_cz/data/template/account.fiscal.position-cz.csv

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"id","sequence","name","auto_apply","vat_required","country_id","country_group_id","tax_ids/tax_src_id","tax_ids/tax_dest_id","name@cs"
22
"fiscal_position_domestic_cz","1","Domestic partners","1","1","base.cz","","","","Domácí partneři"
33
"fiscal_position_eu_private_cz","2","Private trade with the EU","1","","","base.europe","","","Soukromý obchod s EU"
4-
"fiscal_position_eu_cz","3","Trade with the EU","1","1","","base.europe","l10n_cz_supply_goods_eu","l10n_cz_not_included_vat","Obchod s EU"
5-
"","","","","","","","l10n_cz_supply_service_eu","l10n_cz_not_included_vat",""
64
"","","","","","","","l10n_cz_12_purchase_goods_eu","l10n_cz_21_other_supplies_chargeable",""
75
"","","","","","","","l10n_cz_21_acquisition_goods_eu","l10n_cz_21_other_supplies_chargeable",""
86
"","","","","","","","l10n_cz_12_receipt_service_person_eu","l10n_cz_21_other_supplies_chargeable",""

addons/l10n_de/models/template_de_skr03.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def _get_de_skr03_reconcile_model(self):
4949
'amount_type': 'percentage',
5050
'tax_ids': [
5151
Command.set([
52-
'tax_vst_7_taxinclusive_skr03',
52+
'tax_vst_7_skr03',
5353
]),
5454
],
5555
'amount_string': '100',
@@ -65,7 +65,7 @@ def _get_de_skr03_reconcile_model(self):
6565
'amount_type': 'percentage',
6666
'tax_ids': [
6767
Command.set([
68-
'tax_vst_19_taxinclusive_skr03',
68+
'tax_vst_19_skr03',
6969
]),
7070
],
7171
'amount_string': '100',
@@ -81,7 +81,7 @@ def _get_de_skr03_reconcile_model(self):
8181
'amount_type': 'percentage',
8282
'tax_ids': [
8383
Command.set([
84-
'tax_ust_7_taxinclusive_skr03',
84+
'tax_ust_7_skr03',
8585
]),
8686
],
8787
'amount_string': '100',
@@ -97,7 +97,7 @@ def _get_de_skr03_reconcile_model(self):
9797
'amount_type': 'percentage',
9898
'tax_ids': [
9999
Command.set([
100-
'tax_ust_19_taxinclusive_skr03',
100+
'tax_ust_19_skr03',
101101
]),
102102
],
103103
'amount_string': '100',
@@ -113,7 +113,7 @@ def _get_de_skr03_reconcile_model(self):
113113
'amount_type': 'percentage',
114114
'tax_ids': [
115115
Command.set([
116-
'tax_ust_7_taxinclusive_skr03',
116+
'tax_ust_7_skr03',
117117
]),
118118
],
119119
'amount_string': '100',
@@ -129,7 +129,7 @@ def _get_de_skr03_reconcile_model(self):
129129
'amount_type': 'percentage',
130130
'tax_ids': [
131131
Command.set([
132-
'tax_ust_19_taxinclusive_skr03',
132+
'tax_ust_19_skr03',
133133
]),
134134
],
135135
'amount_string': '100',

addons/l10n_de/models/template_de_skr04.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def _get_de_skr04_reconcile_model(self):
4848
'amount_type': 'percentage',
4949
'tax_ids': [
5050
Command.set([
51-
'tax_vst_7_taxinclusive_skr04',
51+
'tax_vst_7_skr04',
5252
]),
5353
],
5454
'amount_string': '100',
@@ -64,7 +64,7 @@ def _get_de_skr04_reconcile_model(self):
6464
'amount_type': 'percentage',
6565
'tax_ids': [
6666
Command.set([
67-
'tax_vst_19_taxinclusive_skr04',
67+
'tax_vst_19_skr04',
6868
]),
6969
],
7070
'amount_string': '100',
@@ -80,7 +80,7 @@ def _get_de_skr04_reconcile_model(self):
8080
'amount_type': 'percentage',
8181
'tax_ids': [
8282
Command.set([
83-
'tax_ust_7_taxinclusive_skr04',
83+
'tax_ust_7_skr04',
8484
]),
8585
],
8686
'amount_string': '100',
@@ -96,7 +96,7 @@ def _get_de_skr04_reconcile_model(self):
9696
'amount_type': 'percentage',
9797
'tax_ids': [
9898
Command.set([
99-
'tax_ust_19_taxinclusive_skr04',
99+
'tax_ust_19_skr04',
100100
]),
101101
],
102102
'amount_string': '100',
@@ -112,7 +112,7 @@ def _get_de_skr04_reconcile_model(self):
112112
'amount_type': 'percentage',
113113
'tax_ids': [
114114
Command.set([
115-
'tax_ust_7_taxinclusive_skr04',
115+
'tax_ust_7_skr04',
116116
]),
117117
],
118118
'amount_string': '100',
@@ -128,7 +128,7 @@ def _get_de_skr04_reconcile_model(self):
128128
'amount_type': 'percentage',
129129
'tax_ids': [
130130
Command.set([
131-
'tax_ust_19_taxinclusive_skr04',
131+
'tax_ust_19_skr04',
132132
]),
133133
],
134134
'amount_string': '100',

addons/l10n_do/data/template/account.fiscal.position-do.csv

-6
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,13 @@
55
"position_service_moral","P. Legal Services","tax_18_purch","tax_group_moral_services","","","P. Jurídica de Servicios"
66
"position_security_moral","P. Legal Surveillance","tax_18_purch","ret_100_tax_security","","","P. Jurídica de Vigilancia"
77
"position_nonformal","Informal Supplier of Goods","tax_18_purch","tax_group_nonformal","","","Proveedor Informal de Bienes"
8-
"","","tax_18_purch_incl","tax_group_nonformal","","",""
98
"position_exterior","Outside Services","tax_18_purch_serv","ret_27_income_remittance","","","Servicios del Exterior"
109
"","","tax_18_purch","ret_27_income_remittance","","",""
1110
"","","","","l10n_do_21010300","l10n_do_21010200",""
1211
"position_gov","Governmental","tax_18_sale","ret_5_income_gov","","","Gubernamental"
13-
"","","tax_18_sale_incl","ret_5_income_gov","","",""
1412
"position_nonprofit","Non-Profit Services","tax_18_purch","ret_100_tax_nonprofit","","","No Lucrativa de Servicios"
15-
"","","tax_18_purch_incl","ret_100_tax_nonprofit","","",""
1613
"position_especial","Special Regimes","tax_18_sale","tax_0_sale","","","Regímenes Especiales"
17-
"","","tax_18_sale_incl","tax_0_sale","","",""
1814
"","","tax_group_restaurant_sale","tax_tip_sale","","",""
1915
"position_restaurant","Restaurants","tax_18_purch","tax_group_restaurant_purch","","","Restaurantes"
20-
"","","tax_18_purch_incl","tax_group_restaurant_purch","","",""
2116
"","","tax_18_sale","tax_group_restaurant_sale","","",""
22-
"","","tax_18_sale_incl","tax_group_restaurant_sale","","",""
2317
"position_restaurant_takeout","To Take Away","tax_group_restaurant_sale","tax_18_sale","","","Para Llevar"

addons/l10n_fi/data/template/account.fiscal.position-fi.csv

-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
"","","","","","","","tax_dom_purchase_service_24","tax_dom_purchase_0",""
5252
"","","","","","","","tax_dom_purchase_service_14","tax_dom_purchase_0",""
5353
"","","","","","","","tax_dom_purchase_service_10","tax_dom_purchase_0",""
54-
"","","","","","","","tax_dom_purchase_brutto_25_5","tax_dom_purchase_0",""
55-
"","","","","","","","tax_dom_purchase_brutto_24","tax_dom_purchase_0",""
56-
"","","","","","","","tax_dom_purchase_brutto_14","tax_dom_purchase_0",""
57-
"","","","","","","","tax_dom_purchase_brutto_10","tax_dom_purchase_0",""
5854
"construction","Construction services + Scrap metal","base.fi","","","7","","tax_construct_purchase_25_5","tax_construct_purchase_25_5_finland","Rakennuspalvelut + metalliromu"
5955
"","","","","","","","tax_construct_purchase_24","tax_construct_purchase_24_finland",""
6056
"","","","","","","","tax_dom_sales_goods_25_5","tax_construct_sales_0",""
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
11
"id","name","tax_ids/tax_src_id","tax_ids/tax_dest_id","name@ja_JP"
2-
"l10n_jp_fiscal_position_tax_inclusive","Tax Inclusive","l10n_jp_tax_sale_exc_10","l10n_jp_tax_sale_incl_10","内税"
3-
,,"l10n_jp_tax_purchase_exc_10","l10n_jp_tax_purchase_incl_10",
4-
,,"l10n_jp_tax_sale_exc_8","l10n_jp_tax_sale_incl_8",
5-
,,"l10n_jp_tax_purchase_exc_8","l10n_jp_tax_purchase_incl_8",
6-
"l10n_jp_fiscal_position_tax_exclusive","Tax Exclusive","l10n_jp_tax_sale_incl_10","l10n_jp_tax_sale_exc_10","外税"
7-
,,"l10n_jp_tax_purchase_incl_10","l10n_jp_tax_purchase_exc_10",
8-
,,"l10n_jp_tax_sale_incl_8","l10n_jp_tax_sale_exc_8",
9-
,,"l10n_jp_tax_purchase_incl_8","l10n_jp_tax_purchase_exc_8",
102
"l10n_jp_fiscal_position_tax_exempt","Oversea Customer","l10n_jp_tax_sale_exc_10","l10n_jp_tax_sale_exempt","海外取引先"
11-
,,"l10n_jp_tax_sale_incl_10","l10n_jp_tax_sale_exempt",
12-
,,"l10n_jp_tax_purchase_exc_10","l10n_jp_tax_purchase_imp",
13-
,,"l10n_jp_tax_purchase_incl_10","l10n_jp_tax_purchase_imp",
14-
,,"l10n_jp_tax_sale_exc_8","l10n_jp_tax_sale_exempt",
15-
,,"l10n_jp_tax_sale_incl_8","l10n_jp_tax_sale_exempt",
16-
,,"l10n_jp_tax_purchase_exc_8","l10n_jp_tax_purchase_imp",
17-
,,"l10n_jp_tax_purchase_incl_8","l10n_jp_tax_purchase_imp",
3+
"","","l10n_jp_tax_purchase_exc_10","l10n_jp_tax_purchase_imp",""
4+
"","","l10n_jp_tax_sale_exc_8","l10n_jp_tax_sale_exempt",""
5+
"","","l10n_jp_tax_purchase_exc_8","l10n_jp_tax_purchase_imp",""
186
"l10n_jp_fiscal_position_tax_reduction","Reduced Tax Rate","l10n_jp_tax_sale_exc_10","l10n_jp_tax_sale_exc_8","軽減税率"
19-
,,"l10n_jp_tax_sale_incl_10","l10n_jp_tax_sale_incl_8",
20-
,,"l10n_jp_tax_purchase_exc_10","l10n_jp_tax_purchase_exc_8",
21-
,,"l10n_jp_tax_purchase_incl_10","l10n_jp_tax_purchase_incl_8",
7+
"","","l10n_jp_tax_purchase_exc_10","l10n_jp_tax_purchase_exc_8",""
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
"id","sequence","name","auto_apply","country_id","country_group_id","tax_ids/tax_src_id","tax_ids/tax_dest_id","name@ru"
22
"l10n_kz_fiscal_position_template_national","1","National","1","base.kz","","","","Национальные"
33
"l10n_kz_fiscal_position_template_eeu","2","EEU","1","","base.eurasian_economic_union","l10n_kz_tax_vat_12_purchase","l10n_kz_tax_vat_12_purchase_eeu",""
4-
"","","","","","","l10n_kz_tax_vat_12_purchase_included","l10n_kz_tax_vat_12_purchase_included_eeu",""
54
"","","","","","","l10n_kz_tax_vat_20_purchase","l10n_kz_tax_vat_20_purchase_eeu",""
6-
"","","","","","","l10n_kz_tax_vat_20_purchase_included","l10n_kz_tax_vat_20_purchase_included_eeu",""
7-
"","","","","","","l10n_kz_tax_vat_12_sale","l10n_kz_tax_vat_12_sale_included_eeu",""
8-
"","","","","","","l10n_kz_tax_vat_12_sale_included","l10n_kz_tax_vat_12_sale_included_eeu",""
9-
"","","","","","","l10n_kz_tax_vat_20_sale","l10n_kz_tax_vat_20_sale_included_eeu",""
10-
"","","","","","","l10n_kz_tax_vat_20_sale_included","l10n_kz_tax_vat_20_sale_included_eeu",""
115
"l10n_kz_fiscal_position_template_international","3","International","1","","","l10n_kz_tax_vat_12_purchase","l10n_kz_tax_vat_12_purchase_import","Международные"
12-
"","","","","","","l10n_kz_tax_vat_12_purchase_included","l10n_kz_tax_vat_12_purchase_included_import",""
136
"","","","","","","l10n_kz_tax_vat_20_purchase","l10n_kz_tax_vat_20_purchase_import",""
14-
"","","","","","","l10n_kz_tax_vat_20_purchase_included","l10n_kz_tax_vat_20_purchase_included_import",""
15-
"","","","","","","l10n_kz_tax_vat_12_sale","l10n_kz_tax_vat_12_sale_included_export",""
16-
"","","","","","","l10n_kz_tax_vat_12_sale_included","l10n_kz_tax_vat_12_sale_included_export",""
17-
"","","","","","","l10n_kz_tax_vat_20_sale","l10n_kz_tax_vat_20_sale_included_export",""
18-
"","","","","","","l10n_kz_tax_vat_20_sale_included","l10n_kz_tax_vat_20_sale_included_export",""
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
"id","name","tax_ids/tax_src_id","tax_ids/tax_dest_id"
22
"fiscal_position_os_partner","OS Partner","nz_tax_sale_15","nz_tax_sale_0"
3-
"","","nz_tax_sale_inc_15","nz_tax_sale_0"
43
"","","nz_tax_purchase_15","nz_tax_purchase_0"
5-
"","","nz_tax_purchase_inc_15","nz_tax_purchase_0"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
"id","name","auto_apply","country_id","sequence","tax_ids/tax_src_id","tax_ids/tax_dest_id","name@es"
22
"local_peru","LOCAL PERU","1","base.pe","15","","","LOCAL PERÚ"
33
"exportation","FOREIGN - EXPORT","1","","10","sale_tax_igv_18","sale_tax_exp","EXTRANJERO - EXPORTACIÓN"
4-
"","","","","","sale_tax_igv_18_included","sale_tax_exp",""

0 commit comments

Comments
 (0)