[MERGE] forward port branch saas-12.3 up to 752b2553c6

addons/account/models/account.py

@@ -149,6 +149,13 @@ class AccountTaxReportLine(models.Model):
         if self.tag_ids and (len(neg_tags) !=1 or len(pos_tags) != 1):
             raise ValidationError(_("If tags are defined for a tax report line, only two are allowed on it: a positive and a negative one."))
 
+    @api.constrains('tag_name', 'country_id')
+    def _validate_tag_name_unicity(self):
+        if self.tag_name:
+            other_lines_with_same_tag = self.env['account.tax.report.line'].search_count([('tag_name', '=', self.tag_name), ('id', '!=', self.id), ('country_id', '=', self.country_id.id)])
+            if other_lines_with_same_tag:
+                raise ValidationError(_("Tag name %(tag)s is used by more than one tax report line in %(country)s. Each tag name should only be used once per country.") % {'tag': self.tag_name, 'country': self.country_id.name})
+
     @api.onchange('parent_id')
     def _onchange_parent_id(self):
         """ If the parent of a report line is changed, the sequence of this line
@@ -1411,12 +1418,12 @@ class AccountTax(models.Model):
                 subsequent_tags = subsequent_taxes.get_tax_tags(is_refund, 'base')
 
             # Compute the tax lines
-            tax_repartition_lines = is_refund and tax.refund_repartition_line_ids or tax.invoice_repartition_line_ids
+            tax_repartition_lines = (is_refund and tax.refund_repartition_line_ids or tax.invoice_repartition_line_ids).filtered(lambda x: x.repartition_type == 'tax')
             repartition_lines_to_treat = len(tax_repartition_lines)
             total_amount = 0
-            for repartition_line in tax_repartition_lines.filtered(lambda x: x.repartition_type == 'tax'):
+            for repartition_line in tax_repartition_lines:
                 # In case some rounding error occurs, we compensate for it on the last line
-                line_amount = round(sign * tax_amount * repartition_line.factor if repartition_lines_to_treat != 1 else tax_amount - total_amount, prec)
+                line_amount = round(sign * tax_amount * repartition_line.factor if repartition_lines_to_treat != 1 else sign * (tax_amount - total_amount), prec)
 
                 taxes_vals.append({
                     'id': tax.id,

addons/account/models/chart_template.py

@@ -22,27 +22,6 @@ def migrate_set_tags_and_taxes_updatable(cr, registry, module):
     if xml_record_ids:
         cr.execute("update ir_model_data set noupdate = 'f' where id in %s", (tuple(xml_record_ids),))
 
-def migrate_tags_on_taxes(cr, registry):
-    ''' This is a utility function to help migrate the tags of taxes when the localization has been modified on stable version. If
-    called accordingly in a post_init_hooked function, it will reset the tags set on taxes as per their equivalent template.
-
-    Note: This unusual decision has been made in order to help the improvement of VAT reports on version 9.0, to have them more flexible
-    and working out of the box when people are creating/using new taxes.
-    '''
-    env = api.Environment(cr, SUPERUSER_ID, {})
-    xml_records = env['ir.model.data'].search([
-        ('model', '=', 'account.tax.template'),
-        ('module', 'like', 'l10n_%')
-    ])
-    tax_template_ids = [x['res_id'] for x in xml_records.sudo().read(['res_id'])]
-    for tax_template in env['account.tax.template'].browse(tax_template_ids):
-        tax_id = env['account.tax'].search([
-            ('name', '=', tax_template.name),
-            ('type_tax_use', '=', tax_template.type_tax_use),
-            ('description', '=', tax_template.description)
-        ])
-        tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]})
-
 def preserve_existing_tags_on_taxes(cr, registry, module):
     ''' This is a utility function used to preserve existing previous tags during upgrade of the module.'''
     env = api.Environment(cr, SUPERUSER_ID, {})

addons/account/report/account_invoice_report.py

@@ -182,10 +182,9 @@ class ReportInvoiceWithPayment(models.AbstractModel):
 
     @api.model
     def _get_report_values(self, docids, data=None):
-        report = self.env['ir.actions.report']._get_report_from_name('account.report_invoice_with_payments')
         return {
             'doc_ids': docids,
-            'doc_model': report.model,
-            'docs': self.env[report.model].browse(docids),
+            'doc_model': 'account.invoice',
+            'docs': self.env['account.invoice'].browse(docids),
             'report_type': data.get('report_type') if data else '',
         }

addons/account/security/account_security.xml

@@ -68,7 +68,7 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_write" eval="1"/>
         <field name="perm_unlink" eval="1"/>
-        <field name="perm_read" eval="0"/>
+        <field name="perm_read" eval="1"/>
     </record>
 
 </data>

addons/account/static/src/js/reconciliation/reconciliation_model.js

@@ -932,7 +932,7 @@ var StatementModel = BasicModel.extend({
                                 'link': prop.id,
                                 'tax_ids': [tax.id],
                                 'amount': tax.amount,
-                                'label': tax.name,
+                                'label': prop.label ? prop.label + " " + tax.name : tax.name,
                                 'date': prop.date,
                                 'account_id': tax.account_id ? [tax.account_id, null] : prop.account_id,
                                 'analytic': tax.analytic,

addons/account/static/src/js/reconciliation/reconciliation_renderer.js

@@ -794,6 +794,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
      */
     _onSelectMoveLine: function (event) {
         var $el = $(event.target);
+        $el.prop('disabled', true);
         this._destroyPopover($el);
         var moveLineId = $el.closest('.mv_line').data('line-id');
         this.trigger_up('add_proposition', {'data': moveLineId});

addons/account/static/tests/reconciliation_tests.js

@@ -1299,14 +1299,14 @@ QUnit.module('account', {
         await testUtils.dom.click(widget.$('.create .quick_add button:contains(ATOS)'));
 
         assert.strictEqual(widget.$('.accounting_view tbody .cell_label, .accounting_view tbody .cell_right').text().replace(/[\n\r\s$,]+/g, ' '),
-            " ATOS Banque 1145.62 ATOS Frais 26.71 Tax 20.00% 229.12 Tax 10.00% include 2.67 ", "should display 4 lines");
+            " ATOS Banque 1145.62 ATOS Frais 26.71 ATOS Banque Tax 20.00% 229.12 ATOS Frais Tax 10.00% include 2.67 ", "should display 4 lines");
         assert.strictEqual(widget.$('.accounting_view tfoot .cell_label, .accounting_view tfoot .cell_left').text().replace(/[\n\r\s$,]+/g, ' '),
             "Open balance229.12", "should display the 'Open balance' line with value in left column");
 
         await testUtils.fields.editAndTrigger(widget.$('.create .create_amount input'), '100',['input']);
 
         assert.strictEqual(widget.$('.accounting_view tbody').text().replace(/[\n\r\s$,]+/g, ' '),
-            " 101120 New ATOS Banque 1075.00 101130 New ATOS Frais 90.91 101120 New Tax 20.00% 215.00 101300 New Tax 10.00% include 9.09 ",
+            " 101120 New ATOS Banque 1075.00 101130 New ATOS Frais 90.91 101120 New ATOS Banque Tax 20.00% 215.00 101300 New ATOS Frais Tax 10.00% include 9.09 ",
             "should update the value of the 4 lines (because the line must have 100% of the value)");
         assert.strictEqual(widget.$('.accounting_view tfoot .cell_label, .accounting_view tfoot .cell_left').text().replace(/[\n\r\s$,]+/g, ' '),
             "Open balance215.00", "should change the 'Open balance' line because the 20.00% tax is not an include tax");

addons/account/wizard/account_invoice_send_views.xml

@@ -14,7 +14,6 @@
                     <field name="invoice_ids" invisible="1"/>
                     <field name="email_from" invisible="1" />
                     <field name="mail_server_id" invisible="1"/>
-                    <field name="reply_to" invisible="1"/>
                     <div name="option_print">
                         <field name="is_print" />
                         <b><label for="is_print"/></b>

addons/account_analytic_default/models/account_analytic_default.py

@@ -78,5 +78,6 @@ class AccountMoveLine(models.Model):
             date=self.date_maturity,
             company_id=self.move_id.company_id.id
         )
-        self.analytic_account_id = rec.analytic_id.id
-        self.analytic_tag_ids = rec.analytic_tag_ids.ids
+        if rec:
+            self.analytic_account_id = rec.analytic_id.id
+            self.analytic_tag_ids = rec.analytic_tag_ids.ids

addons/crm/views/crm_lead_views.xml

@@ -109,7 +109,7 @@
                                 <field name="zip" placeholder="ZIP" class="o_address_zip"/>
                                 <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                             </div>
-                            <field name="website" widget="url" placeholder="e.g. www.odoo.com"/>
+                            <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/>
                         </group>
                         <group>
                             <label for="contact_name"/>
@@ -642,7 +642,7 @@
                                         <field name="zip" placeholder="ZIP" class="o_address_zip"/>
                                         <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                                     </div>
-                                    <field name="website" widget="url" placeholder="e.g. www.odoo.com"/>
+                                    <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/>
                                 </group>
 
                                 <group class="mt48">

addons/digest/views/digest_templates.xml

@@ -6,7 +6,7 @@
                     <div class="col-lg-6 offset-lg-3">
                         <h3>Digest Subscriptions</h3>
                         <div class="alert alert-success text-center" role="status">
-                            <p>You have been successfully unsubscribed from <string t-field="digest.name"/></p>
+                            <p>You have been successfully unsubscribed from <strong t-field="digest.name"/></p>
                         </div>
                     </div>
                 </div>

addons/google_drive/models/res_config_settings.py

@@ -28,10 +28,12 @@ class ResConfigSettings(models.TransientModel):
         params = self.env['ir.config_parameter'].sudo()
         authorization_code_before = params.get_param('google_drive_authorization_code')
         authorization_code = self.google_drive_authorization_code
-        refresh_token = False
-        if authorization_code and authorization_code != authorization_code_before:
-            refresh_token = self.env['google.service'].generate_refresh_token('drive', authorization_code)
-        params.set_param('google_drive_refresh_token', refresh_token)
+        if authorization_code != authorization_code_before:
+            refresh_token = (
+                self.env['google.service'].generate_refresh_token('drive', authorization_code)
+                if authorization_code else False
+            )
+            params.set_param('google_drive_refresh_token', refresh_token)
 
     @api.multi
     def action_setup_token(self):

addons/hr/security/hr_security.xml

@@ -54,5 +54,12 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
+    <record id="hr_employee_comp_rule" model="ir.rule">
+        <field name="name">Employee multi company rule</field>
+        <field name="model_id" ref="model_hr_employee"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
 </data>
 </odoo>

addons/hr_holidays/models/hr_leave.py

@@ -553,6 +553,8 @@ class HolidaysRequest(models.Model):
         if not values.get('department_id'):
             values.update({'department_id': self.env['hr.employee'].browse(employee_id).department_id.id})
         holiday = super(HolidaysRequest, self.with_context(mail_create_nosubscribe=True)).create(values)
+        if self._context.get('import_file'):
+            holiday._onchange_leave_dates()
         if not self._context.get('leave_fast_create'):
             holiday.add_follower(employee_id)
             if holiday.validation_type == 'hr':

addons/hr_holidays/models/hr_leave_allocation.py

@@ -378,7 +378,8 @@ class HolidaysAllocation(models.Model):
             holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids)
         if 'employee_id' in values:
             holiday._onchange_employee()
-        holiday.activity_update()
+        if not self._context.get('import_file'):
+            holiday.activity_update()
         return holiday
 
     @api.multi

addons/hr_timesheet/views/res_config_settings_views.xml

@@ -105,5 +105,5 @@
     </record>
 
     <menuitem id="hr_timesheet_config_settings_menu_action" name="Settings" parent="hr_timesheet_menu_configuration"
-        action="hr_timesheet_config_settings_action" sequence="0"/>
+        action="hr_timesheet_config_settings_action" sequence="0" groups="base.group_system"/>
 </odoo>

addons/hr_timesheet_attendance/report/hr_timesheet_attendance_report.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, fields, models
+from odoo import api, fields, models, tools
 
 
 class TimesheetAttendance(models.Model):
@@ -17,7 +17,7 @@ class TimesheetAttendance(models.Model):
 
     @api.model_cr
     def init(self):
-        self._cr.execute("DROP VIEW IF EXISTS hr_timesheet_attendance_report")
+        tools.drop_view_if_exists(self.env.cr, self._table)
         self._cr.execute("""CREATE OR REPLACE VIEW %s AS (
             SELECT
                 max(id) AS id,

addons/l10n_ae/data/account_tax_report_data.xml

@@ -16,7 +16,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_abu_dhabi" model="account.tax.report.line">
         <field name="name">a. Abu Dhabi</field>
-        <field name="tag_name">a. Abu Dhabi</field>
+        <field name="tag_name">a. Abu Dhabi (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_AB</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="1"/>
@@ -25,7 +25,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_dubai" model="account.tax.report.line">
         <field name="name">b. Dubai</field>
-        <field name="tag_name">b. Dubai</field>
+        <field name="tag_name">b. Dubai (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_DB</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="2"/>
@@ -34,7 +34,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_sharjah" model="account.tax.report.line">
         <field name="name">c. Sharjah</field>
-        <field name="tag_name">c. Sharjah</field>
+        <field name="tag_name">c. Sharjah (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_SJ</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="3"/>
@@ -43,7 +43,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_ajman" model="account.tax.report.line">
         <field name="name">d. Ajman</field>
-        <field name="tag_name">d. Ajman</field>
+        <field name="tag_name">d. Ajman (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_AJ</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="4"/>
@@ -52,7 +52,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_umm_al_quwain" model="account.tax.report.line">
         <field name="name">e. Umm Al Quwain</field>
-        <field name="tag_name">e. Umm Al Quwain</field>
+        <field name="tag_name">e. Umm Al Quwain (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_UM</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="5"/>
@@ -61,7 +61,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_ras_al_khaima" model="account.tax.report.line">
         <field name="name">f. Ras Al-Khaima</field>
-        <field name="tag_name">f. Ras Al-Khaima</field>
+        <field name="tag_name">f. Ras Al-Khaima (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_RA</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="6"/>
@@ -70,7 +70,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_base_fujairah" model="account.tax.report.line">
         <field name="name">g. Fujairah</field>
-        <field name="tag_name">g. Fujairah</field>
+        <field name="tag_name">g. Fujairah (Base)</field>
         <field name="code">STD_RATE_SUPP_BASE_FU</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
         <field name="sequence" eval="7"/>
@@ -87,7 +87,7 @@
 
     <record id="tax_report_line_tax_refund_tourist_base" model="account.tax.report.line">
         <field name="name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
-        <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme (Base)</field>
         <field name="code">TAX_REF_TOUR_SCHEME_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
         <field name="sequence" eval="2"/>
@@ -96,7 +96,7 @@
 
     <record id="tax_report_line_supplies_reverse_charge_base" model="account.tax.report.line">
         <field name="name">3. Supplies subject to reverse charge provisions</field>
-        <field name="tag_name">3. Supplies subject to reverse charge provisions</field>
+        <field name="tag_name">3. Supplies subject to reverse charge provisions (Base)</field>
         <field name="code">REVERSE_CHARGE_PRO_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
         <field name="sequence" eval="3"/>
@@ -105,7 +105,7 @@
 
     <record id="tax_report_line_zero_rated_supplies_base" model="account.tax.report.line">
         <field name="name">4. Zero rated supplies</field>
-        <field name="tag_name">4. Zero rated supplies</field>
+        <field name="tag_name">4. Zero rated supplies (Base)</field>
         <field name="code">ZERO_RATE_SUPP_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
         <field name="sequence" eval="4"/>
@@ -114,7 +114,7 @@
 
     <record id="tax_report_line_exempt_supplies_base" model="account.tax.report.line">
         <field name="name">5. Exempt supplies</field>
-        <field name="tag_name">5. Exempt supplies</field>
+        <field name="tag_name">5. Exempt supplies (Base)</field>
         <field name="code">EXAMPT_SUPP_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
         <field name="sequence" eval="5"/>
@@ -131,7 +131,7 @@
 
     <record id="tax_report_line_import_uae_base" model="account.tax.report.line">
         <field name="name">7. Goods imported into the UAE</field>
-        <field name="tag_name">7. Goods imported into the UAE</field>
+        <field name="tag_name">7. Goods imported into the UAE (Base)</field>
         <field name="code">GOODS_IMPORT_IN_UAE_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
         <field name="sequence" eval="7"/>
@@ -162,7 +162,7 @@
 
     <record id="tax_report_line_standard_rated_expense_base" model="account.tax.report.line">
         <field name="name">10. Standard rated expenses</field>
-        <field name="tag_name">10. Standard rated expenses</field>
+        <field name="tag_name">10. Standard rated expenses (Base)</field>
         <field name="code">STD_RATE_EXPENSES_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_expense"/>
         <field name="sequence" eval="1"/>
@@ -171,7 +171,7 @@
 
     <record id="tax_report_line_expense_supplies_reverse_base" model="account.tax.report.line">
         <field name="name">11. Supplies subject to the reverse charge provisions</field>
-        <field name="tag_name">11. Supplies subject to the reverse charge provisions</field>
+        <field name="tag_name">11. Supplies subject to the reverse charge provisions (Base)</field>
         <field name="code">SUPP_REV_CHARGE_PRO_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_expense"/>
         <field name="sequence" eval="2"/>
@@ -209,7 +209,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_abu_dhabi" model="account.tax.report.line">
         <field name="name">a. Abu Dhabi</field>
-        <field name="tag_name">a. Abu Dhabi</field>
+        <field name="tag_name">a. Abu Dhabi (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_AB</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="1"/>
@@ -218,7 +218,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_dubai" model="account.tax.report.line">
         <field name="name">b. Dubai</field>
-        <field name="tag_name">b. Dubai</field>
+        <field name="tag_name">b. Dubai (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_DB</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="2"/>
@@ -227,7 +227,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_sharjah" model="account.tax.report.line">
         <field name="name">c. Sharjah</field>
-        <field name="tag_name">c. Sharjah</field>
+        <field name="tag_name">c. Sharjah (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_SJ</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="3"/>
@@ -236,7 +236,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_ajman" model="account.tax.report.line">
         <field name="name">d. Ajman</field>
-        <field name="tag_name">d. Ajman</field>
+        <field name="tag_name">d. Ajman (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_AJ</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="4"/>
@@ -245,7 +245,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_umm_al_quwain" model="account.tax.report.line">
         <field name="name">e. Umm Al Quwain</field>
-        <field name="tag_name">e. Umm Al Quwain</field>
+        <field name="tag_name">e. Umm Al Quwain (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_UM</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="5"/>
@@ -254,7 +254,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_ras_al_khaima" model="account.tax.report.line">
         <field name="name">f. Ras Al-Khaima</field>
-        <field name="tag_name">f. Ras Al-Khaima</field>
+        <field name="tag_name">f. Ras Al-Khaima (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_RA</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="6"/>
@@ -263,7 +263,7 @@
 
     <record id="tax_report_line_standard_rated_supplies_vat_fujairah" model="account.tax.report.line">
         <field name="name">g. Fujairah</field>
-        <field name="tag_name">g. Fujairah</field>
+        <field name="tag_name">g. Fujairah (Tax)</field>
         <field name="code">STD_RATE_SUPP_TAX_FU</field>
          <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
         <field name="sequence" eval="7"/>
@@ -280,7 +280,7 @@
 
     <record id="tax_report_line_tax_refund_tourist_vat" model="account.tax.report.line">
         <field name="name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
-        <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field>
+        <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme (Tax)</field>
         <field name="code">TAX_REF_TOUR_SCHEME_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
         <field name="sequence" eval="2"/>
@@ -289,7 +289,7 @@
 
     <record id="tax_report_line_supplies_reverse_charge_vat" model="account.tax.report.line">
         <field name="name">3. Supplies subject to reverse charge provisions</field>
-        <field name="tag_name">3. Supplies subject to reverse charge provisions</field>
+        <field name="tag_name">3. Supplies subject to reverse charge provisions (Tax)</field>
         <field name="code">REVERSE_CHARGE_PRO_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
         <field name="sequence" eval="3"/>
@@ -298,7 +298,7 @@
 
     <record id="tax_report_line_zero_rated_supplies_vat" model="account.tax.report.line">
         <field name="name">4. Zero rated supplies</field>
-        <field name="tag_name">4. Zero rated supplies</field>
+        <field name="tag_name">4. Zero rated supplies (Tax)</field>
         <field name="code">ZERO_RATE_SUPP_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
         <field name="sequence" eval="4"/>
@@ -307,7 +307,7 @@
 
     <record id="tax_report_line_exempt_supplies_vat" model="account.tax.report.line">
         <field name="name">5. Exempt supplies</field>
-        <field name="tag_name">5. Exempt supplies</field>
+        <field name="tag_name">5. Exempt supplies (Tax)</field>
         <field name="code">EXAMPT_SUPP_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
         <field name="sequence" eval="5"/>
@@ -324,7 +324,7 @@
 
     <record id="tax_report_line_import_uae_vat" model="account.tax.report.line">
         <field name="name">7. Goods imported into the UAE</field>
-        <field name="tag_name">7. Goods imported into the UAE</field>
+        <field name="tag_name">7. Goods imported into the UAE (Tax)</field>
         <field name="code">GOODS_IMPORT_IN_UAE_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
         <field name="sequence" eval="7"/>
@@ -355,7 +355,7 @@
 
     <record id="tax_report_line_standard_rated_expense_vat" model="account.tax.report.line">
         <field name="name">10. Standard rated expenses</field>
-        <field name="tag_name">10. Standard rated expenses</field>
+        <field name="tag_name">10. Standard rated expenses (Tax)</field>
         <field name="code">STD_RATE_EXPENSES_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
         <field name="sequence" eval="1"/>
@@ -364,7 +364,7 @@
 
     <record id="tax_report_line_expense_supplies_reverse_vat" model="account.tax.report.line">
         <field name="name">11. Supplies subject to the reverse charge provisions</field>
-        <field name="tag_name">11. Supplies subject to the reverse charge provisions</field>
+        <field name="tag_name">11. Supplies subject to the reverse charge provisions (Tax)</field>
         <field name="code">SUPP_REV_CHARGE_PRO_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
         <field name="sequence" eval="2"/>

addons/l10n_ae/data/account_tax_template_data.xml

@@ -262,7 +262,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -274,7 +273,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
     </record>
@@ -295,7 +293,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -307,7 +304,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
     </record>
@@ -402,7 +398,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -421,7 +417,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -448,7 +444,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -467,7 +463,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -494,7 +490,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -513,7 +509,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -540,7 +536,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -559,7 +555,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -586,7 +582,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -605,7 +601,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -632,7 +628,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -651,7 +647,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -747,8 +743,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -759,8 +753,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
             }),
         ]"/>
     </record>
@@ -780,8 +772,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -792,8 +782,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
             }),
         ]"/>
     </record>
@@ -852,7 +840,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+                'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
             }),
             (0,0, {
                 'factor_percent': -100,
@@ -864,14 +852,14 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+                'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
             }),
             (0,0, {
                 'factor_percent': -100,
@@ -883,7 +871,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
             }),
         ]"/>
     </record>

addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_at/data/account_tax_data.xml

@@ -234,6 +234,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'base',
                     'minus_report_line_ids': [ref('tax_report_ust_steuern_innergemeinschaft_steu_bmg_20')],
+                    'plus_report_line_ids': [ref('tax_report_bemess_vorst_rechnungen_20')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -253,6 +254,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'base',
                     'plus_report_line_ids': [ref('tax_report_ust_steuern_innergemeinschaft_steu_bmg_20')],
+                    'minus_report_line_ids': [ref('tax_report_bemess_vorst_rechnungen_20')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -406,7 +408,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart3500'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -418,7 +419,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart3500'),
                 }),
             ]"/>
         </record>
@@ -440,7 +440,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart3500'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -452,7 +451,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart3500'),
                 }),
             ]"/>
         </record>

addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_au/data/account_tax_template_data.xml

@@ -98,7 +98,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g2')],
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[
@@ -110,7 +109,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g2')],
                 }),
             ]"/>
     </record>
@@ -133,7 +131,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g3')],
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[
@@ -145,7 +142,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g3')],
                 }),
             ]"/>
     </record>
@@ -168,7 +164,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g4')],
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[
@@ -180,7 +175,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g4')],
                 }),
             ]"/>
     </record>
@@ -353,7 +347,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[
@@ -365,7 +358,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
                 }),
             ]"/>
     </record>
@@ -388,7 +380,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[
@@ -400,7 +391,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
                 }),
             ]"/>
     </record>

addons/l10n_be/data/account_tax_template_data.xml

@@ -266,7 +266,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -279,7 +278,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
         </record>
@@ -304,8 +302,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
-                    'plus_report_line_ids': [],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -318,8 +314,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
-                    'plus_report_line_ids': [],
                 }),
             ]"/>
         </record>
@@ -344,7 +338,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -357,7 +350,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
         </record>
@@ -383,7 +375,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -396,7 +387,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
         </record>
@@ -421,7 +411,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -434,7 +423,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
         </record>
@@ -460,7 +448,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -473,7 +460,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
         </record>
@@ -498,7 +484,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -511,7 +496,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451054'),
                 }),
             ]"/>
         </record>
