From 3936d655c4bfd845b6ead724cecdc8e7c62816eb Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Fri, 19 Apr 2019 10:06:07 +0000
Subject: [IMP] account, l10n_*: v13 taxes

- Add repartition lines on taxes

- Link account tags directly to account.move.line; remove the tag_ids field from account.tag

- Add a new report engine dedicated to tax reports, directly generating account tags. It is called as an alternate mode of generic tax report, with a dedicated "Use tax grids" toggle.

>> The biggest change lies in the way the new tax report computes its values.
Everything is now aggregated directly using the tags set on the account move lines. Thanks to that,
modifying the configuration of a tax today will not impact the report for the previous periods anymore.
This is a big improvement, as it means the report will keep on reflecting the values that were submitted
to the state before, whatever the configuration change.

- Add an audit char field to account.move.line telling with tax grids are impacted by the line, with the corresponding amount

- Modify the behavior of cash basis taxes: the cash basis account is now used as the transition account, while the regular account given in tax declaration is used to store the final entry (it was the opposite before)

- Modify every l10n_* module in order to keep them consistent with these changes

closes odoo/odoo#32833

Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
---
 addons/l10n_gr/__manifest__.py                  |   1 +
 addons/l10n_gr/data/account_tax_data.xml        | 306 ++++++++++++++++--------
 addons/l10n_gr/data/account_tax_report_data.xml | 101 ++++++++
 3 files changed, 313 insertions(+), 95 deletions(-)
 create mode 100644 addons/l10n_gr/data/account_tax_report_data.xml

(limited to 'addons/l10n_gr')

diff --git a/addons/l10n_gr/__manifest__.py b/addons/l10n_gr/__manifest__.py
index 96dd608ee6d..a2df367f6dc 100644
--- a/addons/l10n_gr/__manifest__.py
+++ b/addons/l10n_gr/__manifest__.py
@@ -24,6 +24,7 @@ Greek accounting chart and localization.
               'data/account.account.template.csv',
               'data/account_chart_template_data.xml',
               'data/account_data.xml',
+              'data/account_tax_report_data.xml',
               'data/account_tax_data.xml',
               'data/account_chart_template_configure_data.xml'
     ],
diff --git a/addons/l10n_gr/data/account_tax_data.xml b/addons/l10n_gr/data/account_tax_data.xml
index 58a2eeb91d6..5b85ffadada 100644
--- a/addons/l10n_gr/data/account_tax_data.xml
+++ b/addons/l10n_gr/data/account_tax_data.xml
@@ -1,71 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-     <!-- Account Tags -->
-
-        <record id="tag_ivat_01" model="account.account.tag">
-            <field name="name">311 Σύνολο Εκροών</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_02" model="account.account.tag">
-            <field name="name">307 Σύνολο φορολ. Εκροών</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_03" model="account.account.tag">
-            <field name="name">303 Πωλήσεις 19-23%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_04" model="account.account.tag">
-            <field name="name">358 Σύνολο φορολ. Εισροών</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_05" model="account.account.tag">
-            <field name="name">353 Αγορές ΦΠΑ 19-23%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_06" model="account.account.tag">
-            <field name="name">357 Δαπάνες/Έξοδα φορολ.</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_07" model="account.account.tag">
-            <field name="name">501-511 Υπόλοιπο ΦΠΑ</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_08" model="account.account.tag">
-            <field name="name">337 ΦΠΑ Πωλήσεων</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_09" model="account.account.tag">
-            <field name="name">333 ΦΠΑ 19-23%</field>
-             <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_10" model="account.account.tag">
-            <field name="name">420 ΦΠΑ Αγορών</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_11" model="account.account.tag">
-            <field name="name">378 Σύνολο Φορ. Αγορών</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_12" model="account.account.tag">
-            <field name="name">373 ΦΠΑ Αγορών 19-23%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_ivat_13" model="account.account.tag">
-            <field name="name">377 ΦΠΑ Δαπανών</field>
-            <field name="applicability">taxes</field>
-        </record>
 
     <!-- tax definitions for VAT on sales (income) -->
     <record id="ivat19" model="account.tax.template">
@@ -76,10 +10,31 @@
         <field name="sequence" eval="3" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_03'), ref('tag_ivat_09')])]"/>
         <field name="tax_group_id" ref="tax_group_19"/>
+        <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_303')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_333')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
     <record id="ivat21" model="account.tax.template">
@@ -90,10 +45,31 @@
         <field name="sequence" eval="2" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_03'), ref('tag_ivat_09')])]"/>
         <field name="tax_group_id" ref="tax_group_21"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_303')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_333')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
     <record id="ivat23" model="account.tax.template">
@@ -103,14 +79,34 @@
         <field eval="23" name="amount"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_03'), ref('tag_ivat_09')])]"/>
         <field name="tax_group_id" ref="tax_group_23"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_303')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_333')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
-    
-    <!-- tax definitions for return VAT from purchases -->
 
