From f5033dce605bd724ef70ee4daa80076eba0110d7 Mon Sep 17 00:00:00 2001 From: Brice bib Bartoletti Date: Mon, 24 Jan 2022 18:04:46 +0000 Subject: [PATCH] [FW][IMP]l10n_dk: Add danish tax report This commit is a forward port of the 2 following commits: [IMP]l10n_dk: Add support for danish tax reporting commit: d48433589a403754e9853b5242ec42abfafbfdea This commit creates the basis for the danish tax report. It creates the report and link the tags to the related taxes. [IMP]l10n_dk: tax report and taxes impl. rework commit: 7e4017c43a72314a5ba6da40903896f2dce4e2d5 This commit aims to: - implements formula in the tax report - shorten tag names and add context comments to the tax report - correct the tax implementation - add some fiscal position for some taxes and reorder them - delete a tax that doesn't make any sense closes odoo/odoo#83376 Community-pr: https://github.com/odoo/odoo/pull/80823 Task: #2666277 X-original-commit: f8c1015841020244bae16715b0112f41b91ec72b Signed-off-by: Josse Colpaert Signed-off-by: Brice Bartoletti --- addons/l10n_dk/__manifest__.py | 6 +- .../account_fiscal_position_tax_template.xml | 62 +- .../l10n_dk/data/account_tax_report_data.xml | 171 +++++ .../data/account_tax_template_data.xml | 597 +++++++++++------- 4 files changed, 598 insertions(+), 238 deletions(-) create mode 100644 addons/l10n_dk/data/account_tax_report_data.xml diff --git a/addons/l10n_dk/__manifest__.py b/addons/l10n_dk/__manifest__.py index 5a987da0ffd..073b6356dc5 100644 --- a/addons/l10n_dk/__manifest__.py +++ b/addons/l10n_dk/__manifest__.py @@ -4,8 +4,8 @@ { 'name': 'Denmark - Accounting', 'version': '1.0', - 'author': 'Odoo House ApS', - 'website': 'https://odoohouse.dk', + 'author': 'Odoo House ApS, VK DATA ApS', + 'website': 'http://odoodanmark.dk', 'category': 'Accounting/Localizations/Account Charts', 'description': """ @@ -87,7 +87,6 @@ Produkt setup: . -Copyright 2018 Odoo House ApS """, 'depends': ['account', 'base_iban', 'base_vat'], 'data': [ @@ -95,6 +94,7 @@ Copyright 2018 Odoo House ApS 'data/l10n_dk_chart_template_data.xml', 'data/account.account.template.csv', 'data/l10n_dk_chart_template_post_data.xml', + 'data/account_tax_report_data.xml', 'data/account_tax_template_data.xml', 'data/account_fiscal_position_template.xml', 'data/account_fiscal_position_tax_template.xml', diff --git a/addons/l10n_dk/data/account_fiscal_position_tax_template.xml b/addons/l10n_dk/data/account_fiscal_position_tax_template.xml index 7754160763b..1f74982935c 100644 --- a/addons/l10n_dk/data/account_fiscal_position_tax_template.xml +++ b/addons/l10n_dk/data/account_fiscal_position_tax_template.xml @@ -1,5 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,31 +48,19 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/addons/l10n_dk/data/account_tax_report_data.xml b/addons/l10n_dk/data/account_tax_report_data.xml new file mode 100644 index 00000000000..b29e5ee82f7 --- /dev/null +++ b/addons/l10n_dk/data/account_tax_report_data.xml @@ -0,0 +1,171 @@ + + + + VAT Report + + + + + Skyldig moms + DUE_VAT + + + + + + Salgsmoms (udgående moms) + SALES_VAT + UM + + + + + + + Moms af varekøb i udlandet (både EU og lande uden for EU) + REVERSE_CHARGE_MERCHANDISES_PURCHASED_OUT_DK + MVU + + + + + + + Moms af ydelseskøb i udlandet med omvendt betalingspligt + REVERSE_CHARGE_SERVICES_PURCHASED_OUT_DK + MYUOB + + + + + + + + Fradrag + VAT_TO_DEDUCED + + + + + Købsmoms (indgående moms) + PURCHASE_VAT + KM + + + + + + Olie- og flaskegasafgift + OIL_AND_BOTTLED_GAS_TAX + OFA + + + + + + Elafgift + ELECTRICITY_TAX + EA + + + + + + Naturgas- og bygasafgift + NATURAL_AND_CITY_GAS_TAX + NOBA + + + + + + Kulafgift + COAL_TAX + KA + + + + + + CO2-afgift + CO2_TAX + CO2A + + + + + + Vandafgift + WATER_TAX + VA + + + + + + + + Momsangivelse (positivt beløb = betale, negativt beløb = penge tilgode) + + + DUE_VAT - VAT_TO_DEDUCED + + + + + Supplerende oplysninger + + + None + + + + + + Rubrik A: varer (EU) + R-A-V + + + + + + + Rubrik A = ydelser (EU) + R-A-Y + + + + + + + Rubrik B = varer (Indberettes til EU-salg uden moms) + R-B-MR + + + + + + + Rubrik B = varer (Indberettes ikke til EU-salg uden moms) + R-B-UR + + + + + + + Rubrik B = ydelser - (EU-salg uden moms) + R-C-MR + + + + + + + Rubrik C - Værdien af andre varer og ydelser (uanset landet) + R-C-UR + + + + + diff --git a/addons/l10n_dk/data/account_tax_template_data.xml b/addons/l10n_dk/data/account_tax_template_data.xml index 0887004584f..5b1f611cf03 100644 --- a/addons/l10n_dk/data/account_tax_template_data.xml +++ b/addons/l10n_dk/data/account_tax_template_data.xml @@ -1,11 +1,11 @@  - - + + 110 - Salgsmoms 25% + Salgsmoms 25%, varer 25% 25 percent @@ -19,6 +19,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8720'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_sales_tax')], }), ]"/> @@ -50,6 +52,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8720'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_sales_tax')], }), ]"/> - - - - 140 - Salg omvendt betalingspligt - - - 100 - percent - sale - - - + 210 - EU Varesalg (Virksomheder) - - - 100 + EU Varesalg (Virksomheder) - momsfritaget + 0 percent sale 220 - EU Ydelsessalg (Virksomheder) - - - 100 + EU Ydelsessalg (Virksomheder) - momsfritaget + 0 percent sale - + 310 3. Land Salg Vare / Ydelser - - 100 + 0 percent sale - - + + + + + + 400 - Købsmoms 25% + Købsmoms 25%, varer 25% 25 percent @@ -255,6 +162,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8740'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_deduction_purchase_tax')], }), ]"/> 410 - Købsmoms 25% indeholdt + Købsmoms 25% indeholdt, varer 25% indeholdt 25 percent @@ -287,6 +196,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8740'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_deduction_purchase_tax')], }), ]"/> @@ -318,6 +229,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8740'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_deduction_purchase_tax')], }), ]"/> + + + + 420 + Købsmoms 25% indeholdt, ydelser + 25% + 25 + percent + + purchase + + @@ -336,8 +283,6 @@ 430 Køb omvendt betalingspligt - - 25 percent purchase @@ -346,15 +291,17 @@ 'factor_percent': 100, 'repartition_type': 'base', }), - (0,0, { - 'factor_percent': -100, - 'repartition_type': 'tax', - 'account_id': ref('a8725'), - }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8740'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_deduction_purchase_tax')], + }), + (0,0, { + 'factor_percent': -100, + 'repartition_type': 'tax', + 'account_id': ref('a8725'), + 'minus_report_line_ids': [ref('l10n_dk.account_tax_report_line_sales_tax')], }), ]"/> @@ -391,6 +340,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a8740'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_deduction_purchase_tax')], }), ]"/> - + 510 EU Varekøb - - - 100 + 25 percent purchase @@ -474,8 +409,149 @@ 520 EU Ydelseskøb - - + 25 + percent + purchase + + + + + + + + + 610 + 3. Land Varekøb + 25 + percent + purchase + + + + + + 620 + 3. Land Ydelseskøb + 25 + percent + purchase + + + + + + + + + + + + 710 + Olie- og flaskegasafgift 100 percent purchase @@ -485,24 +561,14 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': -25, + 'factor_percent': 92.83, 'repartition_type': 'tax', - 'account_id': ref('a8731'), + 'account_id': ref('a8775'), + 'plus_report_line_ids': [ref('l10n_dk.account_tax_report_line_deduction_oil_bottle_tax')], }), (0,0, { - 'factor_percent': 25, + 'factor_percent': -92.83, 'repartition_type': 'tax', - 'account_id': ref('a8740'), - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('a8751'), - }), - (0,0, { - 'factor_percent': -100, - 'repartition_type': 'tax', - 'account_id': ref('a8769'), }), ]"/> + + + + + + 720 + Elafgift + 0.896 + fixed + + purchase + + - - - + + + + - 610 - 3. Land Varekøb - - - 25 + 730 + Naturgas- og bygasafgift + 100 + percent + purchase + + + + + + + 740 + Kulafgift + 100 + percent + purchase + + + + + + + 750 + CO2-afgift + + 0 percent purchase - + + + - 620 - 3. Land Ydelseskøb - - 25 - percent + 760 + Vandafgift + 6.1800 + fixed + purchase