@@ -659,7 +643,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -673,7 +656,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -992,7 +974,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1006,7 +987,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -1032,7 +1012,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1046,7 +1025,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -1198,7 +1176,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1212,7 +1189,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -1396,7 +1372,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1410,7 +1385,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -1595,7 +1569,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1609,7 +1582,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -1794,7 +1766,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451056'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1808,7 +1779,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a451056'),
                 }),
             ]"/>
         </record>
@@ -2048,7 +2018,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2062,7 +2031,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -2406,7 +2374,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2420,7 +2387,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -2499,7 +2465,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2513,7 +2478,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -2645,7 +2609,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2659,7 +2622,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -2843,7 +2805,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2857,7 +2818,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -3042,7 +3002,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -3056,7 +3015,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>
@@ -3241,7 +3199,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -3255,7 +3212,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('a411059'),
                 }),
             ]"/>
         </record>

addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_br/data/account_tax_template_data.xml

@@ -41,8 +41,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010301'),
-	                'plus_report_line_ids': [ref('tax_report_ipi_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -54,8 +52,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050502'),
-	                'minus_report_line_ids': [ref('tax_report_ipi_2')],
 	            }),
 	        ]"/>
        	</record>
@@ -1040,8 +1036,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050502'),
-	                'minus_report_line_ids': [ref('tax_report_ipi_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1053,8 +1047,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010301'),
-	                'plus_report_line_ids': [ref('tax_report_ipi_2')],
 	            }),
 	        ]"/>
        	</record>
@@ -2039,8 +2031,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010302'),
-	                'plus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2052,8 +2042,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050505'),
-	                'minus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2076,8 +2064,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010302'),
-	                'plus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2089,8 +2075,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050505'),
-	                'minus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2113,7 +2097,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'minus_report_line_ids': [ref('tax_report_icmsst_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2125,7 +2108,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'plus_report_line_ids': [ref('tax_report_icmsst_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2296,8 +2278,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050505'),
-	                'minus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2309,8 +2289,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010302'),
-	                'plus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2333,8 +2311,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050505'),
-	                'minus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2346,8 +2322,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010302'),
-	                'plus_report_line_ids': [ref('tax_report_icms_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2370,7 +2344,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'plus_report_line_ids': [ref('tax_report_icmsst_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2382,7 +2355,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'minus_report_line_ids': [ref('tax_report_icmsst_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2553,8 +2525,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010500'),
-	                'plus_report_line_ids': [ref('tax_report_pis_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2566,8 +2536,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050503'),
-	                'minus_report_line_ids': [ref('tax_report_pis_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2627,8 +2595,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050503'),
-	                'minus_report_line_ids': [ref('tax_report_pis_1')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2640,8 +2606,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010500'),
-	                'plus_report_line_ids': [ref('tax_report_pis_1')],
 	            }),
 	        ]"/>
        	</record>
@@ -2701,8 +2665,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010500'),
-	                'plus_report_line_ids': [ref('tax_report_cofins_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2714,8 +2676,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050503'),
-	                'minus_report_line_ids': [ref('tax_report_cofins_2')],
 	            }),
 	        ]"/>
        	</record>
@@ -2775,8 +2735,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_101050503'),
-	                'minus_report_line_ids': [ref('tax_report_cofins_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2788,8 +2746,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'account_id': ref('account_template_201010500'),
-	                'plus_report_line_ids': [ref('tax_report_cofins_2')],
 	            }),
 	        ]"/>
        	</record>
@@ -2849,7 +2805,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'minus_report_line_ids': [ref('tax_report_irpj_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2861,7 +2816,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'plus_report_line_ids': [ref('tax_report_irpj_2')],
 	            }),
 	        ]"/>
         </record>
@@ -2884,7 +2838,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'minus_report_line_ids': [ref('tax_report_ir_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2896,7 +2849,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'plus_report_line_ids': [ref('tax_report_ir_2')],
 	            }),
 	        ]"/>
         </record>
@@ -2919,7 +2871,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'plus_report_line_ids': [ref('tax_report_issqn_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2931,7 +2882,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'minus_report_line_ids': [ref('tax_report_issqn_2')],
 	            }),
 	        ]"/>
         </record>
@@ -3163,7 +3113,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'minus_report_line_ids': [ref('tax_report_csll_2')],
 	            }),
 	        ]"/>
 	        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -3175,7 +3124,6 @@
 	            (0,0, {
 	                'factor_percent': 100,
 	                'repartition_type': 'tax',
-	                'plus_report_line_ids': [ref('tax_report_csll_2')],
 	            }),
 	        ]"/>
         </record>

addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_ch/data/account_vat2011_data.xml

@@ -622,7 +622,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('ch_coa_2200'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -634,7 +633,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('ch_coa_2200'),
                 }),
             ]"/>
         </record>
@@ -656,7 +654,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('ch_coa_2200'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -668,7 +665,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('ch_coa_2200'),
                 }),
             ]"/>
         </record>
@@ -701,7 +697,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('ch_coa_1171'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -713,7 +708,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('ch_coa_1171'),
                 }),
             ]"/>
         </record>
@@ -736,7 +730,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('ch_coa_1170'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -749,7 +743,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('ch_coa_1170'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
                 }),
             ]"/>
         </record>

addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_co/data/account_tax_template.xml

@@ -116,7 +116,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('co_puc_236505'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -128,7 +127,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('co_puc_236505'),
             }),
         ]"/>
     </record>
@@ -1424,7 +1422,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('co_puc_236805'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1436,7 +1433,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('co_puc_236805'),
             }),
         ]"/>
     </record>

addons/l10n_de/__manifest__.py

@@ -21,6 +21,7 @@ German accounting chart and localization.
         'data/account_account_tags_data.xml',
         'data/res.country.state.csv',
         'data/menuitem_data.xml',
+        'views/account_view.xml',
         'report/din5008_report.xml',
         'data/report_layout.xml',
     ],

addons/l10n_de/views/account_view.xml

@@ -5,7 +5,7 @@
             <field name="model">account.tax</field>
             <field name="inherit_id" ref="account.view_tax_form"/>
             <field name="arch" type="xml">
-                <field name="tag_ids" position="after">
+                <field name="include_base_amount" position="after">
                     <field name="l10n_de_datev_code"/>
                 </field>
             </field>

addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml

@@ -923,7 +923,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('account_1770'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -936,7 +935,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('account_1770'),
                 }),
             ]"/>
             <field name="tax_group_id" ref="tax_group_x"/>

addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml

@@ -960,7 +960,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart_skr04_3800'),
                 }),
 
             ]"/>
@@ -974,7 +973,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart_skr04_3800'),
                 }),
 
             ]"/>

addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_do/data/account.tax.template.xml

@@ -798,7 +798,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('do_niif_21030203'),
-                    'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -811,7 +811,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('do_niif_21030203'),
-                    'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
                 }),
             ]"/>
         </record>
@@ -836,7 +836,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('do_niif_21030202'),
-                    'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -849,7 +849,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('do_niif_21030202'),
-                    'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
                 }),
             ]"/>
         </record>
@@ -1217,36 +1217,6 @@
             <field name="tax_group_id" ref="group_ret"/>
         </record>
 
-        <record id="tax_group_moral_construction" model="account.tax.template">
-            <field name="chart_template_id" ref="do_chart_template"/>
-            <field name="sequence">62</field>
-            <field name="name">Retención a Jurídica (Servicios Construcción con Materiales)</field>
-            <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
-            <field name="type_tax_use">none</field>
-            <field name="tax_group_id" ref="group_ret"/>
-            <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',
-                }),
-            ]"/>
-            <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',
-                }),
-            ]"/>
-        </record>
-
         <record id="tax_group_person_services" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">58</field>

addons/l10n_es/data/account.account.template-common.csv

@@ -276,7 +276,7 @@
 "account_common_523","Proveedores de inmovilizado a corto plazo","523","account.data_account_type_payable","l10n_es.account_chart_template_common","l10n_es.account_group_523","True"
 "account_common_524","Acreedores por arrendamiento financiero a corto plazo","524","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_524","False"
 "account_common_525","Efectos a pagar a corto plazo","525","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_525","False"
-"account_common_526","Dividendo activo a pagar","526","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_526","False"
+"account_common_526","Dividendo activo a pagar","526","account.data_account_type_payable","l10n_es.account_chart_template_common","l10n_es.account_group_526","True"
 "account_common_527","Intereses a corto plazo de deudas con entidades de crédito","527","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_527","False"
 "account_common_528","Intereses a corto plazo de deudas","528","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_528","False"
 "account_common_5290","Provisión a corto plazo por retribuciones al personal","5290","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_5290","True"

addons/l10n_es/data/account_tax_data.xml

@@ -445,6 +445,7 @@
         <field name="description">P_IVA21_SP_IN</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/>
         <field name="amount_type">percent</field>
         <field name="amount" eval="21"/>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
@@ -550,6 +551,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount_type">percent</field>
         <field name="amount" eval="21"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -716,6 +718,7 @@
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/>
         <field name="name">IVA 4% Adquisición de servicios extracomunitarios</field>
         <field name="tax_group_id" ref="tax_group_iva_4"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -767,6 +770,7 @@
         <field name="description">P_IVA10_SP_EX</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="amount_type">percent</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición de servicios extracomunitarios</field>
         <field name="tax_group_id" ref="tax_group_iva_10"/>