+    <!-- tax definitions for return VAT from purchases -->
     <record id="pvat19" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_gr_chart_template"/>
         <field name="name">Αγορές ΦΠΑ19%</field>
@@ -119,10 +115,31 @@
         <field name="sequence" eval="3" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_12'), ref('tag_ivat_05')])]"/>
         <field name="tax_group_id" ref="tax_group_19"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_353')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_373')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
 
@@ -134,10 +151,31 @@
         <field name="sequence" eval="2" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_12'), ref('tag_ivat_05')])]"/>
         <field name="tax_group_id" ref="tax_group_21"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_353')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_373')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
     <record id="pvat23" model="account.tax.template">
@@ -147,10 +185,31 @@
         <field eval="23" name="amount"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_12'), ref('tag_ivat_05')])]"/>
         <field name="tax_group_id" ref="tax_group_23"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_353')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_373')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
     <!-- return VAT on expenses (different from purchases ) -->
@@ -162,10 +221,29 @@
         <field name="sequence" eval="3" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_13'), ref('tag_ivat_06')])]"/>
         <field name="tax_group_id" ref="tax_group_19"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
     <record id="evat21" model="account.tax.template">
@@ -176,10 +254,29 @@
         <field name="sequence" eval="2" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_ivat_13'), ref('tag_ivat_06')])]"/>
         <field name="tax_group_id" ref="tax_group_21"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 
     <record id="evat23" model="account.tax.template">
@@ -190,9 +287,28 @@
         <field name="sequence" eval="2" />
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chartgr_54_00"/>
-        <field name="refund_account_id" ref="chartgr_54_00"/>
-        <field name="tag_ids" eval="[(6,0,[ref('l10n_gr.tag_ivat_13'), ref('l10n_gr.tag_ivat_06')])]"/>
         <field name="tax_group_id" ref="tax_group_23"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chartgr_54_00'),
+                }),
+            ]"/>
     </record>
 </odoo>
diff --git a/addons/l10n_gr/data/account_tax_report_data.xml b/addons/l10n_gr/data/account_tax_report_data.xml
new file mode 100644
index 00000000000..e5703b9a942
--- /dev/null
+++ b/addons/l10n_gr/data/account_tax_report_data.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_tax_report_line_311" model="account.tax.report.line">
+        <field name="name">311 Σύνολο Εκροών</field>
+        <field name="code">GRTAX_311</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+
+    <record id="account_tax_report_line_307" model="account.tax.report.line">
+        <field name="name">307 Σύνολο φορολ. Εκροών</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_311"/>
+        <field name="formula">GRTAX_303</field>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+
+    <record id="account_tax_report_line_303" model="account.tax.report.line">
+        <field name="name">303 Πωλήσεις 19-23%f</field>
+        <field name="tag_name">303 Πωλήσεις 19-23%</field>
+        <field name="code">GRTAX_303</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_307"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+
+    <record id="account_tax_report_line_358" model="account.tax.report.line">
+        <field name="name">358 Σύνολο φορολ. Εισροών</field>
+        <field name="code">GRTAX_358</field>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_353" model="account.tax.report.line">
+        <field name="name">353 Αγορές ΦΠΑ 19-23%</field>
+        <field name="tag_name">353 Αγορές ΦΠΑ 19-23%</field>
+        <field name="code">GRTAX_353</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_358"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_357" model="account.tax.report.line">
+        <field name="name">357 Δαπάνες/Έξοδα φορολ.</field>
+        <field name="tag_name">357 Δαπάνες/Έξοδα φορολ.</field>
+        <field name="code">GRTAX_357</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_358"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_501-511" model="account.tax.report.line">
+        <field name="name">501-511 Υπόλοιπο ΦΠΑ</field>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_337" model="account.tax.report.line">
+        <field name="name">337 ΦΠΑ Πωλήσεων</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_501-511"/>
+        <field name="formula">GRTAX_333</field>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_333" model="account.tax.report.line">
+        <field name="name">333 ΦΠΑ 19-23%</field>
+        <field name="tag_name">333 ΦΠΑ 19-23%</field>
+        <field name="code">GRTAX_333</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_337"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_420" model="account.tax.report.line">
+        <field name="name">420 ΦΠΑ Αγορών</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_501-511"/>
+        <field name="formula">GRTAX_373+GRTAX_377</field>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_378" model="account.tax.report.line">
+        <field name="name">378 Σύνολο Φορ. Αγορών</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_420"/>
+        <field name="formula">GRTAX_373+GRTAX_377</field>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_373" model="account.tax.report.line">
+        <field name="name">373 ΦΠΑ Αγορών 19-23%</field>
+        <field name="tag_name">373 ΦΠΑ Αγορών 19-23%</field>
+        <field name="code">GRTAX_373</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_378"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+    <record id="account_tax_report_line_377" model="account.tax.report.line">
+        <field name="name">377 ΦΠΑ Δαπανών</field>
+        <field name="tag_name">377 ΦΠΑ Δαπανών</field>
+        <field name="code">GRTAX_377</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_line_378"/>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+
+</odoo>
-- 
cgit v1.2.3