@@ -820,6 +824,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount" eval="21"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/>
         <field name="amount_type">percent</field>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -869,6 +874,7 @@
         <field name="amount" eval="4"/>
         <field name="description">P_IVA4_IC_BC</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_36_37'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 4% Adquisición Intracomunitario. Bienes corrientes</field>
@@ -924,6 +930,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 4% Adquisición Intracomunitario. Bienes de inversión</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_4"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -972,6 +979,7 @@
         <field name="amount" eval="10"/>
         <field name="description">P_IVA10_IC_BC</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_36_37'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición Intracomunitario. Bienes corrientes</field>
@@ -1026,6 +1034,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición Intracomunitario. Bienes de inversión</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -3068,6 +3077,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición de servicios intracomunitarios</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -3119,6 +3129,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 4% Adquisición de servicios intracomunitarios</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_4"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -3392,6 +3403,7 @@
         <field name="description">P_IVA4_ISP</field>
         <field name="name">IVA 4% Compra con Inversión del Sujeto Pasivo Nacional</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="amount" eval="4"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
@@ -3443,6 +3455,7 @@
         <field name="description">P_IVA10_ISP</field>
         <field name="name">IVA 10% Compra con Inversión del Sujeto Pasivo Nacional</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="amount" eval="10"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
@@ -3496,6 +3509,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount_type">percent</field>
         <field name="amount" eval="21"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),

addons/l10n_et/data/account_tax_data.xml

@@ -55,7 +55,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et3007'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -67,7 +66,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et3007'),
                 }),
             ]"/>
         </record>
@@ -89,7 +87,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et3007'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -101,7 +98,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et3007'),
                 }),
             ]"/>
         </record>
@@ -123,7 +119,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et3007'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -135,7 +130,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et3007'),
                 }),
             ]"/>
         </record>
@@ -158,7 +152,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et3006'),
-                    'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')],
+                    'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -171,7 +165,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et3006'),
-                    'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')],
+                    'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')],
                 }),
             ]"/>
         </record>
@@ -194,7 +188,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et3006'),
-                    'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')],
+                    'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -207,7 +201,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et3006'),
-                    'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')],
+                    'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')],
                 }),
             ]"/>
         </record>
@@ -230,7 +224,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et3006'),
-                    'minus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')],
+                    'plus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -243,7 +237,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et3006'),
-                    'plus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')],
+                    'minus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')],
                 }),
             ]"/>
         </record>
@@ -301,7 +295,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et2212'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -313,7 +306,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et2212'),
                 }),
             ]"/>
         </record>
@@ -335,7 +327,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et2212'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -347,7 +338,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et2212'),
                 }),
             ]"/>
         </record>
@@ -369,7 +359,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et2212'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -381,7 +370,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('l10n_et2212'),
                 }),
             ]"/>
         </record>
@@ -404,7 +392,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et2213'),
-                    'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')],
+                    'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -417,7 +405,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et2213'),
-                    'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')],
+                    'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')],
                 }),
             ]"/>
         </record>
@@ -440,7 +428,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et2213'),
-                    'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')],
+                    'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -453,7 +441,7 @@
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('l10n_et2213'),
-                    'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')],
+                    'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')],
                 }),
             ]"/>
         </record>

addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_fr/data/account_tax_data.xml

@@ -985,13 +985,13 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')],
             }),
 
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')],
                 'account_id': ref('pcg_44566'),
             }),
         ]"/>
@@ -999,13 +999,13 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')],
             }),
 
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')],
                 'account_id': ref('pcg_44566'),
             }),
         ]"/>
@@ -1270,7 +1270,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
                 'account_id': ref('pcg_445201'),
             }),
         ]"/>
@@ -1284,7 +1284,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
                 'account_id': ref('pcg_445201'),
             }),
         ]"/>
@@ -1309,7 +1309,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1323,7 +1323,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1348,7 +1348,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
                 'account_id': ref('pcg_445202'),
             }),
         ]"/>
@@ -1362,7 +1362,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
                 'account_id': ref('pcg_445202'),
             }),
         ]"/>
@@ -1387,7 +1387,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1401,7 +1401,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1426,7 +1426,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1440,7 +1440,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1734,7 +1734,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1747,7 +1746,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445201'),
             }),
         ]"/>
     </record>
@@ -1771,7 +1769,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445663'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1784,7 +1781,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445663'),
             }),
         ]"/>
     </record>

addons/l10n_fr/data/tax_report_data.xml

@@ -569,8 +569,8 @@
         </record>
 
         <record id="tax_report_base_ded_intra_20" model="account.tax.report.line">
-            <field name="name">Base H.T. 20%</field>
-            <field name="tag_name">Base déductible intracom. 20%</field>
+            <field name="name">Base H.T. 20.0%</field>
+            <field name="tag_name">Base déductible intracom. 20.0%</field>
             <field name="country_id" ref="base.fr"/>
             <field name="parent_id" ref="tax_report_base_ded_intra"/>
             <field name="sequence">1</field>

addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-
-def migrate(cr, version):
-    migrate_tags_on_taxes(cr, None)

addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py

@@ -1,7 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)
-

addons/l10n_gr/data/account_tax_data.xml

@@ -226,11 +226,13 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_357')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_377')]
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -259,11 +261,13 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_357')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_377')]
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -292,11 +296,13 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_357')]
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chartgr_54_00'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_377')]
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),

addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_hr/data/account_tax_report_data.xml

@@ -121,7 +121,7 @@
 
     <record id="account_tax_report_line_izdani_10" model="account.tax.report.line">
         <field name="name">II.1 Izdani računi po stopi 10%</field>
-        <field name="tag_name">II.1 Izdani računi po stopi 10%</field>
+        <field name="tag_name">II.1 Izdani računi po stopi 10% (osnovica)</field>
         <field name="code">izdani_10</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
@@ -137,7 +137,7 @@
 
     <record id="account_tax_report_line_izdani_25" model="account.tax.report.line">
         <field name="name">II.3 Izdani računi po stopi 25%</field>
-        <field name="tag_name">II.3 Izdani računi po stopi 25%</field>
+        <field name="tag_name">II.3 Izdani računi po stopi 25% (osnovica)</field>
         <field name="code">izdani_25</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
@@ -168,7 +168,7 @@
 
     <record id="account_tax_report_line_pretporez_10" model="account.tax.report.line">
         <field name="name">III.1. Pretporez 10%</field>
-        <field name="tag_name">III.1. Pretporez 10%</field>
+        <field name="tag_name">III.1. Pretporez 10% (osnovica)</field>
         <field name="code">pretporez_10</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -211,7 +211,7 @@
 
     <record id="account_tax_report_line_placeni_uvozu" model="account.tax.report.line">
         <field name="name">III.4. Plaćeni PP pri uvozu</field>
-        <field name="tag_name">III.4. Plaćeni PP pri uvozu</field>
+        <field name="tag_name">III.4. Plaćeni PP pri uvozu (osnovica)</field>
         <field name="code">placeni_uvozu</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -220,7 +220,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_10" model="account.tax.report.line">
         <field name="name">III.5. Plaćeni PP na ino usluge 10%</field>
-        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field>
+        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (osnovica)</field>
         <field name="code">placeni_usluge_10</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -237,7 +237,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_25" model="account.tax.report.line">
         <field name="name">III.7. Plaćeni PP na ino usluge 25%</field>
-        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field>
+        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (osnovica)</field>
         <field name="code">placeni_usluge_25</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -283,7 +283,7 @@
 
     <record id="account_tax_report_line_izdani_racuni" model="account.tax.report.line">
         <field name="name">II.1 Izdani računi po stopi 10%</field>
-        <field name="tag_name">II.1 Izdani računi po stopi 10%</field>
+        <field name="tag_name">II.1 Izdani računi po stopi 10% (porez)</field>
         <field name="code">izdani_racuni</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
@@ -299,7 +299,7 @@
 
     <record id="account_tax_report_line_izdani_racuni_25" model="account.tax.report.line">
         <field name="name">II.3 Izdani računi po stopi 25%</field>
-        <field name="tag_name">II.3 Izdani računi po stopi 25%</field>
+        <field name="tag_name">II.3 Izdani računi po stopi 25% (porez)</field>
         <field name="code">izdani_racuni_25</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
@@ -322,7 +322,7 @@
 
     <record id="account_tax_report_line_pretporez_10_tax" model="account.tax.report.line">
         <field name="name">III.1. Pretporez 10%</field>
-        <field name="tag_name">III.1. Pretporez 10%</field>
+        <field name="tag_name">III.1. Pretporez 10% (porez)</field>
         <field name="code">pretporez_10_tax</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -347,7 +347,7 @@
 
     <record id="account_tax_report_line_placeni_uvozu_tax" model="account.tax.report.line">
         <field name="name">III.4. Plaćeni PP pri uvozu</field>
-        <field name="tag_name">III.4. Plaćeni PP pri uvozu</field>
+        <field name="tag_name">III.4. Plaćeni PP pri uvozu (porez)</field>
         <field name="code">placeni_uvozu_tax</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -356,7 +356,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_10_tax" model="account.tax.report.line">
         <field name="name">III.5. Plaćeni PP na ino usluge 10%</field>
-        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field>
+        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (porez)</field>
         <field name="code">placeni_usluge_10_tax</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -372,7 +372,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_25_tax" model="account.tax.report.line">
         <field name="name">III.7. Plaćeni PP na ino usluge 25%</field>
-        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field>
+        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (porez)</field>
         <field name="code">placeni_usluge_25_ta</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>

addons/l10n_hr/data/account_tax_template_data.xml

@@ -131,7 +131,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -143,7 +142,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -240,7 +238,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -252,7 +249,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -349,7 +345,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -361,7 +356,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -384,7 +378,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -396,7 +389,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -419,7 +411,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -431,7 +422,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -454,7 +444,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -466,7 +455,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -489,7 +477,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -501,7 +488,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -524,7 +510,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -536,7 +521,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -666,7 +650,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -678,7 +661,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -736,7 +718,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -748,7 +729,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -845,7 +825,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -857,7 +836,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>

addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_hu/data/account_tax_template_data.xml

@@ -134,7 +134,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -146,7 +145,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
     </record>
@@ -170,7 +168,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -182,7 +179,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
     </record>
@@ -206,7 +202,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -218,7 +213,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
     </record>
@@ -242,7 +236,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -254,7 +247,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
     </record>
@@ -278,7 +270,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -290,7 +281,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_467'),
             }),
         ]"/>
     </record>
@@ -428,7 +418,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -440,7 +429,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
     </record>
@@ -464,7 +452,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -476,7 +463,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
     </record>
@@ -499,7 +485,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -510,7 +495,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
     </record>
@@ -534,7 +518,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -546,7 +529,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
     </record>
@@ -570,7 +552,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -582,7 +563,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
     </record>
@@ -606,7 +586,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -618,7 +597,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('chart_hu_466'),
             }),
         ]"/>
     </record>

addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_ie/data/account_tax_data.xml

@@ -16,7 +16,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2200'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -27,7 +26,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2200'),
             }),
         ]"/>
     </record>
@@ -78,7 +76,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2200'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -89,7 +86,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2200'),
             }),
         ]"/>
     </record>
@@ -109,7 +105,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -120,7 +115,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2201'),
             }),
         ]"/>
     </record>
@@ -171,7 +165,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -182,7 +175,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2201'),
             }),
         ]"/>
     </record>
@@ -274,7 +266,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2200'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -285,7 +276,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2200'),
             }),
         ]"/>
     </record>
@@ -305,7 +295,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -316,7 +305,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('l10n_ie_a2201'),
             }),
         ]"/>
     </record>

addons/l10n_in/data/account_tax_template_data.xml

@@ -185,7 +185,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p11236'),
 
             }),
         ]"/>
@@ -198,7 +197,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p10056'),
 
             }),
         ]"/>
@@ -224,7 +222,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p11236'),
 
             }),
         ]"/>
@@ -237,7 +234,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p10056'),
 
             }),
         ]"/>
@@ -506,7 +502,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p10052'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -554,7 +550,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p10052'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -602,7 +598,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p10052'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -650,7 +646,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p10052'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -698,7 +694,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p10052'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -747,7 +743,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p10052'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -898,7 +894,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p10056'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -910,7 +905,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p11236'),
             }),
         ]"/>
     </record>
@@ -935,7 +929,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p10056'),
 
             }),
         ]"/>
@@ -948,7 +941,6 @@ if tax > result:result=tax</field>
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('p11236'),
 
             }),
         ]"/>
@@ -1215,7 +1207,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p11233'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -1263,7 +1255,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p11233'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -1311,7 +1303,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p11233'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -1359,7 +1351,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p11233'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -1407,7 +1399,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p11233'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>
@@ -1456,7 +1448,7 @@ if tax > result:result=tax</field>
                 'factor_percent': 50,
                 'repartition_type': 'tax',
                 'account_id': ref('p11233'),
-                'plus_report_line_ids': [ref('tax_report_line_cgst')],
+                'minus_report_line_ids': [ref('tax_report_line_cgst')],
             }),
         ]"/>
     </record>

addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_it/data/account_tax_template.xml

@@ -356,11 +356,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -371,11 +366,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -592,11 +582,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -607,11 +592,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -812,11 +792,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -827,11 +802,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -993,7 +963,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2601'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1004,7 +973,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2601'),
             }),
         ]"/>
     </record>
@@ -1027,7 +995,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('1601'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1038,7 +1005,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('1601'),
             }),
         ]"/>
     </record>
@@ -1061,7 +1027,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2601'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1072,7 +1037,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2601'),
             }),
         ]"/>
     </record>
@@ -1095,7 +1059,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('1601'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1106,7 +1069,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('1601'),
             }),
         ]"/>
     </record>
@@ -1367,7 +1329,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2601'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1378,7 +1339,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2601'),
             }),
         ]"/>
     </record>
@@ -1524,11 +1484,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -1539,11 +1494,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -1734,11 +1684,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
@@ -1749,11 +1694,6 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 0,
-                'repartition_type': 'tax',
-                'account_id': ref('1601'),
-            }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',

addons/l10n_jp/data/account_tax_report_data.xml

@@ -32,7 +32,7 @@
 
     <record id="tax_report_to_pay_temp_tx_tax_free" model="account.tax.report.line">
         <field name="name">不課税</field>
-        <field name="tag_name">不課税</field>
+        <field name="tag_name">不課税 (仮受税額)</field>
         <field name="parent_id" ref="tax_report_to_pay_temp_tx"/>
         <field name="sequence">3</field>
         <field name="country_id" ref="base.jp"/>
@@ -63,7 +63,7 @@
 
     <record id="tax_report_to_pay_temp_pmt_tax_free" model="account.tax.report.line">
         <field name="name">不課税</field>
-        <field name="tag_name">不課税</field>
+        <field name="tag_name">不課税 (仮払税額)</field>
         <field name="parent_id" ref="tax_report_to_pay_temp_pmt"/>
         <field name="sequence">3</field>
         <field name="country_id" ref="base.jp"/>

addons/l10n_jp/data/account_tax_template_data.xml

@@ -20,6 +20,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'account_id': ref('A21809'),
                 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
             }),
         ]"/>
@@ -32,6 +33,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'account_id': ref('A21809'),
                 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
             }),
         ]"/>
@@ -56,6 +58,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'account_id': ref('A21809'),
                 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
             }),
         ]"/>
@@ -68,6 +71,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'account_id': ref('A21809'),
                 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
             }),
         ]"/>
@@ -92,7 +96,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_duty_free')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -104,7 +107,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_duty_free')],
             }),
         ]"/>
         <field name="tax_group_id" ref="tax_group_0"/>
@@ -128,12 +130,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_tax_free')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_tax_free')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -145,12 +141,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_tax_free')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_tax_free')],
             }),
         ]"/>
         <field name="tax_group_id" ref="tax_group_0"/>
@@ -250,7 +240,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_import_8')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -262,7 +251,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_import_8')],
             }),
         ]"/>
         <field name="tax_group_id" ref="tax_group_0"/>

addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_lu/data/account_tax_template_2015.xml

@@ -51,7 +51,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -70,7 +70,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -100,7 +100,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -119,7 +119,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -149,7 +149,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -168,7 +168,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -198,7 +198,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -217,7 +217,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -280,7 +280,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -299,7 +299,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -329,7 +329,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -348,7 +348,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -378,7 +378,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -397,7 +397,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -427,7 +427,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -446,7 +446,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -509,7 +509,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -528,7 +528,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -558,7 +558,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -577,7 +577,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -607,7 +607,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -626,7 +626,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -656,7 +656,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -675,7 +675,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -920,7 +920,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -939,7 +939,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -969,7 +969,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -988,7 +988,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1018,7 +1018,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1037,7 +1037,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1067,7 +1067,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1086,7 +1086,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1149,7 +1149,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1168,7 +1168,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1198,7 +1198,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1217,7 +1217,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1247,7 +1247,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1266,7 +1266,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1296,7 +1296,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1315,7 +1315,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1559,7 +1559,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1578,7 +1578,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1608,7 +1608,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1627,7 +1627,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1657,7 +1657,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1676,7 +1676,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1706,7 +1706,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1725,7 +1725,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1788,7 +1788,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1807,7 +1807,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1837,7 +1837,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1856,7 +1856,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1886,7 +1886,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1905,7 +1905,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1935,7 +1935,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -1954,7 +1954,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2017,7 +2017,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2036,7 +2036,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2066,7 +2066,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2085,7 +2085,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2115,7 +2115,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2134,7 +2134,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2164,7 +2164,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2183,7 +2183,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2427,7 +2427,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2446,7 +2446,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2476,7 +2476,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2495,7 +2495,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2525,7 +2525,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2544,7 +2544,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2574,7 +2574,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2593,7 +2593,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2656,7 +2656,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2675,7 +2675,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2705,7 +2705,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2724,7 +2724,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2754,7 +2754,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2773,7 +2773,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2803,7 +2803,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -2822,7 +2822,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3066,7 +3066,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3085,7 +3085,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3115,7 +3115,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3134,7 +3134,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3164,7 +3164,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3183,7 +3183,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3213,7 +3213,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3232,7 +3232,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3295,7 +3295,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3314,7 +3314,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3344,7 +3344,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3363,7 +3363,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3393,7 +3393,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3412,7 +3412,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3442,7 +3442,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3461,7 +3461,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3524,7 +3524,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3543,7 +3543,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3573,7 +3573,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3592,7 +3592,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3622,7 +3622,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3641,7 +3641,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3671,7 +3671,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3690,7 +3690,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3934,7 +3934,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3953,7 +3953,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -3983,7 +3983,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4002,7 +4002,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4032,7 +4032,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4051,7 +4051,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4081,7 +4081,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4100,7 +4100,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614113'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4163,7 +4163,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4182,7 +4182,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4212,7 +4212,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4231,7 +4231,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4261,7 +4261,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4280,7 +4280,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4310,7 +4310,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,
@@ -4329,7 +4329,7 @@
 		        'factor_percent': -100,
 		        'repartition_type': 'tax',
 		        'account_id': ref('lu_2011_account_4614112'),
-		        'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+		        'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
 		    }),
 		    (0,0, {
 		        'factor_percent': 100,

addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_ma/data/account_tax_data.xml

@@ -334,7 +334,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_achats_interieur_ht_10')],
+                'plus_report_line_ids': [ref('tax_report_achats_importation_ht_10')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -347,7 +347,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_achats_interieur_ht_10')],
+                'minus_report_line_ids': [ref('tax_report_achats_importation_ht_10')],
             }),
             (0,0, {
                 'factor_percent': 100,

addons/l10n_ma/data/account_tax_report_data.xml

@@ -145,7 +145,7 @@
         <field name="country_id" ref="base.ma"/>
     </record>
 
-    <record id="tax_report_achats_interieur_ht_10" model="account.tax.report.line">
+    <record id="tax_report_achats_importation_ht_10" model="account.tax.report.line">
         <field name="name">Achats à l'importation (10%) (HT)</field>
         <field name="tag_name">Achats à l'importation (10%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>

addons/l10n_mn/__manifest__.py

@@ -5,6 +5,7 @@
     "name" : "Mongolia - Accounting",
     "version" : "1.0",
     'category': 'Localization',
+    "author" : "BumanIT LLC, Odoo S.A",
     "description": """
 This is the module to manage the accounting chart for Mongolia.
 ===============================================================

addons/l10n_mn/data/account_tax_template_data.xml

@@ -96,7 +96,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_1204_0301'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -108,7 +107,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_1204_0301'),
             }),
         ]"/>
     </record>
@@ -132,7 +130,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -144,7 +141,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
     </record>
@@ -168,7 +164,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -180,7 +175,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
     </record>
@@ -926,7 +920,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -938,7 +931,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
     </record>
@@ -962,7 +954,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -974,7 +965,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_template_3401_0201'),
             }),
         ]"/>
     </record>

addons/l10n_mx/data/account.account.template.csv

@@ -8,7 +8,7 @@
 "cuenta115_02","Materia prima y materiales","115.02.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_02","False"
 "cuenta115_03","Producción en proceso","115.03.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_03","False"
 "cuenta115_04","Productos terminados","115.04.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_04","False"
-"cuenta115_05","Mercancías en tránsito","115.05.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_05","False"
+"cuenta115_05","Mercancías en tránsito","115.05.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_05","True"
 "cuenta115_06","Mercancías en poder de terceros","115.06.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_06","False"
 "cuenta118_01","IVA acreditable pagado","118.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_118_01","False"
 "cuenta119_01","IVA pendiente de pago","119.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_119_01","False"

addons/l10n_mx/data/account_tax_data.xml

@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
   <data>
+    <!-- Tag used only to generate the CFDI (Mexican e-invoice). -->
+    <record id="tag_iva" model="account.account.tag">
+        <field name="name">IVA</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_isr" model="account.account.tag">
+        <field name="name">ISR</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_ieps" model="account.account.tag">
+        <field name="name">IEPS</field>
+        <field name="applicability">taxes</field>
+    </record>
+
     <!-- Account Tags -->
     <record id="tag_diot_16" model="account.account.tag">
         <field name="name">DIOT: 16%</field>
@@ -55,7 +69,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('cuenta208_01'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -67,7 +80,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('cuenta209_01'),
             }),
         ]"/>
     </record>
@@ -92,7 +104,9 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'tag_ids': [ref('l10n_mx.tag_iva')],
                 'account_id': ref('cuenta208_01'),
+                'tag_ids': [ref('tag_iva')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -104,7 +118,9 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'tag_ids': [ref('l10n_mx.tag_iva')],
                 'account_id': ref('cuenta209_01'),
+                'tag_ids': [ref('tag_iva')],
             }),
         ]"/>
     </record>
@@ -354,7 +370,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('cuenta118_01'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -367,7 +382,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('cuenta119_01'),
             }),
         ]"/>
     </record>
@@ -470,7 +484,9 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'tag_ids': [ref('l10n_mx.tag_iva')],
                 'account_id': ref('cuenta208_01'),
+                'tag_ids': [ref('tag_iva')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -482,7 +498,9 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
+                'tag_ids': [ref('l10n_mx.tag_iva')],
                 'account_id': ref('cuenta209_01'),
+                'tag_ids': [ref('tag_iva')],
             }),
         ]"/>
     </record>

addons/l10n_nl/data/account_tax_template.xml

@@ -21,7 +21,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -33,7 +32,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0'),
                 }),
             ]"/>
         </record>
@@ -200,7 +198,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_d'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -212,7 +209,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_d'),
                 }),
             ]"/>
         </record>
@@ -759,7 +755,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_v'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -771,7 +766,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_v'),
                 }),
             ]"/>
         </record>
@@ -800,7 +794,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_v'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -819,7 +813,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_v'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
         </record>
@@ -844,7 +838,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -863,7 +857,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -892,7 +886,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -911,7 +905,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -940,7 +934,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -959,7 +953,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -987,14 +981,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1006,14 +992,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
         </record>
@@ -1036,7 +1014,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1048,7 +1025,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
         </record>
@@ -1070,7 +1046,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1082,7 +1057,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
         </record>
@@ -1104,7 +1078,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1116,7 +1089,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
         </record>
@@ -1140,7 +1112,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1159,7 +1131,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1188,7 +1160,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1207,7 +1179,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1236,7 +1208,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1255,7 +1227,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1283,14 +1255,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1302,14 +1266,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
         </record>
@@ -1335,7 +1291,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1354,7 +1310,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1383,7 +1339,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1402,7 +1358,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1431,7 +1387,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1450,7 +1406,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1479,7 +1435,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1498,7 +1454,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1527,7 +1483,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1539,7 +1494,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
         </record>
@@ -1561,7 +1515,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1573,7 +1526,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
         </record>
@@ -1597,7 +1549,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1616,7 +1568,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1645,7 +1597,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1664,7 +1616,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1693,7 +1645,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1712,7 +1664,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1741,7 +1693,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1760,7 +1712,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,

addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_no/data/account_tax_data.xml

@@ -306,7 +306,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2714'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -317,7 +316,6 @@
               (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2714'),
               }),
             ]"/>
         </record>
@@ -339,7 +337,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2704'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -351,7 +348,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2704'),
                 }),
             ]"/>
         </record>

addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,7 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_nz/data/account_tax_template_data.xml

@@ -89,7 +89,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('nz_21310'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -101,7 +100,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('nz_21310'),
             }),
         ]"/>
     </record>
@@ -194,7 +192,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('nz_21330'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +203,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('nz_21330'),
             }),
         ]"/>
     </record>
@@ -229,7 +225,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('nz_21330'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -241,7 +236,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('nz_21330'),
             }),
         ]"/>
     </record>

addons/l10n_pl/data/account_tax_data.xml

@@ -592,7 +592,6 @@
           (0,0, {
               'factor_percent': 100,
               'repartition_type': 'tax',
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
           }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -604,7 +603,6 @@
           (0,0, {
               'factor_percent': 100,
               'repartition_type': 'tax',
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -626,7 +624,6 @@
           (0,0, {
               'factor_percent': 100,
               'repartition_type': 'tax',
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
           }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -638,7 +635,6 @@
           (0,0, {
               'factor_percent': 100,
               'repartition_type': 'tax',
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -870,7 +866,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
           }),
       ]"/>
       <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -889,7 +885,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -953,7 +949,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
           }),
       ]"/>
       <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -972,7 +968,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -1033,7 +1029,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
           }),
       ]"/>
       <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1052,7 +1048,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -1117,7 +1113,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
           }),
       ]"/>
       <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1136,7 +1132,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -1160,7 +1156,7 @@
               'repartition_type': 'tax',
           }),
                 ]"/>
-            <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+      <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
           (0,0, {
               'factor_percent': 100,
               'repartition_type': 'base',
@@ -1197,7 +1193,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
+              'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
           }),
       ]"/>
       <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1216,7 +1212,7 @@
               'factor_percent': -100,
               'repartition_type': 'tax',
               'account_id': ref('chart22030400'),
-              'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
+              'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
           }),
       ]"/>
       <field name="tax_group_id" ref="tax_group_vat_0"/>

addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_ro/data/account_tax_data.xml

@@ -18,8 +18,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_0')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -31,8 +29,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_0')],
             }),
         ]"/>
     </record>
@@ -236,8 +232,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -249,8 +243,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')],
             }),
         ]"/>
     </record>
@@ -273,7 +265,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')],
             }),
         ]"/>
@@ -286,7 +278,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')],
             }),
         ]"/>
@@ -310,7 +302,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')],
             }),
         ]"/>
@@ -323,7 +315,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')],
             }),
         ]"/>
@@ -347,7 +339,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')],
             }),
         ]"/>
@@ -360,7 +352,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')],
             }),
         ]"/>
@@ -383,7 +375,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -394,7 +386,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -417,7 +409,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')],
             }),
         ]"/>
@@ -430,7 +422,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')],
             }),
         ]"/>
@@ -449,24 +441,22 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -484,36 +474,24 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -531,40 +509,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'),
-                ref('account_tax_report_ro_baza_tva_tx2_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+                ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')],
+                'account_id': ref('pcg_4426'),
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'),
-                ref('account_tax_report_ro_baza_tva_tx2_invrsa')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+                ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
         ]"/>
     </record>
@@ -582,40 +560,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'),
-                ref('account_tax_report_baza_tva_tx3_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'),
+                ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'),
-                ref('account_tax_report_baza_tva_tx3_invrsa')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'),
+                ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
         ]"/>
     </record>
@@ -650,16 +628,16 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
             }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+            }),
         ]"/>
     </record>
 
@@ -693,16 +671,16 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
             }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+            }),
         ]"/>
     </record>
 
@@ -719,39 +697,39 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'), ref('account_tax_report_ro_baza_tva_tx4_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'),
-                ref('account_tax_report_ro_baza_tva_tx4_invrsa')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+                ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
         ]"/>
     </record>
@@ -774,7 +752,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -786,7 +763,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -810,7 +786,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -823,7 +798,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -846,7 +820,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -858,7 +831,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -881,7 +853,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -893,7 +864,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -914,7 +884,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -925,7 +894,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -942,36 +910,24 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')],
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')],
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -988,39 +944,42 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr2_bnr')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')],
+                'account_id': ref('pcg_4426'),
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr2_bnr')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+            }),
+            (0,0, {
+                'factor_percent': -100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')],
-            }),
-            (0,0, {
-                'factor_percent': -100,
-                'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')],
+                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
+
         ]"/>
     </record>
 
@@ -1036,40 +995,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'),
-                ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'),
+                ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'),
-                ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'),
+                ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
         ]"/>
     </record>
@@ -1103,16 +1062,16 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
             }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+            }),
         ]"/>
     </record>
 
@@ -1121,7 +1080,7 @@
         <field name="sequence">61</field>
         <field name="name">TVA Intracomunitara Achizitii 20%</field>
         <field name="amount">20</field>
-        <field name="amount_type">group</field>
+        <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="tax_group_id" ref="tax_group_tva_0"/>
         <field name="invoice_repartition_line_ids" eval="[(5,0,0),
@@ -1145,16 +1104,16 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
             }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
             }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+            }),
         ]"/>
     </record>
 
@@ -1170,38 +1129,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr4_bnr')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')],
+                'account_id': ref('pcg_4427'),
+                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr4_bnr')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
         ]"/>
     </record>

addons/l10n_ro/data/account_tax_report_data.xml

@@ -54,125 +54,28 @@
 
     <record id="account_tax_report_baza_tva_intrcmtr_bnr" model="account.tax.report.line">
         <field name="name">Baza TVA Intracomunitar Bunuri</field>
+        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_baza_tva_intrcmtr1_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_00_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr2_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr3_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr4_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_baza_tva_intrcmtr_srvci" model="account.tax.report.line">
         <field name="name">Baza TVA Intracomunitar Servicii</field>
+        <field name="tag_name">Baza TVA Intracomunitar Servicii</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_baza_tva_intrcmtr1_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr2_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr3_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr4_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_baza_tva_tx_invrsa" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare Inversa</field>
+        <field name="tag_name">Baza TVA Taxare Inversa</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_baza_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_00_taxare_inversa_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_05_taxare_inversa_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_09_taxare_inversa_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_24_taxare_inversa_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_tva_colcta" model="account.tax.report.line">
         <field name="name">TVA COLECTATA</field>
         <field name="sequence" eval="2"/>
@@ -181,7 +84,7 @@
 
     <record id="account_tax_report_tva_0" model="account.tax.report.line">
         <field name="name">TVA 0%</field>
-        <field name="tag_name">TVA 0%</field>
+        <field name="tag_name">TVA 0% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_0</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -190,7 +93,7 @@
 
     <record id="account_tax_report_tva_19" model="account.tax.report.line">
         <field name="name">TVA 19%</field>
-        <field name="tag_name">TVA 19%</field>
+        <field name="tag_name">TVA 19% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_19</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -199,7 +102,7 @@
 
     <record id="account_tax_report_tva_24" model="account.tax.report.line">
         <field name="name">TVA 24%</field>
-        <field name="tag_name">TVA 24%</field>
+        <field name="tag_name">TVA 24% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_24</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -208,7 +111,7 @@
 
     <record id="account_tax_report_tva_5" model="account.tax.report.line">
         <field name="name">TVA 5%</field>
-        <field name="tag_name">TVA 5%</field>
+        <field name="tag_name">TVA 5% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_5</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -217,7 +120,7 @@
 
     <record id="account_tax_report_tva_9" model="account.tax.report.line">
         <field name="name">TVA 9%</field>
-        <field name="tag_name">TVA 9%</field>
+        <field name="tag_name">TVA 9% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_9</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -225,131 +128,38 @@
     </record>
 
     <record id="account_tax_report_tva_intracmunitr_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
+        <field name="name">TVA Intracomunitar Bunuri (TVA colectata)</field>
+        <field name="tag_name">TVA Intracomunitar Bunuri (TVA colectata)</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_tva_intracmunitr1_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intracmunitr2_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intracmunitr3_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intracmunitr4_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_tva_intra_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
+        <field name="name">TVA Intracomunitar Servicii (TVA colectata)</field>
+        <field name="tag_name">TVA Intracomunitar Servicii (TVA colectata)</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_tva_intra1_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intra2_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intra3_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intra4_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_tva_tx_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
+        <field name="name">TVA Taxare Inversa (TVA colectata)</field>
+        <field name="tag_name">TVA Taxare Inversa (TVA colectata)</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_05_taxare_inversa</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_09_taxare_inversa</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_24_taxare_inversa</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_baza_tva_deducbl" model="account.tax.report.line">
-        <field name="name">BAZA TVA DEDUCTIBIL</field>
+        <field name="name">BAZA TVA DEDUCTIBILA</field>
         <field name="sequence" eval="3"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_baza_tva_deducbl_0" model="account.tax.report.line">
         <field name="name">Baza TVA 0%</field>
-        <field name="tag_name">Baza TVA 0%</field>
+        <field name="tag_name">Baza TVA 0% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_0_Baza</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -358,7 +168,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_19" model="account.tax.report.line">
         <field name="name">Baza TVA 19%</field>
-        <field name="tag_name">Baza TVA 19%</field>
+        <field name="tag_name">Baza TVA 19% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_19_Baza</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -367,7 +177,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_24" model="account.tax.report.line">
         <field name="name">Baza TVA 24%</field>
-        <field name="tag_name">Baza TVA 24%</field>
+        <field name="tag_name">Baza TVA 24% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_24_Baza</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -376,7 +186,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_5" model="account.tax.report.line">
         <field name="name">Baza TVA 5%</field>
-        <field name="tag_name">Baza TVA 5%</field>
+        <field name="tag_name">Baza TVA 5% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_5_Baza</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -385,7 +195,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_9" model="account.tax.report.line">
         <field name="name">Baza TVA 9%</field>
-        <field name="tag_name">Baza TVA 9%</field>
+        <field name="tag_name">Baza TVA 9% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_9_Baza</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -393,126 +203,29 @@
     </record>
 
     <record id="account_tax_report_ro_baza_tva_intracmunitr_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
+        <field name="name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
+        <field name="tag_name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_baza_tva_intracmunitr1_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_00_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr2_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr3_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr4_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_baza_tva_intracmunitr_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
+        <field name="name">Baza TVA Intracomunitar Servicii (deductibila)</field>
+        <field name="tag_name">Baza TVA Intracomunitar Servicii (deductibila)</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_baza_tva_intracmunitr1_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr2_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr3_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr4_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_baza_tva_tx_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
+        <field name="name">Baza TVA Taxare Inversa (deductibila)</field>
+        <field name="tag_name">Baza TVA Taxare Inversa (deductibila)</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_baza_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_00_taxare_inversa_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_tva_decucible" model="account.tax.report.line">
         <field name="name">TVA DEDUCTIBILA</field>
         <field name="sequence" eval="4"/>
@@ -529,8 +242,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_19" model="account.tax.report.line">
-        <field name="name">TVA 19%</field>
-        <field name="tag_name">TVA 19%</field>
+        <field name="name">TVA 19% (deductibila)</field>
+        <field name="tag_name">TVA 19% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_19</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -538,8 +251,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_24" model="account.tax.report.line">
-        <field name="name">TVA 24%</field>
-        <field name="tag_name">TVA 24%</field>
+        <field name="name">TVA 24% (deductibila)</field>
+        <field name="tag_name">TVA 24% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_24</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -547,8 +260,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_5" model="account.tax.report.line">
-        <field name="name">TVA 5%</field>
-        <field name="tag_name">TVA 5%</field>
+        <field name="name">TVA 5% (deductibila)</field>
+        <field name="tag_name">TVA 5% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_5</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -556,8 +269,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_9" model="account.tax.report.line">
-        <field name="name">TVA 9%</field>
-        <field name="tag_name">TVA 9%</field>
+        <field name="name">TVA 9% (deductibila)</field>
+        <field name="tag_name">TVA 9% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_9</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -565,122 +278,29 @@
     </record>
 
     <record id="account_tax_report_ro_tva_intracmunitr_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
+        <field name="name">TVA Intracomunitar Bunuri (deductibila)</field>
+        <field name="tag_name">TVA Intracomunitar Bunuri (deductibila)</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_tva_intracmunitr1_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr2_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr3_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr4_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_tva_intracmunitr_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
+        <field name="name">TVA Intracomunitar Servicii (deductibila)</field>
+        <field name="tag_name">TVA Intracomunitar Servicii (deductibila)</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_tva_intracmunitr1_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr2_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr3_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr4_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_tva_tx_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
+        <field name="name">TVA Taxare Inversa (deductibila)</field>
+        <field name="tag_name">TVA Taxare Inversa (deductibila)</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_baza_tva_nxgibl" model="account.tax.report.line">
         <field name="name">BAZA TVA NEEXIGIBILA</field>
         <field name="sequence" eval="5"/>

addons/l10n_sg/data/account_tax_data.xml

@@ -20,7 +20,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_791'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -32,7 +31,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_791'),
                     }),
                 ]"/>
         </record>
@@ -92,7 +90,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_793'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -104,7 +101,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_793'),
                     }),
                 ]"/>
         </record>
@@ -126,7 +122,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_794'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -137,7 +132,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_794'),
                     }),
                 ]"/>
         </record>
@@ -160,7 +154,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_795'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -172,7 +165,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_795'),
                     }),
                 ]"/>
         </record>
@@ -232,7 +224,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_797'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -244,7 +235,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_797'),
                     }),
                 ]"/>
         </record>
@@ -523,7 +513,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_744'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -534,7 +523,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_744'),
                     }),
                 ]"/>
         </record>
@@ -557,8 +545,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_745'),
-                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -570,8 +556,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_745'),
-                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
                     }),
                 ]"/>
         </record>
@@ -593,7 +577,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_746'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -604,7 +587,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_746'),
                     }),
                 ]"/>
         </record>
@@ -626,7 +608,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_747'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -637,7 +618,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_747'),
                     }),
                 ]"/>
         </record>
@@ -660,7 +640,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_748'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -672,7 +651,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_748'),
                     }),
                 ]"/>
         </record>

addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_si/data/account_tax_data.xml

@@ -314,7 +314,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('gd_acc_260001'),
-                'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
+                'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -333,7 +333,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('gd_acc_260001'),
-                'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
+                'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
             }),
         ]"/>
     </record>
@@ -363,7 +363,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('gd_acc_260002'),
-                'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
+                'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -382,7 +382,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('gd_acc_260002'),
-                'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
+                'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
             }),
         ]"/>
     </record>

addons/l10n_si/data/account_tax_report_data.xml

@@ -23,7 +23,7 @@
 
     <record id="tax_report_zo_dvd_neo_sdtopni_osno" model="account.tax.report.line">
         <field name="name">Nabave po osnovni stopnji DDV</field>
-        <field name="tag_name">Nabave po osnovni stopnji DDV</field>
+        <field name="tag_name">Nabave po osnovni stopnji DDV (Neodbitni)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/>
         <field name="country_id" ref="base.si"/>
@@ -31,7 +31,7 @@
 
     <record id="tax_report_zo_dvd_neo_sdtopni_zni" model="account.tax.report.line">
         <field name="name">Nabave po znižani stopnji DDV</field>
-        <field name="tag_name">Nabave po znižani stopnji DDV</field>
+        <field name="tag_name">Nabave po znižani stopnji DDV (Neodbitni)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/>
         <field name="country_id" ref="base.si"/>
@@ -92,7 +92,7 @@
 
     <record id="tax_report_zo_dvd_odb_vstopni_osn" model="account.tax.report.line">
         <field name="name">Nabave po osnovni stopnji DDV</field>
-        <field name="tag_name">Nabave po osnovni stopnji DDV</field>
+        <field name="tag_name">Nabave po osnovni stopnji DDV (Vstopni)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
         <field name="country_id" ref="base.si"/>
@@ -100,7 +100,7 @@
 
     <record id="tax_report_zo_dvd_odb_vstopni_zni" model="account.tax.report.line">
         <field name="name">Nabave po znižani stopnji DDV</field>
-        <field name="tag_name">Nabave po znižani stopnji DDV</field>
+        <field name="tag_name">Nabave po znižani stopnji DDV (Vstopni)</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
         <field name="country_id" ref="base.si"/>

addons/l10n_th/data/account_tax_report_data.xml

@@ -25,7 +25,7 @@
 
     <record id="tax_report_tp_wht_per_service" model="account.tax.report.line">
         <field name="name">Personal Withholding Tax (Service)</field>
-        <field name="tag_name">Personal Withholding Tax (Service)</field>
+        <field name="tag_name">Personal Withholding Tax (Service) (to be paid)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_tp_wht_per"/>
         <field name="country_id" ref="base.th"/>
@@ -48,7 +48,7 @@
 
     <record id="tax_report_tp_wht_cmp_service" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Service)</field>
-        <field name="tag_name">Company Withholding Tax (Service)</field>
+        <field name="tag_name">Company Withholding Tax (Service) (to be paid)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_tp_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -56,7 +56,7 @@
 
     <record id="tax_report_tp_wht_cmp_other" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Other)</field>
-        <field name="tag_name">Company Withholding Tax (Other)</field>
+        <field name="tag_name">Company Withholding Tax (Other) (to be paid)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_tp_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -72,7 +72,7 @@
 
     <record id="tax_report_tp_vat_out" model="account.tax.report.line">
         <field name="name">Output VAT</field>
-        <field name="tag_name">Output VAT</field>
+        <field name="tag_name">Output VAT (to be paid)</field>
         <field name="code">tax_th_PP30_5</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_tp_vat"/>
@@ -81,7 +81,7 @@
 
     <record id="tax_report_tp_vat_in" model="account.tax.report.line">
         <field name="name">Input VAT</field>
-        <field name="tag_name">Input VAT</field>
+        <field name="tag_name">Input VAT (to be paid)</field>
         <field name="code">tax_th_PP30_7</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_tp_vat"/>
@@ -111,7 +111,7 @@
 
     <record id="tax_report_ta_wht_per_service" model="account.tax.report.line">
         <field name="name">Personal Withholding Tax (Service)</field>
-        <field name="tag_name">Personal Withholding Tax (Service)</field>
+        <field name="tag_name">Personal Withholding Tax (Service) (taxable)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ta_wht_per"/>
         <field name="country_id" ref="base.th"/>
@@ -133,7 +133,7 @@
 
     <record id="tax_report_ta_wht_cmp_service" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Service)</field>
-        <field name="tag_name">Company Withholding Tax (Service)</field>
+        <field name="tag_name">Company Withholding Tax (Service) (taxable)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ta_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -141,7 +141,7 @@
 
     <record id="tax_report_ta_wht_cmp_other" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Other)</field>
-        <field name="tag_name">Company Withholding Tax (Other)</field>
+        <field name="tag_name">Company Withholding Tax (Other) (taxable)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_ta_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -156,7 +156,7 @@
 
     <record id="tax_report_ta_vat_out" model="account.tax.report.line">
         <field name="name">Output VAT</field>
-        <field name="tag_name">Output VAT</field>
+        <field name="tag_name">Output VAT (taxable)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ta_vat"/>
         <field name="country_id" ref="base.th"/>
@@ -164,7 +164,7 @@
 
     <record id="tax_report_ta_vat_in" model="account.tax.report.line">
         <field name="name">Input VAT</field>
-        <field name="tag_name">Input VAT</field>
+        <field name="tag_name">Input VAT (taxable)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_ta_vat"/>
         <field name="country_id" ref="base.th"/>

addons/l10n_th/data/account_tax_template_data.xml

@@ -88,7 +88,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -101,7 +101,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
     </record>
@@ -123,7 +123,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -136,7 +136,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
     </record>
@@ -158,7 +158,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -171,7 +171,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
             }),
         ]"/>
     </record>
@@ -193,7 +193,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +206,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
     </record>
@@ -228,7 +228,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -241,7 +241,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
     </record>
@@ -263,7 +263,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -276,7 +276,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
     </record>
@@ -298,7 +298,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -311,7 +311,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
             }),
         ]"/>
     </record>
@@ -333,7 +333,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -346,7 +346,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
     </record>

addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_ua/__manifest__.py

@@ -17,7 +17,6 @@ Ukraine - Chart of accounts.
         'data/account_chart_template.xml',
         'data/account.account.template.csv',
         'data/account_account_tag_data.xml',
-        'data/account_tax_tag_data.xml',
         'data/account_tax_group_data.xml',
         'data/account_tax_template.xml',
         'data/account_chart_template_config.xml',

addons/l10n_ua/data/account_tax_tag_data.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="tax_tag_vat20" model="account.account.tag">
-            <field name="name">ПДВ 20%</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_tag_vat7" model="account.account.tag">
-            <field name="name">ПДВ 7%</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_tag_vat0" model="account.account.tag">
-            <field name="name">ПДВ 0%</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_tag_vat_free" model="account.account.tag">
-            <field name="name">Звільнено від ПДВ</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_tag_vat_not" model="account.account.tag">
-            <field name="name">Не є об'єктом ПДВ</field>
-            <field name="applicability">taxes</field>
-        </record>
-    </data>
-</odoo>

addons/l10n_ua/data/account_tax_template.xml

@@ -13,9 +13,28 @@
             <field name="description">+ ПДВ 20%</field>
             <field name="amount">20</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="sale_tax_template_vat20incl_psbo" model="account.tax.template">
@@ -26,9 +45,28 @@
             <field name="amount">20</field>
             <field name="type_tax_use">sale</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="sale_tax_template_vat7_psbo" model="account.tax.template">
@@ -38,9 +76,28 @@
             <field name="description">+ ПДВ 7%</field>
             <field name="amount">7</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="sale_tax_template_vat7incl_psbo" model="account.tax.template">
@@ -51,9 +108,28 @@
             <field name="amount">7</field>
             <field name="type_tax_use">sale</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
+            <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('ua_psbp_6431'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="sale_tax_template_vat0_psbo" model="account.tax.template">
@@ -63,9 +139,26 @@
             <field name="description">ПДВ 0%</field>
             <field name="amount">0</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="sale_tax_template_vat_free_psbo" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -74,9 +167,26 @@
             <field name="description">Звільнено від ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="sale_tax_template_vat_not_psbo" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -85,9 +195,26 @@
             <field name="description">Не є об'єктом ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_psbp_6431"/>
-            <field name="refund_account_id" ref="ua_psbp_6431"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
 
         <record id="purchase_tax_template_vat20_psbo" model="account.tax.template">
@@ -97,9 +224,28 @@
             <field name="description">+ ПДВ 20%</field>
             <field name="amount">20</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="purchase_tax_template_vat20incl_psbo" model="account.tax.template">
@@ -110,9 +256,28 @@
             <field name="amount">20</field>
             <field name="type_tax_use">purchase</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="purchase_tax_template_vat7_psbo" model="account.tax.template">
@@ -122,9 +287,28 @@
             <field name="description">+ ПДВ 7%</field>
             <field name="amount">7</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="purchase_tax_template_vat7incl_psbo" model="account.tax.template">
@@ -135,9 +319,28 @@
             <field name="amount">7</field>
             <field name="type_tax_use">purchase</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
+            <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('ua_psbp_6441'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="purchase_tax_template_vat0_psbo" model="account.tax.template">
@@ -147,9 +350,26 @@
             <field name="description">ПДВ 0%</field>
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="purchase_tax_template_vat_free_psbo" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -158,9 +378,26 @@
             <field name="description">Звільнено від ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="purchase_tax_template_vat_not_psbo" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -169,9 +406,26 @@
             <field name="description">Не є об'єктом ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_psbp_6441"/>
-            <field name="refund_account_id" ref="ua_psbp_6441"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <!-- Simplified tax system -->
         <!-- Sale taxes -->
@@ -254,9 +508,28 @@
             <field name="description">+ ПДВ 20%</field>
             <field name="amount">20</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="sale_tax_template_vat20incl" model="account.tax.template">
@@ -267,9 +540,28 @@
             <field name="amount">20</field>
             <field name="type_tax_use">sale</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="sale_tax_template_vat7" model="account.tax.template">
@@ -279,9 +571,28 @@
             <field name="description">+ ПДВ 7%</field>
             <field name="amount">7</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="sale_tax_template_vat7incl" model="account.tax.template">
@@ -292,9 +603,28 @@
             <field name="amount">7</field>
             <field name="type_tax_use">sale</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
+            <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('ua_ias_1204'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="sale_tax_template_vat0" model="account.tax.template">
@@ -304,9 +634,26 @@
             <field name="description">ПДВ 0%</field>
             <field name="amount">0</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="sale_tax_template_vat_free" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -315,9 +662,26 @@
             <field name="description">Звільнено від ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="sale_tax_template_vat_not" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -326,9 +690,26 @@
             <field name="description">Не є об'єктом ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="ua_ias_1204"/>
-            <field name="refund_account_id" ref="ua_ias_1204"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
 
         <record id="purchase_tax_template_vat20" model="account.tax.template">
@@ -338,9 +719,28 @@
             <field name="description">+ ПДВ 20%</field>
             <field name="amount">20</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="purchase_tax_template_vat20incl" model="account.tax.template">
@@ -351,9 +751,28 @@
             <field name="amount">20</field>
             <field name="type_tax_use">purchase</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
         </record>
         <record id="purchase_tax_template_vat7" model="account.tax.template">
@@ -363,9 +782,28 @@
             <field name="description">+ ПДВ 7%</field>
             <field name="amount">7</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="purchase_tax_template_vat7incl" model="account.tax.template">
@@ -376,9 +814,28 @@
             <field name="amount">7</field>
             <field name="type_tax_use">purchase</field>
             <field name="price_include" eval="1"/>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
+            <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('ua_ias_1140'),
+                }),
+            ]"/>
             <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
         </record>
         <record id="purchase_tax_template_vat0" model="account.tax.template">
@@ -388,9 +845,26 @@
             <field name="description">ПДВ 0%</field>
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="purchase_tax_template_vat_free" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -399,9 +873,26 @@
             <field name="description">Звільнено від ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <record id="purchase_tax_template_vat_not" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -410,9 +901,26 @@
             <field name="description">Не є об'єктом ПДВ</field>
             <field name="amount">0</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="ua_ias_1140"/>
-            <field name="refund_account_id" ref="ua_ias_1140"/>
-            <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
         <!-- Simplified tax system -->
         <!-- Sale taxes -->

addons/l10n_uk/data/account_tax_data.xml

@@ -18,8 +18,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2200'),
-                'plus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -31,8 +29,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2200'),
-                'minus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
             }),
         ]"/>
     </record>
@@ -54,8 +50,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2200'),
-                'plus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -67,8 +61,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2200'),
-                'minus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
             }),
         ]"/>
     </record>
@@ -90,8 +82,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2201'),
-                'plus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -103,8 +93,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2201'),
-                'minus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
             }),
         ]"/>
     </record>
@@ -126,8 +114,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2201'),
-                'plus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -139,8 +125,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2201'),
-                'minus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
             }),
         ]"/>
     </record>
@@ -282,7 +266,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2200'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -294,7 +277,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2200'),
             }),
         ]"/>
     </record>
@@ -316,7 +298,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -328,7 +309,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('2201'),
             }),
         ]"/>
     </record>

addons/l10n_ve/data/account_tax_data.xml

@@ -18,7 +18,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_activa_account_2172003'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -29,7 +28,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_activa_account_2172003'),
             }),
         ]"/>
     </record>
@@ -142,7 +140,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_activa_account_2172003'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -153,7 +150,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('account_activa_account_2172003'),
             }),
         ]"/>
     </record>

addons/l10n_vn/data/account_tax_data.xml

@@ -11,19 +11,6 @@
         <field name="type_tax_use">purchase</field>
         <field name="tax_group_id" ref="tax_group_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('chart1331'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
-                }),
-            ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
@@ -36,6 +23,19 @@
                     'plus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
                 }),
             ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart1331'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
+                }),
+            ]"/>
     </record>
     <record id="tax_purchase_vat5" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -46,19 +46,6 @@
         <field name="type_tax_use">purchase</field>
         <field name="tax_group_id" ref="tax_group_5"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('chart1331'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
-                }),
-            ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
@@ -71,6 +58,19 @@
                     'plus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
                 }),
             ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart1331'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
+                }),
+            ]"/>
     </record>
     <record id="tax_purchase_vat0" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -84,24 +84,22 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart1331'),
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart1331'),
                 }),
             ]"/>
     </record>
@@ -194,7 +192,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart33311'),
                 }),
             ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +203,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart33311'),
                 }),
             ]"/>
     </record>

addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)

addons/l10n_za/data/account_tax_template_data.xml

@@ -90,7 +90,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('200060'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -102,7 +101,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('200060'),
             }),
         ]"/>
     </record>
@@ -124,7 +122,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('200060'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -136,7 +133,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('200060'),
             }),
         ]"/>
     </record>
@@ -158,7 +154,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('200060'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -170,7 +165,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('200060'),
             }),
         ]"/>
     </record>

addons/lunch/security/lunch_security.xml

@@ -40,6 +40,26 @@
             <field name="groups" eval="[(4,ref('lunch.group_lunch_user'))]"/>
         </record>
 
+        <record id="lunch_order_rule_write" model="ir.rule">
+            <field name="name">lunch.order: Don't change confirmed order</field>
+            <field name="model_id" ref="lunch.model_lunch_order"/>
+            <field name="domain_force">[('state', '!=', 'confirmed'), ('user_id', '=', user.id)]</field>
+            <field name="perm_read" eval="0"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_unlink" eval="0"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="lunch_order_rule_write_manager" model="ir.rule">
+            <field name="name">manager can do whatever</field>
+            <field name="model_id" ref="lunch.model_lunch_order"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="perm_read" eval="0"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_unlink" eval="0"/>
+            <field name="groups" eval="[(4, ref('lunch.group_lunch_manager'))]"/>
+        </record>
+
     <data noupdate="1">
         <record id="base.default_user" model="res.users">
             <field name="groups_id" eval="[(4,ref('lunch.group_lunch_manager'))]"/>

addons/mail/models/mail_activity.py

@@ -317,6 +317,12 @@ class MailActivity(models.Model):
     @api.model
     def create(self, values):
         activity = super(MailActivity, self).create(values)
+        need_sudo = False
+        try:  # in multicompany, reading the partner might break
+            partner_id = activity.user_id.partner_id.id
+        except exceptions.AccessError:
+            need_sudo = True
+            partner_id = activity.user_id.sudo().partner_id.id
 
         # send a notification to assigned user; in case of manually done activity also check
         # target has rights on document otherwise we prevent its creation. Automated activities
@@ -325,9 +331,12 @@ class MailActivity(models.Model):
             if not activity.automated:
                 activity._check_access_assignation()
             if not self.env.context.get('mail_activity_quick_update', False):
-                activity.action_notify()
+                if need_sudo:
+                    activity.sudo().action_notify()
+                else:
+                    activity.action_notify()
 
-        self.env[activity.res_model].browse(activity.res_id).message_subscribe(partner_ids=[activity.user_id.partner_id.id])
+        self.env[activity.res_model].browse(activity.res_id).message_subscribe(partner_ids=[partner_id])
         if activity.date_deadline <= fields.Date.today():
             self.env['bus.bus'].sendone(
                 (self._cr.dbname, 'res.partner', activity.user_id.partner_id.id),

addons/mail/models/mail_thread.py

@@ -432,7 +432,7 @@ class MailThread(models.AbstractModel):
     # ------------------------------------------------------
 
     def with_lang(self):
-        if 'lang' not in self._context:
+        if not self._context.get("lang"):
             return self.with_context(lang=self.env.user.lang)
         return self
 

addons/mail/static/src/js/emojis.js

@@ -73,6 +73,7 @@ var data = {
     "<3":          "❤️",
     ":heart":         "❤️", // alt.
     "</3":            "💔",
+    "&lt;/3":         "💔",
     ":heart_eyes":    "😍",
     ":turban":        "👳",
     ":+1":            "👍",

addons/mail/static/src/js/services/mail_notification_manager.js

@@ -506,7 +506,7 @@ MailManager.include({
             }
             this._removeChannel(channel);
             this._mailBus.trigger('unsubscribe_from_channel', data.id);
-            this.do_notify(_("Unsubscribed"), message);
+            this.do_notify(_t("Unsubscribed"), message);
         }
     },
      /**

addons/mail/static/src/scss/composer.scss

@@ -227,6 +227,8 @@
             .o_mail_emoji_container {
                 @include o-position-absolute(auto, 0, 100%, 0);
                 border-bottom-width: 1px;
+                max-height: calc(100vh - 100%);
+                overflow-y: auto;
             }
         }
         .o_composer_input {