diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index d32e2e3a6dfaf18c9b596b61c1aceac43ac9970c..b4b5e8f6aecec835035b79dbb136fb7268c5b236 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -58,6 +58,97 @@ class AccountAccountTag(models.Model):
     tax_negate = fields.Boolean(string="Negate Tax Balance", help="Check this box to negate the absolute value of the balance of the lines associated with this tag in tax report computation.")
     country_id = fields.Many2one(string="Country", comodel_name='res.country', help="Country for which this tag is available, when applied on taxes.")
 
+    @api.model
+    def _get_tax_tags(self, tag_name, country_id):
+        """ Returns all the tax tags corresponding to the tag name given in parameter
+        in the specified country.
+        """
+        escaped_tag_name = tag_name.replace('\\', '\\\\').replace('%', '\%').replace('_', '\_')
+        return self.env['account.account.tag'].search([('name', '=like', '_' + escaped_tag_name), ('country_id', '=', country_id), ('applicability', '=', 'taxes')])
+
+
+class AccountTaxReport(models.Model):
+    _name = "account.tax.report"
+    _description = 'Account Tax Report'
+    _order = 'country_id, name'
+
+    name = fields.Char(string="Name", required=True, help="Name of this tax report")
+    country_id = fields.Many2one(string="Country", comodel_name='res.country', required=True, default=lambda x: x.env.company.country_id.id, help="Country for which this report is available.")
+    line_ids = fields.One2many(string="Report Lines", comodel_name='account.tax.report.line', inverse_name='report_id', help="Content of this tax report")
+    root_line_ids = fields.One2many(string="Root Report Lines", comodel_name='account.tax.report.line', inverse_name='report_id', domain=[('parent_id', '=', None)], help="Subset of line_ids, containing the lines at the root of the report.")
+
+    def write(self, vals):
+        # Overridden so that we change the country _id of the existing tags
+        # when writing the country_id of the report, or create new tags
+        # for the new country if the tags are shared with some other report.
+
+        if 'country_id' in vals:
+            tags_cache = {}
+            for record in self:
+                for line in record.line_ids:
+                    if line.tag_ids:
+                        #The tags for this country may have been created by a previous line in this loop
+                        cache_key = (vals['country_id'], line.tag_name)
+                        if cache_key not in tags_cache:
+                            tags_cache[cache_key] = self.env['account.account.tag']._get_tax_tags(line.tag_name, vals['country_id'])
+
+                        new_tags = tags_cache[cache_key]
+
+                        if new_tags:
+                            tags_to_unlink = line.tag_ids.filtered(lambda x: record in x.mapped('tax_report_line_ids.report_id'))
+                            line.write({'tag_ids': [(6, 0, new_tags.ids)]})
+                            self.env['account.tax.report.line']._delete_tags_from_taxes(tags_to_unlink.ids)
+
+                        elif line.mapped('tag_ids.tax_report_line_ids.report_id').filtered(lambda x: x not in self):
+                            line.write({'tag_ids': [(5, 0, 0)] + line._get_tags_create_vals(line.tag_name, vals['country_id'])})
+                            tags_cache[cache_key] = line.tag_ids
+
+                        else:
+                            line.tag_ids.write({'country_id': vals['country_id']})
+
+        return super(AccountTaxReport, self).write(vals)
+
+    def copy(self, default=None):
+        # Overridden from regular copy, since the ORM does not manage
+        # the copy of the lines hierarchy properly (all the parent_id fields
+        # need to be reassigned to the corresponding copies).
+
+        copy_default = {k:v for k, v in default.items() if k != 'line_ids'} if default else None
+        copied_report = super(AccountTaxReport, self).copy(default=copy_default) #This copies the report without its lines
+
+        lines_map = {} # maps original lines to their copies (using ids)
+        for line in self.line_ids:
+            copy = line.copy({'parent_id': lines_map.get(line.parent_id.id, None), 'report_id': copied_report.id})
+            lines_map[line.id] = copy.id
+
+        return copied_report
+
+    def get_lines_in_hierarchy(self):
+        """ Returns an interator to the lines of this tax report, were parent lines
+        ar all directly followed by their children.
+        """
+        self.ensure_one()
+        lines_to_treat = list(self.line_ids.filtered(lambda x: not x.parent_id)) # Used as a stack, whose index 0 is the top
+        while lines_to_treat:
+            to_yield = lines_to_treat[0]
+            lines_to_treat = list(to_yield.children_line_ids) + lines_to_treat[1:]
+            yield to_yield
+
+    def get_checks_to_perform(self, d):
+        """ To override in localizations
+        If value is a float, it will be formatted with format_value
+        The line is not displayed if it is falsy (0, 0.0, False, ...)
+        :param d: the mapping dictionay between codes and values
+        :return: iterable of tuple (name, value)
+        """
+        self.ensure_one()
+        return []
+
+    def validate_country_id(self):
+        for record in self:
+            if any(line.tag_ids.mapped('country_id') != record.country_id for line in record.line_ids):
+                raise ValidationError(_("The tags associated with tax report line objects should all have the same country set as the tax report containing these lines."))
+
 
 class AccountTaxReportLine(models.Model):
     _name = "account.tax.report.line"
@@ -67,13 +158,13 @@ class AccountTaxReportLine(models.Model):
 
     name = fields.Char(string="Name", required=True, help="Complete name for this report line, to be used in report.")
     tag_ids = fields.Many2many(string="Tags", comodel_name='account.account.tag', relation='account_tax_report_line_tags_rel', help="Tax tags populating this line")
-    country_id = fields.Many2one(string="Country", comodel_name='res.country', required=True, default=lambda x: x.env.company.country_id.id, help="Country for which this line is available.")
     report_action_id = fields.Many2one(string="Report Action", comodel_name='ir.actions.act_window', help="The optional action to call when clicking on this line in accounting reports.")
     children_line_ids = fields.One2many(string="Children Lines", comodel_name='account.tax.report.line', inverse_name='parent_id', help="Lines that should be rendered as children of this one")
     parent_id = fields.Many2one(string="Parent Line", comodel_name='account.tax.report.line')
     sequence = fields.Integer(string='Sequence', required=True,
         help="Sequence determining the order of the lines in the report (smaller ones come first). This order is applied locally per section (so, children of the same line are always rendered one after the other).")
     parent_path = fields.Char(index=True)
+    report_id = fields.Many2one(string="Tax Report", required=True, comodel_name='account.tax.report', ondelete='cascade', help="The parent tax report of this line")
 
     #helper to create tags (positive and negative) on report line creation
     tag_name = fields.Char(string="Tag Name", help="Short name for the tax grid corresponding to this report line. Leave empty if this report line should not correspond to any such grid.")
@@ -84,9 +175,21 @@ class AccountTaxReportLine(models.Model):
 
     @api.model
     def create(self, vals):
+        # Manage tags
         tag_name = vals.get('tag_name', '')
-        if tag_name:
-            vals['tag_ids'] = self._get_tags_create_vals(tag_name, vals.get('country_id'))
+        if tag_name and vals.get('report_id'):
+            report = self.env['account.tax.report'].browse(vals['report_id'])
+            country = report.country_id
+
+            existing_tags = self.env['account.account.tag']._get_tax_tags(tag_name, country.id)
+
+            if existing_tags:
+                # We connect the new report line to the already existing tags
+                vals['tag_ids'] = [(6, 0, existing_tags.ids)]
+            else:
+                # We create new ones
+                vals['tag_ids'] = self._get_tags_create_vals(tag_name, country.id)
+
         return super(AccountTaxReportLine, self).create(vals)
 
     @api.model
@@ -106,30 +209,72 @@ class AccountTaxReportLine(models.Model):
         return [(0, 0, minus_tag_vals), (0, 0, plus_tag_vals)]
 
     def write(self, vals):
+        tag_name_postponed = None
+
+        # If tag_name was set, but not tag_ids, we postpone the write of
+        # tag_name, and perform it only after having generated/retrieved the tags.
+        # Otherwise, tag_name and tags' name would not match, breaking
+        # _validate_tags constaint.
+        postpone_tag_name = 'tag_name' in vals and not 'tag_ids' in vals
+
+        if postpone_tag_name:
+            tag_name_postponed = vals.pop('tag_name')
+
         rslt = super(AccountTaxReportLine, self).write(vals)
-        if 'tag_name' in vals:
-            # Constraint _validate_tags ensures that tag_ids always contains two
-            # tags if not empty: + and -.
-            # So, we can impact the whole tag_ids set if tag_name is modified.
-            if vals['tag_name']:
-                # If some lines in the set did not have tags yet, we create them
-                without_tags = self.filtered(lambda x: not x.tag_ids)
-                for record in without_tags:
-                    record.write({'tag_ids': self._get_tags_create_vals(record.tag_name, record.country_id.id)})
-
-                # We update the name of every tag linked to other lines
-                to_update = self - without_tags
-                tags_to_update = to_update.mapped('tag_ids')
-                minus_child_tags = tags_to_update.filtered(lambda x: x.tax_negate)
-                minus_child_tags.write({'name': '-' + vals['tag_name']})
-
-                plus_child_tags = tags_to_update.filtered(lambda x: not x.tax_negate)
-                plus_child_tags.write({'name': '+' + vals['tag_name']})
 
-            else:
-                # tag_name was set empty, so we remove the tags
-                self._delete_tags_from_taxes(self.mapped('tag_ids.id'))
-                self.write({'tag_ids': [(2, tag.id, 0) for tag in self.mapped('tag_ids')]})
+        if postpone_tag_name:
+            # If tag_name modification has been postponed,
+            # we need to search for existing tags corresponding to the new tag name
+            # (or create them if they don't exist yet) and assign them to the records
+
+            records_by_country = {}
+            for record in self.filtered(lambda x: x.tag_name != tag_name_postponed):
+                records_by_country[record.report_id.country_id.id] = records_by_country.get(record.report_id.country_id.id, self.env['account.tax.report.line']) + record
+
+            for country_id, records in records_by_country.items():
+                if tag_name_postponed:
+                    record_tag_names = records.mapped('tag_name')
+                    if len(record_tag_names) == 1 and record_tag_names[0]:
+                        # If all the records already have the same tag_name before writing,
+                        # we simply want to change the name of the existing tags
+                        to_update = records.mapped('tag_ids.tax_report_line_ids')
+                        tags_to_update = to_update.mapped('tag_ids')
+                        minus_child_tags = tags_to_update.filtered(lambda x: x.tax_negate)
+                        minus_child_tags.write({'name': '-' + tag_name_postponed})
+                        plus_child_tags = tags_to_update.filtered(lambda x: not x.tax_negate)
+                        plus_child_tags.write({'name': '+' + tag_name_postponed})
+                        super(AccountTaxReportLine, to_update).write({'tag_name': tag_name_postponed})
+
+                    else:
+                        existing_tags = self.env['account.account.tag']._get_tax_tags(tag_name_postponed, country_id)
+                        records_to_link = records
+                        tags_to_remove = self.env['account.account.tag']
+
+                        if not existing_tags and records_to_link:
+                            # If the tag does not exist yet, we first create it by
+                            # linking it to the first report line of the record set
+                            first_record = records_to_link[0]
+                            tags_to_remove += first_record.tag_ids
+                            first_record.write({'tag_name': tag_name_postponed, 'tag_ids': [(5, 0, 0)] + self._get_tags_create_vals(tag_name_postponed, country_id)})
+                            existing_tags = first_record.tag_ids
+                            records_to_link -= first_record
+
+                        # All the lines sharing their tags must always be synchronized,
+                        tags_to_remove += records_to_link.mapped('tag_ids')
+                        records_to_link = tags_to_remove.mapped('tax_report_line_ids')
+                        self._delete_tags_from_taxes(tags_to_remove.ids)
+                        records_to_link.write({'tag_name': tag_name_postponed, 'tag_ids': [(2, tag.id) for tag in tags_to_remove] + [(6, 0, existing_tags.ids)]})
+
+                else:
+                    # tag_name was set empty, so we remove the tags on current lines
+                    # If some tags are still referenced by other report lines,
+                    # we keep them ; else, we delete them from DB
+                    line_tags = records.mapped('tag_ids')
+                    other_lines_same_tag = line_tags.mapped('tax_report_line_ids').filtered(lambda x: x not in records)
+                    if not other_lines_same_tag:
+                        self._delete_tags_from_taxes(line_tags.ids)
+                    orm_cmd_code = other_lines_same_tag and 3 or 2
+                    records.write({'tag_name': None, 'tag_ids': [(orm_cmd_code, tag.id) for tag in line_tags]})
 
         return rslt
 
@@ -140,6 +285,7 @@ class AccountTaxReportLine(models.Model):
             children.unlink()
         return super(AccountTaxReportLine, self).unlink()
 
+    @api.model
     def _delete_tags_from_taxes(self, tag_ids_to_delete):
         """ Based on a list of tag ids, removes them first from the
         repartition lines they are linked to, then deletes them
@@ -152,6 +298,7 @@ class AccountTaxReportLine(models.Model):
         self.env.cr.execute("""
             delete from account_account_tag_account_tax_repartition_line_rel
             where account_account_tag_id in %(tag_ids_to_delete)s;
+
             delete from account_account_tag_account_move_line_rel
             where account_account_tag_id in %(tag_ids_to_delete)s;
         """, {'tag_ids_to_delete': tuple(tag_ids_to_delete)})
@@ -161,36 +308,21 @@ class AccountTaxReportLine(models.Model):
 
     @api.constrains('formula', 'tag_name')
     def _validate_formula(self):
-        if self.formula and self.tag_name:
-            raise ValidationError(_("Tag name and formula are mutually exclusive, they should not be set together on the same tax report line."))
+        for record in self:
+            if record.formula and record.tag_name:
+                raise ValidationError(_("Tag name and formula are mutually exclusive, they should not be set together on the same tax report line."))
 
     @api.constrains('tag_name', 'tag_ids')
     def _validate_tags(self):
-        neg_tags = self.tag_ids.filtered(lambda x: x.tax_negate)
-        pos_tags = self.tag_ids.filtered(lambda x: not x.tax_negate)
-        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
-        must be updated, in order for it to match  the sequence numbering of its
-        parent. By default, we add it as the last line of this section.
-        """
-        if self.country_id:
-            lines_domain = [('country_id', '=', self.country_id.id)]
-            if self.parent_id:
-                lines_domain.append(('parent_id', '=', self.parent_id.id))
+        for record in self.filtered(lambda x: x.tag_ids):
+            neg_tags = record.tag_ids.filtered(lambda x: x.tax_negate)
+            pos_tags = record.tag_ids.filtered(lambda x: not x.tax_negate)
+
+            if (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."))
 
-            last_line = self.env['account.tax.report.line'].search(lines_domain, order="sequence desc", limit=1)
-            self.sequence = last_line.sequence + 1
+            if neg_tags.name != '-'+record.tag_name or pos_tags.name != '+'+record.tag_name:
+                raise ValidationError(_("The tags linked to a tax report line should always match its tag name."))
 
 #----------------------------------------------------------
 # Accounts
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 3ee0856bb2453c353613d9b17570c685886c76f0..5e43dbc88a0ea0cb34f2ed9b0cd72f1dac4071c1 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -88,3 +88,5 @@ access_account_tax_repartition_line_manager,account.tax repartition.line.manager
 access_account_tax_repartition_line_template_manager,account.tax repartition.line.template.manager,model_account_tax_repartition_line_template,account.group_account_manager,1,1,1,1
 access_account_tax_report_line_invoice,account.tax.report.line.invoice,model_account_tax_report_line,account.group_account_invoice,1,0,0,0
 access_account_tax_report_line_ac_user,account.tax.report.line.ac.user,model_account_tax_report_line,account.group_account_manager,1,1,1,1
+access_account_tax_report_invoice,account.tax.report.invoice,model_account_tax_report,account.group_account_invoice,1,0,0,0
+access_account_tax_report_ac_user,account.tax.report.ac.user,model_account_tax_report,account.group_account_manager,1,1,1,1
diff --git a/addons/account/tests/__init__.py b/addons/account/tests/__init__.py
index 26e6d69dfe8501f5f46275eb16891a591c6e060a..5e3c03af4b1bafc39aa2db2f9ceed353115de79d 100644
--- a/addons/account/tests/__init__.py
+++ b/addons/account/tests/__init__.py
@@ -26,3 +26,4 @@ from . import test_account_all_l10n
 from . import test_reconciliation_matching_rules
 from . import test_account_onboarding
 from . import test_portal_attachment
+from . import test_tax_report
diff --git a/addons/account/tests/test_tax_report.py b/addons/account/tests/test_tax_report.py
new file mode 100644
index 0000000000000000000000000000000000000000..15553e0ddb2a44da3841bd08d2249c443b5dd197
--- /dev/null
+++ b/addons/account/tests/test_tax_report.py
@@ -0,0 +1,257 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TaxReportTest(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TaxReportTest, cls).setUpClass()
+        cls.test_country_1 = cls.env['res.country'].create({
+            'name': "The Old World",
+            'code': 'YY',
+        })
+
+        cls.test_country_2 = cls.env['res.country'].create({
+            'name': "The Principality of Zeon",
+            'code': 'ZZ',
+        })
+        cls.test_country_3 = cls.env['res.country'].create({
+            'name': "Alagaësia",
+            'code': 'QQ',
+        })
+
+        cls.tax_report_1 = cls.env['account.tax.report'].create({
+            'name': "Tax report 1",
+            'country_id': cls.test_country_1.id,
+        })
+
+        cls.tax_report_line_1_1 = cls.env['account.tax.report.line'].create({
+            'name': "[01] Line 01",
+            'tag_name': '01',
+            'report_id': cls.tax_report_1.id,
+            'sequence': 2,
+        })
+
+        cls.tax_report_line_1_2 = cls.env['account.tax.report.line'].create({
+            'name': "[01] Line 02",
+            'tag_name': '02',
+            'report_id': cls.tax_report_1.id,
+            'sequence': 3,
+        })
+
+        cls.tax_report_line_1_3 = cls.env['account.tax.report.line'].create({
+            'name': "[03] Line 03",
+            'tag_name': '03',
+            'report_id': cls.tax_report_1.id,
+            'sequence': 4,
+        })
+
+        cls.tax_report_line_1_4 = cls.env['account.tax.report.line'].create({
+            'name': "[04] Line 04",
+            'report_id': cls.tax_report_1.id,
+            'sequence': 5,
+        })
+
+        cls.tax_report_line_1_5 = cls.env['account.tax.report.line'].create({
+            'name': "[05] Line 05",
+            'report_id': cls.tax_report_1.id,
+            'sequence': 6,
+        })
+
+        cls.tax_report_line_1_55 = cls.env['account.tax.report.line'].create({
+            'name': "[55] Line 55",
+            'tag_name': '55',
+            'report_id': cls.tax_report_1.id,
+            'sequence': 7,
+        })
+
+        cls.tax_report_2 = cls.env['account.tax.report'].create({
+            'name': "Tax report 2",
+            'country_id': cls.test_country_1.id,
+        })
+
+        cls.tax_report_line_2_1 = cls.env['account.tax.report.line'].create({
+            'name': "[01] Line 01, but in report 2",
+            'tag_name': '01',
+            'report_id': cls.tax_report_2.id,
+            'sequence': 1,
+        })
+
+        cls.tax_report_line_2_2 = cls.env['account.tax.report.line'].create({
+            'name': "[02] Line 02, but in report 2",
+            'report_id': cls.tax_report_2.id,
+            'sequence': 2,
+        })
+
+        cls.tax_report_line_2_42 = cls.env['account.tax.report.line'].create({
+            'name': "[42] Line 42",
+            'tag_name': '42',
+            'report_id': cls.tax_report_2.id,
+            'sequence': 3,
+        })
+
+    def _get_tax_tags(self, tag_name=None):
+        domain = [('country_id', '=', self.test_country_1.id), ('applicability', '=', 'taxes')]
+        if tag_name:
+            domain.append(('name', 'like', '_' + tag_name ))
+        return self.env['account.account.tag'].search(domain)
+
+    def test_write_add_tagname(self):
+        """ Adding a tag_name to a line without any should create new tags.
+        """
+        tags_before = self._get_tax_tags()
+        self.tax_report_line_2_2.tag_name = 'tournicoti'
+        tags_after = self._get_tax_tags()
+
+        self.assertEqual(len(tags_after), len(tags_before) + 2, "Two tags should have been created, +tournicoti and -tournicoti.")
+
+    def test_write_single_line_tagname(self):
+        """ Writing on the tag_name of a line with a non-null tag_name used in
+        no other line should overwrite the name of the existing tags.
+        """
+        start_tags = self._get_tax_tags()
+        original_tag_name = self.tax_report_line_1_55.tag_name
+        original_tags = self.tax_report_line_1_55.tag_ids
+        self.tax_report_line_1_55.tag_name = 'Mille sabords !'
+
+        self.assertEqual(len(self._get_tax_tags(original_tag_name)), 0, "The original tag name of the line should not correspond to any tag anymore.")
+        self.assertEqual(original_tags, self.tax_report_line_1_55.tag_ids, "The tax report line should still be linked to the same tags.")
+        self.assertEqual(len(self._get_tax_tags()), len(start_tags), "No new tag should have been created.")
+
+    def test_write_single_line_remove_tagname(self):
+        """ Setting None as the tag_name of a line with a non-null tag_name used
+        in a unique line should delete the tags, also removing all the references to it
+        from tax repartition lines and account move lines
+        """
+
+        test_tax = self.env['account.tax'].create({
+            'name': "Test tax",
+            'amount_type': 'percent',
+            'amount': 25,
+            'type_tax_use': 'sale',
+            'invoice_repartition_line_ids': [
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [(6, 0, self.tax_report_line_1_55.tag_ids[0].ids)],
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ],
+        })
+
+        test_invoice = self.env['account.move'].create({
+            'type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '1992-12-22',
+            'invoice_line_ids': [
+                (0, 0, {'quantity': 1, 'price_unit': 42, 'tax_ids': [(6, 0, test_tax.ids)]}),
+            ],
+        })
+        test_invoice.post()
+
+        self.assertTrue(any(line.tag_ids == self.tax_report_line_1_55.tag_ids[0] for line in test_invoice.line_ids), "The test invoice should contain a tax line with tag 55")
+        tag_name_before = self.tax_report_line_1_55.tag_name
+        tag_nber_before = len(self._get_tax_tags())
+        self.tax_report_line_1_55.tag_name = None
+        self.assertFalse(self.tax_report_line_1_55.tag_name, "The tag name for line 55 should now be None")
+        self.assertEqual(len(self._get_tax_tags(tag_name_before)), 0, "None of the original tags for this line should be left after setting tag_name to None if no other line was using this tag_name.")
+        self.assertEqual(len(self._get_tax_tags()), tag_nber_before - 2, "No new tag should have been created, and the two that were assigned to the report line should have been removed.")
+        self.assertFalse(test_tax.mapped('invoice_repartition_line_ids.tag_ids'), "There should be no tag left on test tax's repartition lines after the removal of tag 55.")
+        self.assertFalse(test_invoice.mapped('line_ids.tag_ids'), "The link between test invoice and tag 55 should have been broken. There should be no tag left on the invoice's lines.")
+
+    def test_write_multi_no_change(self):
+        """ Writing the same tag_name as they already use on a set of tax report
+        lines with the same tag_name should not do anything.
+        """
+        tags_before = self._get_tax_tags().ids
+        (self.tax_report_line_1_1 + self.tax_report_line_2_1).write({'tag_name': '01'})
+        tags_after = self._get_tax_tags().ids
+        self.assertEqual(tags_before, tags_after, "Re-assigning the same tag_name should keep the same tags.")
+
+    def test_edit_line_shared_tags(self):
+        """ Setting the tag_name of a tax report line sharing its tags with another line
+        should edit the tags' name and the tag_name of this other report line, to
+        keep consistency.
+        """
+        original_tag_name = self.tax_report_line_1_1.tag_name
+        self.tax_report_line_1_1.tag_name = 'Groucha'
+        self.assertEqual(self.tax_report_line_2_1.tag_name, self.tax_report_line_1_1.tag_name, "Modifying the tag name of a tax report line sharing it with another one should also modify the other's.")
+
+    def test_edit_multi_line_tagname_all_different_new(self):
+        """ Writing a tag_name on multiple lines with distinct tag_names should
+        delete all the former tags and replace them by new ones (also on lines
+        sharing tags with them).
+        """
+        lines = self.tax_report_line_1_1 + self.tax_report_line_2_2 + self.tax_report_line_2_42
+        previous_tag_ids = lines.mapped('tag_ids.id')
+        lines.write({'tag_name': 'crabe'})
+        new_tags = lines.mapped('tag_ids')
+
+        self.assertNotEqual(new_tags.ids, previous_tag_ids, "All the tags should have changed")
+        self.assertEqual(len(new_tags), 2, "Only two distinct tags should be assigned to all the lines after writing tag_name on them all")
+        surviving_tags = self.env['account.account.tag'].search([('id', 'in', previous_tag_ids)])
+        self.assertEqual(len(surviving_tags), 0, "All former tags should have been deleted")
+        self.assertEqual(self.tax_report_line_1_1.tag_ids, self.tax_report_line_2_1.tag_ids, "The report lines initially sharing their tag_name with the written-on lines should also have been impacted")
+
+    def test_remove_line_dependency(self):
+        """ Setting to None the tag_name of a report line sharing its tags with
+        other lines should only impact this line ; the other ones should keep their
+        link to the initial tags (their tag_name will hence differ in the end).
+        """
+        tags_before = self.tax_report_line_1_1.tag_ids
+        self.tax_report_line_1_1.tag_name = None
+        self.assertEqual(len(self.tax_report_line_1_1.tag_ids), 0, "Setting the tag_name to None should have removed the tags.")
+        self.assertEqual(self.tax_report_line_2_1.tag_ids, tags_before, "Setting tag_name to None on a line linked to another one via tag_name should break this link.")
+
+    def test_tax_report_change_country(self):
+        """ Tests that duplicating and modifying the country of a tax report works
+        as intended (countries wanting to use the tax report of another
+        country need that).
+        """
+        # Copy our first report
+        tags_before = self._get_tax_tags().ids
+        copied_report_1 = self.tax_report_1.copy()
+        copied_report_2 = self.tax_report_1.copy()
+        tags_after = self._get_tax_tags().ids
+        self.assertEqual(tags_before, tags_after, "Report duplication should not create or remove any tag")
+
+        for original, copy in zip(self.tax_report_1.get_lines_in_hierarchy(), copied_report_1.get_lines_in_hierarchy()):
+            self.assertEqual(original.tag_ids, copy.tag_ids, "Copying the lines of a tax report should keep the same tags on lines")
+
+        # Assign another country to one of the copies
+        copied_report_1.country_id = self.test_country_2
+        for original, copy in zip(self.tax_report_1.get_lines_in_hierarchy(), copied_report_1.get_lines_in_hierarchy()):
+            if original.tag_ids or copy.tag_ids:
+                self.assertNotEqual(original.tag_ids, copy.tag_ids, "Changing the country of a copied report should create brand new tags for all of its lines")
+
+        for original, copy in zip(self.tax_report_1.get_lines_in_hierarchy(), copied_report_2.get_lines_in_hierarchy()):
+            self.assertEqual(original.tag_ids, copy.tag_ids, "Changing the country of a copied report should not impact the other copies or the original report")
+
+
+        # Direclty change the country of a report without copying it first (some of its tags are shared, but not all)
+        original_report_2_tags = {line.id: line.tag_ids.ids for line in self.tax_report_2.get_lines_in_hierarchy()}
+        self.tax_report_2.country_id = self.test_country_2
+        for line in self.tax_report_2.get_lines_in_hierarchy():
+            if line == self.tax_report_line_2_42:
+                # This line is the only one of the report not sharing its tags
+                self.assertEqual(line.tag_ids.ids, original_report_2_tags[line.id], "The tax report lines not sharing their tags with any other report should keep the same tags when the country of their report is changed")
+            elif line.tag_ids or original_report_2_tags[line.id]:
+                self.assertNotEqual(line.tag_ids.ids, original_report_2_tags[line.id], "The tax report lines sharing their tags with other report should receive new tags when the country of their report is changed")
diff --git a/addons/account/views/account_tax_report_views.xml b/addons/account/views/account_tax_report_views.xml
index 255f29950ab1279f9df1d85a648aab22556c5024..49ead71fc0fef35fdbdbd48628ee3bf2851c18f1 100644
--- a/addons/account/views/account_tax_report_views.xml
+++ b/addons/account/views/account_tax_report_views.xml
@@ -2,6 +2,17 @@
 <odoo>
     <data>
 
+        <record id="account_tax_report_tree" model="ir.ui.view">
+            <field name="name">account.tax.report.tree</field>
+            <field name="model">account.tax.report</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="name"/>
+                    <field name="country_id"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="account_tax_report_line_tree" model="ir.ui.view">
             <field name="name">account.tax.report.line.tree</field>
             <field name="model">account.tax.report.line</field>
@@ -9,10 +20,35 @@
                 <tree create="1" delete="1">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
+                    <field name="tag_name"/>
+                    <field name="code"/>
+                    <field name="formula"/>
                 </tree>
             </field>
         </record>
 
+        <record id="account_tax_report_form" model="ir.ui.view">
+            <field name="name">account.tax.report.form</field>
+            <field name="model">account.tax.report</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                            </group>
+                            <group>
+                                <field name="country_id"/>
+                            </group>
+                        </group>
+
+                        <field name="id" invisible="1"/>
+                        <field name="root_line_ids" context="{'default_report_id': id}"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
         <record id="account_tax_report_line_form" model="ir.ui.view">
             <field name="name">account.tax.report.line.form</field>
             <field name="model">account.tax.report.line</field>
@@ -21,13 +57,13 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="country_id" invisible="1"/>
                             <field name="sequence" invisible="1"/>
                             <field name="name"/>
                             <field name="tag_name"/>
                         </group>
                         <group>
-                            <field name="parent_id" domain="[('country_id','=',country_id)]"/>
+                            <field name="report_id" readonly="1"/>
+                            <field name="parent_id" readonly="1"/>
                             <field name="code"/>
                         </group>
                     </group>
@@ -35,11 +71,10 @@
                         <field name="formula"/>
                     </group>
                     <group string="Sublines">
-                        <field name="children_line_ids" context="{'default_country_id': country_id}">
+                        <field name="children_line_ids" context="{'default_report_id': report_id}">
                             <form>
                                 <group>
                                     <group>
-                                        <field name="country_id" invisible="1"/>
                                         <field name="sequence" invisible="1"/>
                                         <field name="name"/>
                                         <field name="tag_name"/>
@@ -52,7 +87,7 @@
                                     <field name="formula"/>
                                 </group>
                                 <group string="Sublines">
-                                    <field name="children_line_ids" context="{'form_view_ref': 'account.account_tax_report_line_form', 'default_country_id': country_id}"/>
+                                    <field name="children_line_ids" context="{'form_view_ref': 'account.account_tax_report_line_form'}"/>
                                 </group>
                             </form>
                         </field>
@@ -62,25 +97,25 @@
             </field>
         </record>
 
-        <record id="account_tax_report_line_search" model="ir.ui.view">
-            <field name="name">account.tax.report.line.search</field>
-            <field name="model">account.tax.report.line</field>
+        <record id="account_tax_report_search" model="ir.ui.view">
+            <field name="name">account.tax.report.search</field>
+            <field name="model">account.tax.report</field>
             <field name="arch" type="xml">
                 <search>
                     <group expand="0" string="Group By">
-                        <filter string="Country" name="groupby_country" context="{'group_by': 'country_id'}"/>
+                        <field name="name"/>
+                        <field name="country_id"/>
                     </group>
                 </search>
             </field>
         </record>
 
         <record id="action_configure_tax_report" model="ir.actions.act_window">
-            <field name="name">Configure Tax Report</field>
+            <field name="name">Tax Reports</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.tax.report.line</field>
+            <field name="res_model">account.tax.report</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="account_tax_report_line_tree"/>
-            <field name="context">{'search_default_groupby_country': True}</field>
+            <field name="view_id" ref="account_tax_report_tree"/>
         </record>
 
 
diff --git a/addons/account/wizard/wizard_tax_adjustments.py b/addons/account/wizard/wizard_tax_adjustments.py
index 90016b6d533e1d945eabeeb17dab21492610283a..3dfccfdc8c24cad39ad4f9720276c8de35794bcc 100644
--- a/addons/account/wizard/wizard_tax_adjustments.py
+++ b/addons/account/wizard/wizard_tax_adjustments.py
@@ -20,7 +20,8 @@ class TaxAdjustments(models.TransientModel):
     adjustment_type = fields.Selection([('debit', 'Applied on debit journal item'), ('credit', 'Applied on credit journal item')], string="Adjustment Type", required=True)
     tax_report_line_id = fields.Many2one(string="Report Line", comodel_name='account.tax.report.line', required=True, help="The report line to make an adjustment for.")
     company_currency_id = fields.Many2one('res.currency', readonly=True, default=lambda x: x.env.company.currency_id)
-    country_id = fields.Many2one(string="Country", comodel_name='res.country', readonly=True, default=lambda x: x.env.company.country_id)
+    report_id = fields.Many2one(string="Report", related='tax_report_line_id.report_id')
+
 
     def create_move(self):
         move_line_vals = []
diff --git a/addons/account/wizard/wizard_tax_adjustments_view.xml b/addons/account/wizard/wizard_tax_adjustments_view.xml
index 8c0bf8f826e6c172c679397386afe05fa5d27b57..564eec16c22863b380df8f8f276ea4d23195bbd8 100644
--- a/addons/account/wizard/wizard_tax_adjustments_view.xml
+++ b/addons/account/wizard/wizard_tax_adjustments_view.xml
@@ -10,8 +10,8 @@
                 <field name="reason" class="oe_inline" placeholder="Reason..."/>
             </h1>
             <group>
-                <field name="country_id" invisible="1"/>
-                <field name="tax_report_line_id" widget="selection" domain="[('tag_name', '!=', None), ('country_id', '=', country_id)]"/>
+                <field name="report_id" invisible="1"/>
+                <field name="tax_report_line_id" widget="selection" domain="[('tag_name', '!=', None), ('report_id', '=', report_id)]"/>
             </group>
             <group>
                 <group>
diff --git a/addons/l10n_ae/data/account_tax_report_data.xml b/addons/l10n_ae/data/account_tax_report_data.xml
index de9ea3156162b60562a5c7e7fa864fc19d3a7fa8..de53fc8f262add09efacd76e4a2775439bf05705 100644
--- a/addons/l10n_ae/data/account_tax_report_data.xml
+++ b/addons/l10n_ae/data/account_tax_report_data.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.ae"/>
+    </record>
+
     <record id="tax_report_line_base_all_sales" model="account.tax.report.line">
         <field name="name">VAT on Sales and all other Outputs (Base)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base" model="account.tax.report.line">
         <field name="name">1. Standard Rated supplies (Base)</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_abu_dhabi" model="account.tax.report.line">
@@ -19,8 +24,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_dubai" model="account.tax.report.line">
@@ -28,8 +33,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_sharjah" model="account.tax.report.line">
@@ -37,8 +42,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_ajman" model="account.tax.report.line">
@@ -46,8 +51,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_umm_al_quwain" model="account.tax.report.line">
@@ -55,8 +60,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_ras_al_khaima" model="account.tax.report.line">
@@ -64,8 +69,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_fujairah" model="account.tax.report.line">
@@ -73,16 +78,16 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_base_subtotal" model="account.tax.report.line">
         <field name="name">Sub Total</field>
         <field name="formula">STD_RATE_SUPP_BASE_AB + STD_RATE_SUPP_BASE_DB + STD_RATE_SUPP_BASE_SJ + STD_RATE_SUPP_BASE_AJ + STD_RATE_SUPP_BASE_UM + STD_RATE_SUPP_BASE_RA + STD_RATE_SUPP_BASE_FU</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_tax_refund_tourist_base" model="account.tax.report.line">
@@ -90,8 +95,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_supplies_reverse_charge_base" model="account.tax.report.line">
@@ -99,8 +104,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_zero_rated_supplies_base" model="account.tax.report.line">
@@ -108,8 +113,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_exempt_supplies_base" model="account.tax.report.line">
@@ -117,16 +122,16 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_supplies_out_of_scope_base" model="account.tax.report.line">
         <field name="name">6. Out of scope</field>
         <field name="code">OUT_OF_SCOPE_BASE_0</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_import_uae_base" model="account.tax.report.line">
@@ -134,30 +139,30 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_adjustment_import_uae_base" model="account.tax.report.line">
         <field name="name">8. Adjustments to goods imported into the UAE</field>
         <field name="code">ADJUST_GOODS_IMPORT_IN_UAE_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_base_all_sales_total" model="account.tax.report.line">
         <field name="name">9. Total</field>
         <field name="formula">ADJUST_GOODS_IMPORT_IN_UAE_BASE + GOODS_IMPORT_IN_UAE_BASE + OUT_OF_SCOPE_BASE_0 + EXAMPT_SUPP_BASE + ZERO_RATE_SUPP_BASE + REVERSE_CHARGE_PRO_BASE + TAX_REF_TOUR_SCHEME_BASE + (STD_RATE_SUPP_BASE_AB + STD_RATE_SUPP_BASE_DB + STD_RATE_SUPP_BASE_SJ + STD_RATE_SUPP_BASE_AJ + STD_RATE_SUPP_BASE_UM + STD_RATE_SUPP_BASE_RA + STD_RATE_SUPP_BASE_FU)</field>
         <field name="parent_id" ref="tax_report_line_base_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_base_all_expense" model="account.tax.report.line">
         <field name="name">VAT on Expenses and all other Inputs (Base)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_expense_base" model="account.tax.report.line">
@@ -165,8 +170,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_expense_supplies_reverse_base" model="account.tax.report.line">
@@ -174,37 +179,37 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_expense_out_of_scope" model="account.tax.report.line">
         <field name="name">12. Out of scope</field>
         <field name="code">OUT_OF_SCOPE_1_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_expense"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_base_all_expense_total" model="account.tax.report.line">
         <field name="name">13. Totals</field>
         <field name="formula">OUT_OF_SCOPE_1_BASE + SUPP_REV_CHARGE_PRO_BASE + STD_RATE_EXPENSES_BASE</field>
         <field name="parent_id" ref="tax_report_line_base_all_expense"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_vat_all_sales" model="account.tax.report.line">
         <field name="name">VAT on Sales and all other Outputs (Tax)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat" model="account.tax.report.line">
         <field name="name">1. Standard Rated supplies (Tax)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_abu_dhabi" model="account.tax.report.line">
@@ -212,8 +217,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_dubai" model="account.tax.report.line">
@@ -221,8 +226,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_sharjah" model="account.tax.report.line">
@@ -230,8 +235,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_ajman" model="account.tax.report.line">
@@ -239,8 +244,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_umm_al_quwain" model="account.tax.report.line">
@@ -248,8 +253,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_ras_al_khaima" model="account.tax.report.line">
@@ -257,25 +262,25 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <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 (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="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_supplies_vat_subtotal" model="account.tax.report.line">
         <field name="name">Sub Total</field>
         <field name="formula">STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU</field>
         <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_tax_refund_tourist_vat" model="account.tax.report.line">
@@ -283,8 +288,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_supplies_reverse_charge_vat" model="account.tax.report.line">
@@ -292,8 +297,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_zero_rated_supplies_vat" model="account.tax.report.line">
@@ -301,8 +306,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_exempt_supplies_vat" model="account.tax.report.line">
@@ -310,16 +315,16 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_supplies_out_of_scope_vat" model="account.tax.report.line">
         <field name="name">6. Out of scope</field>
         <field name="code">OUT_OF_SCOPE_TAX_0</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_import_uae_vat" model="account.tax.report.line">
@@ -327,30 +332,30 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_adjustment_import_uae_vat" model="account.tax.report.line">
         <field name="name">8. Adjustments to goods imported into the UAE</field>
         <field name="code">ADJUST_GOODS_IMPORT_IN_UAE_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_vat_all_sales_total" model="account.tax.report.line">
         <field name="name">9. Total</field>
         <field name="formula">(STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_vat_all_expense" model="account.tax.report.line">
         <field name="name">VAT on Expenses and all other Inputs (Tax)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_standard_rated_expense_vat" model="account.tax.report.line">
@@ -358,8 +363,8 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_expense_supplies_reverse_vat" model="account.tax.report.line">
@@ -367,55 +372,55 @@
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_expense_out_of_scope_vat" model="account.tax.report.line">
         <field name="name">12. Out of scope</field>
         <field name="code">OUT_OF_SCOPE_1_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_vat_all_expense_total" model="account.tax.report.line">
         <field name="name">13. Totals</field>
         <field name="formula">OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX</field>
         <field name="parent_id" ref="tax_report_line_vat_all_expense"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_net_vat_due" model="account.tax.report.line">
         <field name="name">Net VAT Due</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="formula">((STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX) - (OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX)</field>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_total_value_due_tax_period" model="account.tax.report.line">
         <field name="name">14. Total value of due tax for the period</field>
         <field name="formula">(STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX</field>
         <field name="parent_id" ref="tax_report_line_net_vat_due"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_total_value_recoverable_tax_period" model="account.tax.report.line">
         <field name="name">15. Total value of recoverable tax for the period</field>
         <field name="formula">OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX</field>
         <field name="parent_id" ref="tax_report_line_net_vat_due"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
     <record id="tax_report_line_net_vat_due_period" model="account.tax.report.line">
         <field name="name">16. Net VAT due (or reclaimed) for the period</field>
         <field name="formula">((STD_RATE_SUPP_TAX_AB + STD_RATE_SUPP_TAX_DB + STD_RATE_SUPP_TAX_SJ + STD_RATE_SUPP_TAX_AJ + STD_RATE_SUPP_TAX_UM + STD_RATE_SUPP_TAX_RA + STD_RATE_SUPP_TAX_FU) + OUT_OF_SCOPE_TAX_0 + ADJUST_GOODS_IMPORT_IN_UAE_TAX + GOODS_IMPORT_IN_UAE_TAX + EXAMPT_SUPP_TAX + ZERO_RATE_SUPP_TAX + REVERSE_CHARGE_PRO_TAX + TAX_REF_TOUR_SCHEME_TAX) - (OUT_OF_SCOPE_1_TAX + SUPP_REV_CHARGE_PRO_TAX + STD_RATE_EXPENSES_TAX)</field>
         <field name="parent_id" ref="tax_report_line_net_vat_due"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ae"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_at/data/account_tax_report_data.xml b/addons/l10n_at/data/account_tax_report_data.xml
index 4c86c6a224a9928428b5112fb608797792109b6b..e6810492ab1ef111fe1a44c380c8774704ee81ff 100644
--- a/addons/l10n_at/data/account_tax_report_data.xml
+++ b/addons/l10n_at/data/account_tax_report_data.xml
@@ -1,85 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.at"/>
+    </record>
+
     <record id="tax_report_line_l10n_at_tva_sale_report_title" model="account.tax.report.line">
         <field name="name">4. Berechnung der Umsatzsteuer (U1/U30)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
-        <field name="country_id" ref="base.at"/>
     </record>
+
     <record id="tax_report_line_l10n_at_tva_line_4_1" model="account.tax.report.line">
         <field name="name">4.1 Gesamtbetrag der Bemessungsgrundlage für Lieferungen und sonstige Leistungen [000]</field>
         <field name="tag_name">KZ 000</field>
         <field name="code">AT_000</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="20"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_2" model="account.tax.report.line">
         <field name="name">4.2 zuzüglich Eigenverbrauch (§ 1 Abs. 1 Z 2, § 3 Abs. 2 und § 3a Abs. 1a) [001]</field>
         <field name="tag_name">KZ 001</field>
         <field name="code">AT_001</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="30"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_3" model="account.tax.report.line">
         <field name="name">4.3 abzüglich Umsätze, für die die Steuerschuld gemäß § 19 Abs. 1 (Leistungsempfänger) [021]</field>
         <field name="tag_name">KZ 021</field>
         <field name="code">AT_021</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="40"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_4" model="account.tax.report.line">
         <field name="name">4.4 Summe</field>
         <field name="formula">AT_000 + AT_001 - AT_021</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="50"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_sale_01_report_title" model="account.tax.report.line">
         <field name="name">Davon steuerfrei MIT Vorsteuerabzug gemäß</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="60"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_l10n_at_tva_line_4_5" model="account.tax.report.line">
         <field name="name">4.5 § 6 Abs. 1 Z 1 iVm § 7 (Ausfuhrlieferungen) [011]</field>
         <field name="tag_name">KZ 011</field>
         <field name="code">AT_011</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="70"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_01_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_6" model="account.tax.report.line">
         <field name="name">4.6 § 6 Abs. 1 Z 1 iVm § 8 (Lohnveredelungen) [012]</field>
         <field name="tag_name">KZ 012</field>
         <field name="code">AT_012</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="80"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_01_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_7" model="account.tax.report.line">
         <field name="name">4.7 § 6 Abs. 1 Z 2 bis 6 sowie § 23 Abs. 5 (Seeschifffahrt, Luftfahrt, ...) [015]</field>
     <field name="tag_name">KZ 015</field>
         <field name="code">AT_015</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="90"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_01_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_8" model="account.tax.report.line">
         <field name="name">4.8 Art. 6 Abs. 1 (innergemeinschaftliche Lieferungen ohne die nachstehend gesondert anzuführenden Fahrzeuglieferungen) [017]</field>
         <field name="tag_name">KZ 017</field>
         <field name="code">AT_017</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="100"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_01_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_9" model="account.tax.report.line">
@@ -87,507 +93,507 @@
 Art. 2 erfolgten. [018]</field>
     <field name="tag_name">KZ 018</field>
         <field name="code">AT_018</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="110"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_01_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_l10n_at_tva_sale_02_report_title" model="account.tax.report.line">
         <field name="name">Davon steuerfrei OHNE Vorsteuerabzug gemäß</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="120"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_l10n_at_tva_line_4_10" model="account.tax.report.line">
         <field name="name">4.10 § 6 Abs. 1 Z 9 lit. a (Grundstücksumsätze) [019]</field>
         <field name="tag_name">KZ 019</field>
         <field name="code">AT_019</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="130"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_02_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_11" model="account.tax.report.line">
         <field name="name">4.11 § 6 Abs. 1 Z 27 (Kleinunternehmer) [016]</field>
         <field name="tag_name">KZ 016</field>
         <field name="code">AT_016</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="140"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_02_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_12" model="account.tax.report.line">
         <field name="name">4.12 § 6 Abs. 1 Z .. (übrige steuerfreie Umsätze ohne Vorsteuerabzug) [020]</field>
         <field name="tag_name">KZ 020</field>
         <field name="code">AT_020</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="150"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_02_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_13" model="account.tax.report.line">
         <field name="name">4.13 Gesamtbetrag der steuerpflichtigen Lieferungen, sonstigen Leistungen und Eigenverbrauch (einschließlich steuerpflichtiger Anzahlungen)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="160"/>
         <field name="formula">(AT_000 + AT_001 - AT_021) - AT_011 - AT_012 - AT_015 - AT_017 - AT_018 - AT_019 - AT_016 - AT_020</field>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_at_base_title_umsatz_base_4_14_19" model="account.tax.report.line">
         <field name="name">Bemessungsgrundlage</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="170"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_14_base" model="account.tax.report.line">
         <field name="name">4.14 20% Normalsteuersatz [022]</field>
         <field name="tag_name">KZ 022 Bemessungsgrundlage</field>
         <field name="code">AT_022_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="180"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_15_base" model="account.tax.report.line">
         <field name="name">4.15 10% ermäßigter Steuersatz [029]</field>
         <field name="tag_name">KZ 029 Bemessungsgrundlage</field>
         <field name="code">AT_029_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="190"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_16_base" model="account.tax.report.line">
         <field name="name">4.16 13% ermäßigter Steuersatz [006]</field>
         <field name="tag_name">KZ 006 Bemessungsgrundlage</field>
         <field name="code">AT_006_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="200"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_17_base" model="account.tax.report.line">
         <field name="name">4.17 19% für Jungholz und Mittelberg [037]</field>
         <field name="tag_name">KZ 037 Bemessungsgrundlage</field>
         <field name="code">AT_037_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="210"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_18_base" model="account.tax.report.line">
         <field name="name">4.18 10% Zusatzsteuer für pauschalierte land- und forstwirtschaftliche Betriebe [052]</field>
         <field name="tag_name">KZ 052 Bemessungsgrundlage</field>
         <field name="code">AT_052_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="220"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_19_base" model="account.tax.report.line">
         <field name="name">4.19 7% Zusatzsteuer für pauschalierte land- und forstwirtschaftliche Betriebe [007]</field>
         <field name="tag_name">KZ 007 Bemessungsgrundlage</field>
         <field name="code">AT_007_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="230"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_at_tax_title_4_14_19" model="account.tax.report.line">
         <field name="name">Umsatzsteuer</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="240"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_14_tax" model="account.tax.report.line">
         <field name="name">4.14 20% Normalsteuersatz</field>
         <field name="tag_name">KZ 022 Umsatzsteuer</field>
         <field name="code">AT_022_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="250"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_15_tax" model="account.tax.report.line">
         <field name="name">4.15 10% ermäßigter Steuersatz</field>
         <field name="tag_name">KZ 029 Umsatzsteuer</field>
         <field name="code">AT_029_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="260"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_16_tax" model="account.tax.report.line">
         <field name="name">4.16 13% ermäßigter Steuersatz</field>
         <field name="tag_name">KZ 006 Umsatzsteuer</field>
         <field name="code">AT_006_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="270"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_17_tax" model="account.tax.report.line">
         <field name="name">4.17 19% für Jungholz und Mittelberg</field>
         <field name="tag_name">KZ 037 Umsatzsteuer</field>
         <field name="code">AT_037_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="280"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_18_tax" model="account.tax.report.line">
         <field name="name">4.18 10% Zusatzsteuer für pauschalierte land- und forstwirtschaftliche Betriebe</field>
         <field name="tag_name">KZ 052 Umsatzsteuer</field>
         <field name="code">AT_052_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="290"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_19_tax" model="account.tax.report.line">
         <field name="name">4.19 7% Zusatzsteuer für pauschalierte land- und forstwirtschaftliche Betriebe</field>
         <field name="tag_name">KZ 007 Umsatzsteuer</field>
         <field name="code">AT_007_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="300"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_14_19"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_20" model="account.tax.report.line">
         <field name="name">4.20 Steuerschuld gemäß § 11 Abs. 12 und 14, § 16 Abs. 2 sowie gemäß Art. 7 Abs. 4 [056]</field>
         <field name="tag_name">KZ 056</field>
         <field name="code">AT_056</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="310"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_21" model="account.tax.report.line">
         <field name="name">4.21 Steuerschuld gemäß § 19 Abs. 1 zweiter Satz, § 19 Abs. 1c, 1e sowie gemäß Art. 25 Abs. 5 [057]</field>
         <field name="tag_name">KZ 057</field>
         <field name="code">AT_057</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="330"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_22" model="account.tax.report.line">
         <field name="name">4.22 Steuerschuld gemäß § 19 Abs. 1a (Bauleistungen) [048]</field>
         <field name="tag_name">KZ 048</field>
         <field name="code">AT_048</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="340"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_23" model="account.tax.report.line">
         <field name="name">4.23 Steuerschuld gemäß § 19 Abs. 1b (Sicherungseigentum, ...) [044]</field>
         <field name="tag_name">KZ 044</field>
         <field name="code">AT_044</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="350"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_24" model="account.tax.report.line">
         <field name="name">4.24 Steuerschuld gemäß § 19 Abs. 1d (Schrott und Abfallstoffe) [032]</field>
         <field name="tag_name">KZ 032</field>
         <field name="code">AT_032</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="360"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_sale_03_report_title" model="account.tax.report.line">
         <field name="name">Innergemeinschaftliche Erwerb</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="365"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_l10n_at_tva_line_4_25" model="account.tax.report.line">
         <field name="name">4.25 Gesamtbetrag der Bemessungsgrundlagen für innergemeinschaftliche Erwerbe [070]</field>
         <field name="tag_name">KZ 070</field>
         <field name="code">AT_070</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="370"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_03_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_26" model="account.tax.report.line">
         <field name="name">4.26 Davon steuerfrei gemäß Art. 6 Abs. 2 [071]</field>
         <field name="tag_name">KZ 071</field>
         <field name="code">AT_071</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="380"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_03_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_27" model="account.tax.report.line">
         <field name="name">4.27 Gesamtbetrag der steuerpflichtigen innergemeinschaftlichen Erwerbe</field>
         <field name="formula">AT_070 - AT_071</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="390"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_03_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_l10n_at_tva_sale_04_report_title" model="account.tax.report.line">
         <field name="name">Davon sind zu versteuern mit</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="395"/>
         <field name="formula">AT_072_base + AT_073_base + AT_008_base + AT_088_base</field>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_at_base_title_umsatz_base_4_28_31" model="account.tax.report.line">
         <field name="name">Bemessungsgrundlage</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="400"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_04_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_28_base" model="account.tax.report.line">
         <field name="name">4.28 20% Normalsteuersatz [072]</field>
         <field name="tag_name">KZ 072 Bemessungsgrundlage</field>
         <field name="code">AT_072_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="400"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_29_base" model="account.tax.report.line">
         <field name="name">4.29 10% ermäßigter Steuersatz [073]</field>
         <field name="tag_name">KZ 073 Bemessungsgrundlage</field>
         <field name="code">AT_073_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="420"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_30_base" model="account.tax.report.line">
         <field name="name">4.30 13% ermäßigter Steuersatz [008]</field>
         <field name="tag_name">KZ 008 Bemessungsgrundlage</field>
         <field name="code">AT_008_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="450"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_31_base" model="account.tax.report.line">
         <field name="name">4.31 19% für Jungholz und Mittelberg [088]</field>
         <field name="tag_name">KZ 088 Bemessungsgrundlage</field>
         <field name="code">AT_088_base</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="550"/>
         <field name="parent_id" ref="tax_report_line_at_base_title_umsatz_base_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_at_tax_title_4_28_31" model="account.tax.report.line">
         <field name="name">Umsatzsteuer</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="410"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_04_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_28_tax" model="account.tax.report.line">
         <field name="name">4.28 20% Normalsteuersatz</field>
         <field name="tag_name">KZ 072 Umsatzsteuer</field>
         <field name="code">AT_072_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="410"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_29_tax" model="account.tax.report.line">
         <field name="name">4.29 10% ermäßigter Steuersatz</field>
         <field name="tag_name">KZ 073 Umsatzsteuer</field>
         <field name="code">AT_073_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="430"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_30_tax" model="account.tax.report.line">
         <field name="name">4.30 13% ermäßigter Steuersatz</field>
         <field name="tag_name">KZ 008 Umsatzsteuer</field>
         <field name="code">AT_008_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="500"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_31_tax" model="account.tax.report.line">
         <field name="name">4.31 19% für Jungholz und Mittelberg</field>
         <field name="tag_name">KZ 088 Umsatzsteuer</field>
         <field name="code">AT_088_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="600"/>
         <field name="parent_id" ref="tax_report_line_at_tax_title_4_28_31"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_sale_05_report_title" model="account.tax.report.line">
         <field name="name">Nicht zu versteuernde Erwerbe</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="610"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
     <record id="tax_report_line_l10n_at_tva_line_4_32" model="account.tax.report.line">
         <field name="name">4.32 Erwerbe gemäß Art. 3 Abs. 8 zweiter Satz, die im Mitgliedstaat des Bestimmungslandes besteuert worden sind [076]</field>
         <field name="tag_name">KZ 076</field>
         <field name="code">AT_076</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="650"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_05_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_4_33" model="account.tax.report.line">
         <field name="name">4.33 Erwerbe gemäß Art. 3 Abs. 8 zweiter Satz, die gemäß Art. 25 Abs. 2 im Inland als besteuert gelten [077]</field>
         <field name="tag_name">KZ 077</field>
         <field name="code">AT_077</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="700"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_sale_05_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_purchase_report_title" model="account.tax.report.line">
     <field name="name">5. Berechnung der abziehbaren Vorsteuer</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="710"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_1" model="account.tax.report.line">
         <field name="name">5.1 Gesamtbetrag der Vorsteuern (ohne die nachstehend gesondert anzuführenden Beträge) [060]</field>
         <field name="tag_name">KZ 060</field>
         <field name="code">AT_060</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="750"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_2" model="account.tax.report.line">
         <field name="name">5.2 Vorsteuern betreffend die entrichtete Einfuhrumsatzsteuer (§ 12 Abs. 1 Z 2 lit. a) [061]</field>
         <field name="tag_name">KZ 061</field>
         <field name="code">AT_061</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="800"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_3" model="account.tax.report.line">
         <field name="name">5.3 Vorsteuern betreffend die geschuldete, auf dem Abgabenkonto verbuchte Einfuhrumsatzsteuer (§ 12 Abs. 1 Z 2 lit. b) [083]</field>
         <field name="tag_name">KZ 083</field>
         <field name="code">AT_083</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="850"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_4" model="account.tax.report.line">
         <field name="name">5.4 Vorsteuern aus dem innergemeinschaftlichen Erwerb [065]</field>
         <field name="tag_name">KZ 065</field>
         <field name="code">AT_065</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="900"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_5" model="account.tax.report.line">
         <field name="name">5.5 Vorsteuern betreffend die Steuerschuld gemäß § 19 Abs. 1 zweiter Satz, § 19 Abs. 1c, 1e sowie gemäß Art. 25 Abs. 5 [066]</field>
         <field name="tag_name">KZ 066</field>
         <field name="code">AT_066</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="950"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_6" model="account.tax.report.line">
         <field name="name">5.6 Vorsteuern betreffend die Steuerschuld gemäß § 19 Abs. 1a (Bauleistungen) [082]</field>
         <field name="tag_name">KZ 082</field>
         <field name="code">AT_082</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="960"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_7" model="account.tax.report.line">
         <field name="name">5.7 Vorsteuern betreffend die Steuerschuld gemäß § 19 Abs. 1b (Sicherungseigentum, ...) [087]</field>
         <field name="tag_name">KZ 087</field>
         <field name="code">AT_087</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="970"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_8" model="account.tax.report.line">
         <field name="name">5.8 Vorsteuern betreffend die Steuerschuld gemäß § 19 Abs. 1d (Schrott und Abfallstoffe) [089]</field>
         <field name="tag_name">KZ 089</field>
         <field name="code">AT_089</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="980"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_9" model="account.tax.report.line">
         <field name="name">5.9 Vorsteuern für innergemeinschaftliche Lieferungen neuer Fahrzeuge von Fahrzeuglieferern gemäß Art. 2 [064]</field>
         <field name="tag_name">KZ 064</field>
         <field name="code">AT_064</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="990"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_10" model="account.tax.report.line">
         <field name="name">5.10 Davon nicht abzugsfähig gemäß § 12 Abs. 3 iVm Abs. 4 und 5 [062]</field>
         <field name="tag_name">KZ 062</field>
         <field name="code">AT_062</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1000"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_11" model="account.tax.report.line">
         <field name="name">5.11 Berichtigung gemäß § 12 Abs. 10 und 11 [063]</field>
         <field name="tag_name">KZ 063</field>
         <field name="code">AT_063</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1010"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_12" model="account.tax.report.line">
         <field name="name">5.12 Berichtigung gemäß § 16 [067]</field>
         <field name="tag_name">KZ 067</field>
         <field name="code">AT_067</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1020"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_5_13" model="account.tax.report.line">
         <field name="name">5.13 Gesamtbetrag der abziehbaren Vorsteuer</field>
         <field name="formula">AT_060 + AT_061 + AT_083 + AT_065 + AT_066 + AT_082 + AT_087 + AT_089 + AT_064 + AT_062 + AT_063 + AT_067</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1030"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_purchase_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_final_report_title" model="account.tax.report.line">
         <field name="name">6. Sonstige Berichtigungen</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1040"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_6" model="account.tax.report.line">
         <field name="name">Sonstige Berichtigungen [090]</field>
         <field name="tag_name">KZ 090</field>
         <field name="code">AT_090</field>
-    <field name="sequence" eval="1050"/>
+    <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1050"/>
         <field name="parent_id" ref="tax_report_line_l10n_at_tva_final_report_title"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 
     <record id="tax_report_line_l10n_at_tva_line_7" model="account.tax.report.line">
         <field name="name">7. Zahllast (-) bzw. Gutschrift/Ãœberschuss (+) [095]</field>
         <field name="formula">(AT_022_tax + AT_029_tax + AT_006_tax + AT_037_tax + AT_052_tax + AT_007_tax + AT_056 + AT_057 + AT_048 + AT_044 + AT_032 + AT_072_tax + AT_073_tax + AT_008_tax + AT_088_tax + AT_060 + AT_061 + AT_083 + AT_065 + AT_066 + AT_082 + AT_087 + AT_089 + AT_064 + AT_062 + AT_063 + AT_067) + AT_090</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1060"/>
-        <field name="country_id" ref="base.at"/>
     </record>
 </odoo>
diff --git a/addons/l10n_au/data/account_tax_report_data.xml b/addons/l10n_au/data/account_tax_report_data.xml
index 607204f8efee3afa7d0403ad10f4042c1b05c8dc..07a55b1f4393a8c525231fbe29ec4d8fcc5c6a37 100644
--- a/addons/l10n_au/data/account_tax_report_data.xml
+++ b/addons/l10n_au/data/account_tax_report_data.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.au"/>
+    </record>
+
     <record id="account_tax_report_gstrpt_sale_total" model="account.tax.report.line">
         <field name="name">GST amounts you owe the Tax Office from sales</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g1" model="account.tax.report.line">
         <field name="name">G1: Total Sales (including any GST)</field>
         <field name="tag_name">G1</field>
         <field name="code">G1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.au"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_sale_total"/>
     </record>
 
@@ -20,209 +25,209 @@
         <field name="name">G2: Export sales</field>
         <field name="tag_name">G2</field>
         <field name="code">G2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g1"/>
-        <field name="country_id" ref="base.au"/>
-    </record>
+        </record>
 
     <record id="account_tax_report_gstrpt_g3" model="account.tax.report.line">
         <field name="name">G3: Other GST-free sales</field>
         <field name="tag_name">G3</field>
         <field name="code">G3</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g1"/>
-        <field name="country_id" ref="base.au"/>
-    </record>
+        </record>
 
     <record id="account_tax_report_gstrpt_g4" model="account.tax.report.line">
         <field name="name">G4: Input taxed sales</field>
         <field name="tag_name">G4</field>
         <field name="code">G4</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g1"/>
-        <field name="country_id" ref="base.au"/>
-    </record>
+        </record>
 
     <record id="account_tax_report_gstrpt_g5" model="account.tax.report.line">
         <field name="name">G5: G2 + G3 + G4</field>
         <field name="formula">G2+G3+G4</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.au"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_sale_total"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g6" model="account.tax.report.line">
         <field name="name">G6: Total sales subject to GST (G1 minus G5)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="formula">G1-(G2+G3+G4)</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_sale_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g7" model="account.tax.report.line">
         <field name="name">G7: Adjustments (if applicable)</field>
         <field name="tag_name">G7</field>
         <field name="code">G7</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g6"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g8" model="account.tax.report.line">
         <field name="name">G8: Total sales subject to GST after adjustments (G6 + G7)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="formula">(G1-(G2+G3+G4))+G7</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_sale_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g9" model="account.tax.report.line">
         <field name="name">G9: GST on sales (G8 divided by eleven)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="formula">((G1-(G2+G3+G4))+G7)/11</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_sale_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <!-- Purchase Report -->
     <record id="account_tax_report_gstrpt_purchase_total" model="account.tax.report.line">
         <field name="name">GST amounts the Tax Office owes you from purchases</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="101"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g10" model="account.tax.report.line">
         <field name="name">G10: Capital purchases (including any GST)</field>
         <field name="tag_name">G10</field>
         <field name="code">G10</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="102"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g11" model="account.tax.report.line">
         <field name="name">G11: Non-capital purchases (including GST)</field>
         <field name="tag_name">G11</field>
         <field name="code">G11</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="103"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g12" model="account.tax.report.line">
         <field name="name">G12: G10 + G11</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="104"/>
         <field name="formula">G10+G11</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g13" model="account.tax.report.line">
         <field name="name">G13: Purchases for making input taxed sales</field>
         <field name="tag_name">G13</field>
         <field name="code">G13</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="105"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g12"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g14" model="account.tax.report.line">
         <field name="name">G14: Purchases without GST in the price</field>
         <field name="tag_name">G14</field>
         <field name="code">G14</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="106"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g12"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g15" model="account.tax.report.line">
         <field name="name">G15: Estimated purchases for private use or not income tax deductible</field>
         <field name="tag_name">G15</field>
         <field name="code">G15</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="107"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g12"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g16" model="account.tax.report.line">
         <field name="name">G16: G13 + G14 + G15</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="108"/>
         <field name="formula">G13+G14+G15</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g17" model="account.tax.report.line">
         <field name="name">G17: Total purchases subject to GST (G12 minus G16) </field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="109"/>
         <field name="formula">(G10+G11)-(G13+G14+G15)</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g18" model="account.tax.report.line">
         <field name="name">G18: Adjustments (if applicable)</field>
         <field name="tag_name">G18</field>
         <field name="code">G18</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="110"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g17"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g19" model="account.tax.report.line">
         <field name="name">G19: Total purchases subject to GST after adjustments (G17 + G18) </field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="111"/>
         <field name="formula">(G10+G11)-(G13+G14+G15)+G18</field>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g20a" model="account.tax.report.line">
         <field name="name">GST on purchases (G19 divided by eleven)</field>
         <field name="formula">((G10+G11)-(G13+G14+G15)+G18)/11</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="112"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_purchase_total"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_gstonly" model="account.tax.report.line">
         <field name="name">GST only purchases</field>
         <field name="tag_name">ONLY</field>
         <field name="code">ONLY</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="113"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_g20a"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_g20b" model="account.tax.report.line">
         <field name="name">G20: GST on purchases</field>
         <field name="formula">(((G10+G11)-(G13+G14+G15)+G18)/11)+ONLY</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="114"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <!-- Comparison -->
     <record id="account_tax_report_gstrpt_comparison" model="account.tax.report.line">
         <field name="name">Comparison</field>
         <field name="tag_name">Comparison</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="201"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_comparison_worksheet" model="account.tax.report.line">
         <field name="name">GST from worksheet (G20-G9)</field>
         <field name="formula">((((G10+G11)-(G13+G14+G15)+G18)/11)+ONLY)-(((G1-(G2+G3+G4))+G7)/11)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="202"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_comparison"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
     <record id="account_tax_report_gstrpt_comparison_gl" model="account.tax.report.line">
         <field name="name">GST from General Ledger</field>
         <field name="tag_name">GST from General Ledger</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="203"/>
         <field name="parent_id" ref="account_tax_report_gstrpt_comparison"/>
-        <field name="country_id" ref="base.au"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_be/data/account_tax_report_data.xml b/addons/l10n_be/data/account_tax_report_data.xml
index 0510d78ff97013fb5bb646cb2fc66e0f8e1ec7fb..6b21b5c112405578e3617c38554a3b832d3e70dc 100644
--- a/addons/l10n_be/data/account_tax_report_data.xml
+++ b/addons/l10n_be/data/account_tax_report_data.xml
@@ -1,352 +1,354 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
-
-        <record id="tax_report_title_operations" model="account.tax.report.line">
-            <field name="name">Opérations</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_title_operations_sortie" model="account.tax.report.line">
-            <field name="name">II A la sortie</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_operations"/>
-        </record>
-
-        <record id="tax_report_line_00" model="account.tax.report.line">
-            <field name="name">00 - Opérations soumises à un régime particulier</field>
-            <field name="code">c00</field>
-            <field name="tag_name">00</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_01" model="account.tax.report.line">
-            <field name="name">01 - Opérations avec TVA à 6%</field>
-            <field name="code">c01</field>
-            <field name="tag_name">01</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_02" model="account.tax.report.line">
-            <field name="name">02 - Opérations avec TVA à 12%</field>
-            <field name="code">c02</field>
-            <field name="tag_name">02</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">3</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_03" model="account.tax.report.line">
-            <field name="name">03 - Opérations avec TVA à 21%</field>
-            <field name="code">c03</field>
-            <field name="tag_name">03</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">4</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_44" model="account.tax.report.line">
-            <field name="name">44 - Services intra-communautaires</field>
-            <field name="code">c44</field>
-            <field name="tag_name">44</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">5</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_45" model="account.tax.report.line">
-            <field name="name">45 - Opérations avec TVA due par le cocontractant</field>
-            <field name="code">c45</field>
-            <field name="tag_name">45</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">6</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_title_operations_sortie_46" model="account.tax.report.line">
-            <field name="name">46 - Livraisons intra-communautaires exemptées</field>
-            <field name="code">c46</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">7</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_46L" model="account.tax.report.line">
-            <field name="name">46L - Livraisons biens intra-communautaires exemptées</field>
-            <field name="tag_name">46L</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie_46"/>
-        </record>
-
-        <record id="tax_report_line_46T" model="account.tax.report.line">
-            <field name="name">46T - Livraisons biens intra-communautaire exemptées</field>
-            <field name="tag_name">46T</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie_46"/>
-        </record>
-
-        <record id="tax_report_line_47" model="account.tax.report.line">
-            <field name="name">47 - Autres opérations exemptées</field>
-            <field name="code">c47</field>
-            <field name="tag_name">47</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">8</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_title_operations_sortie_48" model="account.tax.report.line">
-            <field name="name">48 - Notes de crédit aux opérations grilles [44] et [46]</field>
-            <field name="code">c48</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">9</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_line_48s44" model="account.tax.report.line">
-            <field name="name">48s44 - Notes de crédit aux opérations grilles [44]</field>
-            <field name="tag_name">48s44</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie_48"/>
-        </record>
-
-        <record id="tax_report_line_48s46L" model="account.tax.report.line">
-            <field name="name">48s46L - Notes de crédit aux opérations grilles [46L]</field>
-            <field name="tag_name">48s46L</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie_48"/>
-        </record>
-
-        <record id="tax_report_line_48s46T" model="account.tax.report.line">
-            <field name="name">48s46T - Notes de crédit aux opérations grilles [46T]</field>
-            <field name="tag_name">48s46T</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">3</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie_48"/>
-        </record>
-
-        <record id="tax_report_line_49" model="account.tax.report.line">
-            <field name="name">49 - Notes de crédit aux opérations du point II</field>
-            <field name="code">c49</field>
-            <field name="tag_name">49</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">10</field>
-            <field name="parent_id" ref="tax_report_title_operations_sortie"/>
-        </record>
-
-        <record id="tax_report_title_operations_entree" model="account.tax.report.line">
-            <field name="name">III A l'entrée</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_operations"/>
-        </record>
-
-        <record id="tax_report_line_81" model="account.tax.report.line">
-            <field name="name">81 - Marchandises, matières premières et auxiliaires</field>
-            <field name="code">c81</field>
-            <field name="tag_name">81</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_82" model="account.tax.report.line">
-            <field name="name">82 - Services et biens divers</field>
-            <field name="code">c82</field>
-            <field name="tag_name">82</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_83" model="account.tax.report.line">
-            <field name="name">83 - Biens d'investissement</field>
-            <field name="code">c83</field>
-            <field name="tag_name">83</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">3</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_84" model="account.tax.report.line">
-            <field name="name">84 - Notes de crédits sur opérations case [86] et [88]</field>
-            <field name="code">c84</field>
-            <field name="tag_name">84</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">4</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_85" model="account.tax.report.line">
-            <field name="name">85 - Notes de crédits autres opérations</field>
-            <field name="code">c85</field>
-            <field name="tag_name">85</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">5</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_86" model="account.tax.report.line">
-            <field name="name">86 - Acquisition intra-communautaires et ventes ABC</field>
-            <field name="code">c86</field>
-            <field name="tag_name">86</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">6</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_87" model="account.tax.report.line">
-            <field name="name">87 - Autres opérations</field>
-            <field name="code">c87</field>
-            <field name="tag_name">87</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">7</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_line_88" model="account.tax.report.line">
-            <field name="name">88 - Acquisition services intra-communautaires</field>
-            <field name="code">c88</field>
-            <field name="tag_name">88</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">8</field>
-            <field name="parent_id" ref="tax_report_title_operations_entree"/>
-        </record>
-
-        <record id="tax_report_title_taxes" model="account.tax.report.line">
-            <field name="name">Taxes</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_title_taxes_dues" model="account.tax.report.line">
-            <field name="name">IV Dues</field>
-            <field name="code">tax_be_iv</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_taxes"/>
-        </record>
-
-        <record id="tax_report_line_54" model="account.tax.report.line">
-            <field name="name">54 - TVA sur opérations des grilles [01], [02], [03]</field>
-            <field name="code">c54</field>
-            <field name="tag_name">54</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_taxes_dues"/>
-        </record>
-
-        <record id="tax_report_line_55" model="account.tax.report.line">
-            <field name="name">55 - TVA sur opérations des grilles [86] et [88]</field>
-            <field name="code">c55</field>
-            <field name="tag_name">55</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_taxes_dues"/>
-        </record>
-
-        <record id="tax_report_line_56" model="account.tax.report.line">
-            <field name="name">56 - TVA sur opérations de la grille [87]</field>
-            <field name="code">c56</field>
-            <field name="tag_name">56</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">3</field>
-            <field name="parent_id" ref="tax_report_title_taxes_dues"/>
-        </record>
-
-        <record id="tax_report_line_57" model="account.tax.report.line">
-            <field name="name">57 - TVA relatives aux importations</field>
-            <field name="code">c57</field>
-            <field name="tag_name">57</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">4</field>
-            <field name="parent_id" ref="tax_report_title_taxes_dues"/>
-        </record>
-
-        <record id="tax_report_line_61" model="account.tax.report.line">
-            <field name="name">61 - Diverses régularisations en faveur de l'Etat</field>
-            <field name="code">c61</field>
-            <field name="tag_name">61</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">5</field>
-            <field name="parent_id" ref="tax_report_title_taxes_dues"/>
-        </record>
-
-        <record id="tax_report_line_63" model="account.tax.report.line">
-            <field name="name">63 - TVA à reverser sur notes de crédit recues</field>
-            <field name="code">c63</field>
-            <field name="tag_name">63</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">6</field>
-            <field name="parent_id" ref="tax_report_title_taxes_dues"/>
-        </record>
-
-        <record id="tax_report_title_taxes_deductibles" model="account.tax.report.line">
-            <field name="name">V Déductibles</field>
-            <field name="code">tax_be_v</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_taxes"/>
-        </record>
-
-        <record id="tax_report_line_59" model="account.tax.report.line">
-            <field name="name">59 - TVA déductible</field>
-            <field name="code">c59</field>
-            <field name="tag_name">59</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_taxes_deductibles"/>
-        </record>
-
-        <record id="tax_report_line_62" model="account.tax.report.line">
-            <field name="name">62 - Diverses régularisations en faveur du déclarant</field>
-            <field name="code">c62</field>
-            <field name="tag_name">62</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_taxes_deductibles"/>
-        </record>
-
-        <record id="tax_report_line_64" model="account.tax.report.line">
-            <field name="name">64 - TVA à récupérer sur notes de crédit delivrées</field>
-            <field name="code">c64</field>
-            <field name="tag_name">64</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">3</field>
-            <field name="parent_id" ref="tax_report_title_taxes_deductibles"/>
-        </record>
-
-        <record id="tax_report_title_taxes_soldes" model="account.tax.report.line">
-            <field name="name">VI Soldes</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">3</field>
-            <field name="parent_id" ref="tax_report_title_taxes"/>
-        </record>
-
-        <record id="tax_report_line_71" model="account.tax.report.line">
-            <field name="name">71 - Taxes dues à l'état</field>
-            <field name="formula">tax_be_iv&gt;tax_be_v and tax_be_iv-tax_be_v or 0</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">1</field>
-            <field name="parent_id" ref="tax_report_title_taxes_soldes"/>
-        </record>
-
-        <record id="tax_report_line_72" model="account.tax.report.line">
-            <field name="name">72 - Somme due par l'état</field>
-            <field name="formula">tax_be_iv&lt;tax_be_v and tax_be_v-tax_be_iv or 0</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="sequence">2</field>
-            <field name="parent_id" ref="tax_report_title_taxes_soldes"/>
-        </record>
-
-    </data>
+    <record id="tax_report_vat" model="account.tax.report">
+        <field name="name">VAT Report</field>
+        <field name="country_id" ref="base.be"/>
+    </record>
+
+    <record id="tax_report_title_operations" model="account.tax.report.line">
+        <field name="name">Opérations</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_title_operations_sortie" model="account.tax.report.line">
+        <field name="name">II A la sortie</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_00" model="account.tax.report.line">
+        <field name="name">00 - Opérations soumises à un régime particulier</field>
+        <field name="code">c00</field>
+        <field name="tag_name">00</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_01" model="account.tax.report.line">
+        <field name="name">01 - Opérations avec TVA à 6%</field>
+        <field name="code">c01</field>
+        <field name="tag_name">01</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_02" model="account.tax.report.line">
+        <field name="name">02 - Opérations avec TVA à 12%</field>
+        <field name="code">c02</field>
+        <field name="tag_name">02</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_line_03" model="account.tax.report.line">
+        <field name="name">03 - Opérations avec TVA à 21%</field>
+        <field name="code">c03</field>
+        <field name="tag_name">03</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_line_44" model="account.tax.report.line">
+        <field name="name">44 - Services intra-communautaires</field>
+        <field name="code">c44</field>
+        <field name="tag_name">44</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_line_45" model="account.tax.report.line">
+        <field name="name">45 - Opérations avec TVA due par le cocontractant</field>
+        <field name="code">c45</field>
+        <field name="tag_name">45</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_title_operations_sortie_46" model="account.tax.report.line">
+        <field name="name">46 - Livraisons intra-communautaires exemptées</field>
+        <field name="code">c46</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_line_46L" model="account.tax.report.line">
+        <field name="name">46L - Livraisons biens intra-communautaires exemptées</field>
+        <field name="tag_name">46L</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie_46"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_46T" model="account.tax.report.line">
+        <field name="name">46T - Livraisons biens intra-communautaire exemptées</field>
+        <field name="tag_name">46T</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie_46"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_47" model="account.tax.report.line">
+        <field name="name">47 - Autres opérations exemptées</field>
+        <field name="code">c47</field>
+        <field name="tag_name">47</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_title_operations_sortie_48" model="account.tax.report.line">
+        <field name="name">48 - Notes de crédit aux opérations grilles [44] et [46]</field>
+        <field name="code">c48</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">9</field>
+    </record>
+
+    <record id="tax_report_line_48s44" model="account.tax.report.line">
+        <field name="name">48s44 - Notes de crédit aux opérations grilles [44]</field>
+        <field name="tag_name">48s44</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie_48"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_48s46L" model="account.tax.report.line">
+        <field name="name">48s46L - Notes de crédit aux opérations grilles [46L]</field>
+        <field name="tag_name">48s46L</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie_48"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_48s46T" model="account.tax.report.line">
+        <field name="name">48s46T - Notes de crédit aux opérations grilles [46T]</field>
+        <field name="tag_name">48s46T</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie_48"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_line_49" model="account.tax.report.line">
+        <field name="name">49 - Notes de crédit aux opérations du point II</field>
+        <field name="code">c49</field>
+        <field name="tag_name">49</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_sortie"/>
+        <field name="sequence">10</field>
+    </record>
+
+    <record id="tax_report_title_operations_entree" model="account.tax.report.line">
+        <field name="name">III A l'entrée</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_81" model="account.tax.report.line">
+        <field name="name">81 - Marchandises, matières premières et auxiliaires</field>
+        <field name="code">c81</field>
+        <field name="tag_name">81</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_82" model="account.tax.report.line">
+        <field name="name">82 - Services et biens divers</field>
+        <field name="code">c82</field>
+        <field name="tag_name">82</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_83" model="account.tax.report.line">
+        <field name="name">83 - Biens d'investissement</field>
+        <field name="code">c83</field>
+        <field name="tag_name">83</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_line_84" model="account.tax.report.line">
+        <field name="name">84 - Notes de crédits sur opérations case [86] et [88]</field>
+        <field name="code">c84</field>
+        <field name="tag_name">84</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_line_85" model="account.tax.report.line">
+        <field name="name">85 - Notes de crédits autres opérations</field>
+        <field name="code">c85</field>
+        <field name="tag_name">85</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_line_86" model="account.tax.report.line">
+        <field name="name">86 - Acquisition intra-communautaires et ventes ABC</field>
+        <field name="code">c86</field>
+        <field name="tag_name">86</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_line_87" model="account.tax.report.line">
+        <field name="name">87 - Autres opérations</field>
+        <field name="code">c87</field>
+        <field name="tag_name">87</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_line_88" model="account.tax.report.line">
+        <field name="name">88 - Acquisition services intra-communautaires</field>
+        <field name="code">c88</field>
+        <field name="tag_name">88</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_operations_entree"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_title_taxes" model="account.tax.report.line">
+        <field name="name">Taxes</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_title_taxes_dues" model="account.tax.report.line">
+        <field name="name">IV Dues</field>
+        <field name="code">tax_be_iv</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_54" model="account.tax.report.line">
+        <field name="name">54 - TVA sur opérations des grilles [01], [02], [03]</field>
+        <field name="code">c54</field>
+        <field name="tag_name">54</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_dues"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_55" model="account.tax.report.line">
+        <field name="name">55 - TVA sur opérations des grilles [86] et [88]</field>
+        <field name="code">c55</field>
+        <field name="tag_name">55</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_dues"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_56" model="account.tax.report.line">
+        <field name="name">56 - TVA sur opérations de la grille [87]</field>
+        <field name="code">c56</field>
+        <field name="tag_name">56</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_dues"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_line_57" model="account.tax.report.line">
+        <field name="name">57 - TVA relatives aux importations</field>
+        <field name="code">c57</field>
+        <field name="tag_name">57</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_dues"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_line_61" model="account.tax.report.line">
+        <field name="name">61 - Diverses régularisations en faveur de l'Etat</field>
+        <field name="code">c61</field>
+        <field name="tag_name">61</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_dues"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_line_63" model="account.tax.report.line">
+        <field name="name">63 - TVA à reverser sur notes de crédit recues</field>
+        <field name="code">c63</field>
+        <field name="tag_name">63</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_dues"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_title_taxes_deductibles" model="account.tax.report.line">
+        <field name="name">V Déductibles</field>
+        <field name="code">tax_be_v</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_59" model="account.tax.report.line">
+        <field name="name">59 - TVA déductible</field>
+        <field name="code">c59</field>
+        <field name="tag_name">59</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_deductibles"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_62" model="account.tax.report.line">
+        <field name="name">62 - Diverses régularisations en faveur du déclarant</field>
+        <field name="code">c62</field>
+        <field name="tag_name">62</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_deductibles"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_line_64" model="account.tax.report.line">
+        <field name="name">64 - TVA à récupérer sur notes de crédit delivrées</field>
+        <field name="code">c64</field>
+        <field name="tag_name">64</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_deductibles"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_title_taxes_soldes" model="account.tax.report.line">
+        <field name="name">VI Soldes</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_line_71" model="account.tax.report.line">
+        <field name="name">71 - Taxes dues à l'état</field>
+        <field name="formula">tax_be_iv&gt;tax_be_v and tax_be_iv-tax_be_v or 0</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_soldes"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_line_72" model="account.tax.report.line">
+        <field name="name">72 - Somme due par l'état</field>
+        <field name="formula">tax_be_iv&lt;tax_be_v and tax_be_v-tax_be_iv or 0</field>
+        <field name="report_id" ref="tax_report_vat"/>
+        <field name="parent_id" ref="tax_report_title_taxes_soldes"/>
+        <field name="sequence">2</field>
+    </record>
+
 </odoo>
diff --git a/addons/l10n_bo/data/account_tax_report_data.xml b/addons/l10n_bo/data/account_tax_report_data.xml
index 1bc63b645050bdb3965bb5fdf4fc34b97ca404e1..e3d00e05012acadf18346852ea116fd6ea734cb0 100644
--- a/addons/l10n_bo/data/account_tax_report_data.xml
+++ b/addons/l10n_bo/data/account_tax_report_data.xml
@@ -1,152 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+    </record>
+
 	<record id="tax_report_impuesto_25" model="account.tax.report.line">
         <field name="name">Impuesto a las Utilidades de la Empresa IUE (25%)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_trans" model="account.tax.report.line">
         <field name="name">Impuesto a las Transacciones IT (3%)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_trans_3" model="account.tax.report.line">
         <field name="name">Impuesto a las Transacciones IT (3%)</field>
         <field name="tag_name">Impuesto a las Transacciones IT (3%)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_impuesto_trans"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl" model="account.tax.report.line">
         <field name="name">Impuesto al Valor Agregado (IVA) Total a Pagar</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_cob" model="account.tax.report.line">
         <field name="name">Impuesto Cobrado</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_cob_fuera" model="account.tax.report.line">
         <field name="name">Impuesto Cobrado Fuera de Ámbito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl_cob"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_cob_exon" model="account.tax.report.line">
         <field name="name">Impuesto Cobrado de Exonerados al IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl_cob"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_cob_iva" model="account.tax.report.line">
         <field name="name">Impuesto Cobrado IVA</field>
         <field name="tag_name">Impuesto Cobrado IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl_cob"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_pag" model="account.tax.report.line">
         <field name="name">Impuesto Pagado</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_pag_fuera" model="account.tax.report.line">
         <field name="name">Impuesto Pagado Fuera de Ámbito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl_pag"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_pag_exon" model="account.tax.report.line">
         <field name="name">Impuesto Pagado de Exonerados al IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl_pag"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_impuesto_ttl_pag_iva" model="account.tax.report.line">
         <field name="name">Impuesto Pagado IVA</field>
         <field name="tag_name">Impuesto Pagado IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_impuesto_ttl_pag"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible" model="account.tax.report.line">
         <field name="name">Base Imponible</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_compras" model="account.tax.report.line">
         <field name="name">Base Imponible - Compras</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_base_imponible"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_compras_fuera" model="account.tax.report.line">
         <field name="name">Compras Gravadas Fuera de Ámbito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_base_imponible_compras"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_compras_gravadas" model="account.tax.report.line">
         <field name="name">Compras NO Gravadas (Exoneradas)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_base_imponible_compras"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_compras_iva" model="account.tax.report.line">
         <field name="name">Compras Gravadas con IVA</field>
         <field name="tag_name">Compras Gravadas con IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_base_imponible_compras"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_venras" model="account.tax.report.line">
         <field name="name">Base Imponible - Ventas</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_base_imponible"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_venras_fuera" model="account.tax.report.line">
         <field name="name">Ventas Gravadas Fuera de Ámbito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_base_imponible_venras"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_venras_exon" model="account.tax.report.line">
         <field name="name">Ventas NO Gravadas (Exoneradas)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_base_imponible_venras"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
     <record id="tax_report_base_imponible_venras_iva" model="account.tax.report.line">
         <field name="name">Impuesto al Valor Agregado con IVA</field>
         <field name="tag_name">Impuesto al Valor Agregado con IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_base_imponible_venras"/>
-        <field name="country_id" ref="base.bo"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_br/data/account_tax_report_data.xml b/addons/l10n_br/data/account_tax_report_data.xml
index b46c3a3a54fea898666aad136bea878dd84e27b3..fc2255eb9b6d86789797ad1e790990fa26b3f824 100644
--- a/addons/l10n_br/data/account_tax_report_data.xml
+++ b/addons/l10n_br/data/account_tax_report_data.xml
@@ -1,910 +1,916 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.br"/>
+    </record>
+
     <record id="tax_report_icmsst" model="account.tax.report.line">
         <field name="name">ICMSST</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icmsst_1" model="account.tax.report.line">
         <field name="name">ICMSST_1</field>
         <field name="tag_name">ICMSST_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_icmsst"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icmsst_2" model="account.tax.report.line">
         <field name="name">ICMSST_2</field>
         <field name="tag_name">ICMSST_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_icmsst"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_irpj" model="account.tax.report.line">
         <field name="name">IRPJ</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_irpj_1" model="account.tax.report.line">
         <field name="name">IRPJ_1</field>
         <field name="tag_name">IRPJ_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_irpj"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_irpj_2" model="account.tax.report.line">
         <field name="name">IRPJ_2</field>
         <field name="tag_name">IRPJ_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_irpj"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ir" model="account.tax.report.line">
         <field name="name">IR</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ir_1" model="account.tax.report.line">
         <field name="name">IR_1</field>
         <field name="tag_name">IR_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ir"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ir_2" model="account.tax.report.line">
         <field name="name">IR_2</field>
         <field name="tag_name">IR_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_ir"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_issqn" model="account.tax.report.line">
         <field name="name">ISSQN</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_issqn_1" model="account.tax.report.line">
         <field name="name">ISSQN_1</field>
         <field name="tag_name">ISSQN_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_issqn"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_issqn_2" model="account.tax.report.line">
         <field name="name">ISSQN_2</field>
         <field name="tag_name">ISSQN_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_issqn"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
 
     <record id="tax_report_csll" model="account.tax.report.line">
         <field name="name">CSLL</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_csll_1" model="account.tax.report.line">
         <field name="name">CSLL_1</field>
         <field name="tag_name">CSLL_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_csll"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_csll_2" model="account.tax.report.line">
         <field name="name">CSLL_2</field>
         <field name="tag_name">CSLL_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_csll"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins" model="account.tax.report.line">
         <field name="name">COFINS</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_bas" model="account.tax.report.line">
         <field name="name">Operação Tributável com Alíquota Básica</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_1" model="account.tax.report.line">
         <field name="name">COFINS_1</field>
         <field name="tag_name">COFINS_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_cofins_oper_bas"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_2" model="account.tax.report.line">
         <field name="name">COFINS_2</field>
         <field name="tag_name">COFINS_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_cofins_oper_bas"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_dif" model="account.tax.report.line">
         <field name="name">Operação Tributável com Alíquota Diferenciada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_uni" model="account.tax.report.line">
         <field name="name">Operação Tributável com Alíquota por Unidade de Medida de Produto</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_line12" model="account.tax.report.line">
         <field name="name">Operação Tributável Monofásica - Revenda a Alíquota Zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_sub" model="account.tax.report.line">
         <field name="name">Operação Tributável por Substituição Tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_tri" model="account.tax.report.line">
         <field name="name">Operação Tributável a Alíquota zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_isenta" model="account.tax.report.line">
         <field name="name">Operação Isenta da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_sem" model="account.tax.report.line">
         <field name="name">Operação sem Incidência da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_com" model="account.tax.report.line">
         <field name="name">Operação com Suspensão da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_outras_oper_saida" model="account.tax.report.line">
         <field name="name">Outras Operações de Saída</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_mercado" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_no_mercado" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Não-Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_receita" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="13"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_nao_tri" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="14"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_oper_export" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas no Mercado Interno e de Exportação </field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="15"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_interno_export" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Não Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="16"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_no_marcado_interno_export" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="17"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_oper_no_marcado" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="18"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_oper_tri" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Não-Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="19"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_oper_export" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="20"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_oper_nao_tributadas" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="21"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_oper_tributadas" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="22"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_nao_oper_tributadas" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Não-Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="23"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_oper_receitas" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="24"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_credito_outras_oper" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Outras Operações</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="25"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_aqui_sem" model="account.tax.report.line">
         <field name="name">Operação de Aquisição sem Direito a Crédito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="26"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_aqui_com" model="account.tax.report.line">
         <field name="name">Operação de Aquisição com Isenção</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="27"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_aqui_com_sus" model="account.tax.report.line">
         <field name="name">Operação de Aquisição com Suspensão</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="28"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_aqui_zero" model="account.tax.report.line">
         <field name="name">Operação de Aquisição a Alíquota Zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="29"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_aqui_contri" model="account.tax.report.line">
         <field name="name">Operação de Aquisição sem Incidência da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="30"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_oper_aqui_sub" model="account.tax.report.line">
         <field name="name">Operação de Aquisição por Substituição Tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="31"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_outras_oper_entrada" model="account.tax.report.line">
         <field name="name">Outras Operações de Entrada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="32"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_cofins_outras_oper" model="account.tax.report.line">
         <field name="name">Outras Operações</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="33"/>
         <field name="parent_id" ref="tax_report_cofins"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis" model="account.tax.report.line">
         <field name="name">PIS</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_tri_basica" model="account.tax.report.line">
         <field name="name">Operação Tributável com Alíquota Básica</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_1" model="account.tax.report.line">
         <field name="name">PIS_1</field>
         <field name="tag_name">PIS_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_pis_oper_tri_basica"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_2" model="account.tax.report.line">
         <field name="name">PIS_2</field>
         <field name="tag_name">PIS_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_pis_oper_tri_basica"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_tri_diferenciada" model="account.tax.report.line">
         <field name="name">Operação Tributável com Alíquota Diferenciada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_tri_produto" model="account.tax.report.line">
         <field name="name">Operação Tributável com Alíquota por Unidade de Medida de Produto</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_tri_zero" model="account.tax.report.line">
         <field name="name">Operação Tributável Monofásica - Revenda a Alíquota Zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_tri_sub" model="account.tax.report.line">
         <field name="name">Operação Tributável por Substituição Tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_tri_ali_zero" model="account.tax.report.line">
         <field name="name">Operação Tributável a Alíquota Zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_isenta" model="account.tax.report.line">
         <field name="name">Operação Isenta da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_sem" model="account.tax.report.line">
         <field name="name">Operação sem Incidência da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com" model="account.tax.report.line">
         <field name="name">Operação com Suspensão da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_outras_oper_saida" model="account.tax.report.line">
         <field name="name">Outras Operações de Saída</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_direito" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_credito" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita Não Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_vinculada_ex" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada Exclusivamente a Receita de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="13"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_vinculada_rec" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="14"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_export" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="15"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_nao_tri" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Não-Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="16"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_tri_" model="account.tax.report.line">
         <field name="name">Operação com Direito a Crédito - Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno, e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="17"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_tributada" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="18"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_nao_tributada" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita Não-Tributada no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="19"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_export" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada Exclusivamente a Receita de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="20"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_interno" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="21"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_interno_export" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="22"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_oper_nao_tri" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Não-Tributadas no Mercado Interno e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="23"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_oper_tri" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Operação de Aquisição Vinculada a Receitas Tributadas e Não-Tributadas no Mercado Interno, e de Exportação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="24"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_credito_presumido_outras_oper" model="account.tax.report.line">
         <field name="name">Crédito Presumido - Outras Operações</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="25"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_aqui_sem" model="account.tax.report.line">
         <field name="name">Operação de Aquisição sem Direito a Crédito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="26"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_com_ise" model="account.tax.report.line">
         <field name="name">Operação de Aquisição com Isenção</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="27"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_aqui_com" model="account.tax.report.line">
         <field name="name">Operação de Aquisição com Suspensão</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="28"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_aqui_zero" model="account.tax.report.line">
         <field name="name">Operação de Aquisição a Alíquota Zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="29"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_aqui_inc" model="account.tax.report.line">
         <field name="name">Operação de Aquisição sem Incidência da Contribuição</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="30"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_oper_aqui_sub" model="account.tax.report.line">
         <field name="name">Operação de Aquisição por Substituição Tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="31"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_outras_oper_entrada" model="account.tax.report.line">
         <field name="name">Outras Operações de Entrada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="32"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_pis_outras_oper" model="account.tax.report.line">
         <field name="name">Outras Operações</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="33"/>
         <field name="parent_id" ref="tax_report_pis"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi" model="account.tax.report.line">
         <field name="name">IPI</field>
         <field name="code">BRTAX07</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_extrada_com" model="account.tax.report.line">
         <field name="name">Entrada com recuperação de crédito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_1" model="account.tax.report.line">
         <field name="name">IPI_1</field>
         <field name="tag_name">IPI_1</field>
         <field name="code">BRTAX07_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ipi_extrada_com"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_extrada_tributada" model="account.tax.report.line">
         <field name="name">Entrada tributada com alíquota zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_2" model="account.tax.report.line">
         <field name="name">IPI_2</field>
         <field name="tag_name">IPI_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ipi_extrada_tributada"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_entrada_isenta" model="account.tax.report.line">
         <field name="name">Entrada isenta</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_entrada_nao_tributada" model="account.tax.report.line">
         <field name="name">EEntrada não-tributada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_entrada_imune" model="account.tax.report.line">
         <field name="name">Entrada imune</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_entrada_com_suspensao" model="account.tax.report.line">
         <field name="name">Entrada com suspensão</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_outras_entradas" model="account.tax.report.line">
         <field name="name">Outras entradas</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_saida_tributada" model="account.tax.report.line">
         <field name="name">Saída tributada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_saida_tributada_com" model="account.tax.report.line">
         <field name="name">Saída tributada com alíquota zero</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_saida_isenta" model="account.tax.report.line">
         <field name="name">Saída isenta</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_saida_nao_tributada" model="account.tax.report.line">
         <field name="name">Saída não-tributada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_saida_imune" model="account.tax.report.line">
         <field name="name">Saída imune</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_saida_com" model="account.tax.report.line">
         <field name="name">Saída com suspensão</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="13"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_ipi_outras_saidas" model="account.tax.report.line">
         <field name="name">Outras saídas</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="14"/>
         <field name="parent_id" ref="tax_report_ipi"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms" model="account.tax.report.line">
         <field name="name">ICMS</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_tributada" model="account.tax.report.line">
         <field name="name">Tributada integralmente</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_1" model="account.tax.report.line">
         <field name="name">ICMS_1</field>
         <field name="tag_name">ICMS_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_icms_tributada"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_tributada_com" model="account.tax.report.line">
         <field name="name">Tributada e com cobrança do ICMS por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_2" model="account.tax.report.line">
         <field name="name">ICMS_2</field>
         <field name="tag_name">ICMS_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_icms_tributada_com"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_com_red" model="account.tax.report.line">
         <field name="name">Com redução de base de cálculo</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_isenta_tributada" model="account.tax.report.line">
         <field name="name">Isenta ou não tributada e com cobrança do ICMS por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_isenta" model="account.tax.report.line">
         <field name="name">Isenta</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
      <record id="tax_report_icms_nao_tributada" model="account.tax.report.line">
         <field name="name">Não tributada</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_suspensao" model="account.tax.report.line">
         <field name="name">Suspensão</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
      <record id="tax_report_icms_diferimento" model="account.tax.report.line">
         <field name="name">Diferimento</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_cobrado" model="account.tax.report.line">
         <field name="name">ICMS cobrado anteriormente por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_reducao" model="account.tax.report.line">
         <field name="name">Com redução de base de cálculo e cobrança do ICMS por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_outras" model="account.tax.report.line">
         <field name="name">Outras</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_com" model="account.tax.report.line">
         <field name="name">Simples Nacional - Tributada pelo Simples Nacional com permissão de crédito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_sem" model="account.tax.report.line">
         <field name="name">Simples Nacional - Tributada pelo Simples Nacional sem permissão de crédito</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="13"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_isencao" model="account.tax.report.line">
         <field name="name">Simples Nacional - Isenção do ICMS no Simples Nacional para faixa de receita bruta</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="14"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_tributada" model="account.tax.report.line">
         <field name="name">Simples Nacional - Tributada pelo Simples Nacional com permissão de crédito e com cobrança do ICMS por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="15"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_tributada_pelo" model="account.tax.report.line">
         <field name="name">Simples Nacional - Tributada pelo Simples Nacional sem permissão de crédito e com cobrança do ICMS por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="16"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_isencao_icms" model="account.tax.report.line">
         <field name="name">Simples Nacional - Isenção do ICMS no Simples Nacional para faixa de receita bruta e com cobrança do ICMS por substituição tributária</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="17"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_imune" model="account.tax.report.line">
         <field name="name">Simples Nacional - Imune</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="18"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_nao_tributada" model="account.tax.report.line">
         <field name="name">Simples Nacional - Não tributada pelo Simples Nacional</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="19"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_icms" model="account.tax.report.line">
         <field name="name">Simples Nacional - ICMS cobrado anteriormente por substituição tributária (substituído) ou por antecipação</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="20"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 
     <record id="tax_report_icms_simples_nacional_outras" model="account.tax.report.line">
         <field name="name">Simples Nacional - Outros</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="21"/>
         <field name="parent_id" ref="tax_report_icms"/>
-        <field name="country_id" ref="base.br"/>
     </record>
 </odoo>
diff --git a/addons/l10n_ch/data/account_tax_report_data.xml b/addons/l10n_ch/data/account_tax_report_data.xml
index 12755db21b158c7fbf1a5c39d5733b3d3ef024f5..dc4d95644f7e224802297ed2ac63d958cd5b8a2d 100644
--- a/addons/l10n_ch/data/account_tax_report_data.xml
+++ b/addons/l10n_ch/data/account_tax_report_data.xml
@@ -1,267 +1,272 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.br"/>
+    </record>
+
     <record id="account_tax_report_line_chiffre_af" model="account.tax.report.line">
         <field name="name">I - CHIFFRE D'AFFAIRES</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_200" model="account.tax.report.line">
         <field name="name">200 Chiffre d'affaires</field>
         <field name="formula">tax_ch_302a + tax_ch_312a + tax_ch_342a + tax_ch_289</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_chiffre_af"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_289" model="account.tax.report.line">
         <field name="name">289 Déductions (ch.220 à ch.280)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="code">tax_ch_289</field>
         <field name="parent_id" ref="account_tax_report_line_chiffre_af"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_220_289" model="account.tax.report.line">
         <field name="name">220 Chiffre d'affaires imposable a 0% (export)</field>
         <field name="tag_name">220 Chiffre d'affaires imposable a 0% (export)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_289"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_221" model="account.tax.report.line">
         <field name="name">221 Prestations fournies à l'étranger</field>
         <field name="tag_name">221 Prestations fournies à l'étranger</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_289"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_225" model="account.tax.report.line">
         <field name="name">225 Transfer avec la procédure de déclaration</field>
         <field name="tag_name">225 Transfer avec la procédure de déclaration</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_289"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_230" model="account.tax.report.line">
         <field name="name">230 Chiffre d'affaires non-imposable a 0% (exclu)</field>
         <field name="tag_name">230 Chiffre d'affaires non-imposable a 0% (exclu)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_289"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_235" model="account.tax.report.line">
         <field name="name">235 Diminution de la contre-prestation</field>
         <field name="tag_name">235 Diminution de la contre-prestation</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_289"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_280" model="account.tax.report.line">
         <field name="name">280 Divers (p.ex valeur du terrain)</field>
         <field name="tag_name">280 Divers (p.ex valeur du terrain)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_289"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_299" model="account.tax.report.line">
         <field name="name">299 Chiffre d'affaires imposable (ch.200 moins ch.289)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="formula">tax_ch_302a + tax_ch_312a + tax_ch_342a</field>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_calc_impot" model="account.tax.report.line">
         <field name="name">II - CALCUL DE L'IMPOT</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_calc_impot_chiffre" model="account.tax.report.line">
         <field name="name">Chiffre d'affaires imposable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_302a" model="account.tax.report.line">
         <field name="name">302a Chiffre d'affaires imposable a 7.7% (TS)</field>
         <field name="tag_name">302a Chiffre d'affaires imposable a 7.7% (TS)</field>
         <field name="code">tax_ch_302a</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot_chiffre"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_312a" model="account.tax.report.line">
         <field name="name">312a Chiffre d'affaires imposable a 2.5% (TR)</field>
         <field name="tag_name">312a Chiffre d'affaires imposable a 2.5% (TR)</field>
         <field name="code">tax_ch_312a</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot_chiffre"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_342a" model="account.tax.report.line">
         <field name="name">342a Chiffre d'affaires imposable a 3.7% (TS)</field>
         <field name="tag_name">342a Chiffre d'affaires imposable a 3.7% (TS)</field>
         <field name="code">tax_ch_342a</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot_chiffre"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_calc_impot_base" model="account.tax.report.line">
         <field name="name">Base Impôt sur acquisitions de services</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_381a" model="account.tax.report.line">
         <field name="name">381a Impots sur les acquisitions</field>
         <field name="tag_name">381a Impots sur les acquisitions</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot_base"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_382a" model="account.tax.report.line">
         <field name="name">382a Impots sur les acquisitions</field>
         <field name="tag_name">382a Impots sur les acquisitions</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot_base"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_399" model="account.tax.report.line">
         <field name="name">399 TVA Due </field>
         <field name="code">tax_ch_399</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_calc_impot"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_302b" model="account.tax.report.line">
         <field name="name">302b TVA due a 7.7% (TS)</field>
         <field name="tag_name">302b TVA due a 7.7% (TS)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_399"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_312b" model="account.tax.report.line">
         <field name="name">312b TVA due a 2.5% (TR)</field>
         <field name="tag_name">312b TVA due a 2.5% (TR)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_399"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_342b" model="account.tax.report.line">
         <field name="name">342b TVA due a 3.7% (TS)</field>
         <field name="tag_name">342b TVA due a 3.7% (TS)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_399"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_381b" model="account.tax.report.line">
         <field name="name">381b Impots sur les acquisitions </field>
         <field name="tag_name">381b Impots sur les acquisitions </field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_399"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_382b" model="account.tax.report.line">
         <field name="name">382b Impots sur les acquisitions </field>
         <field name="tag_name">382b Impots sur les acquisitions </field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_399"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_479" model="account.tax.report.line">
         <field name="name">479 TVA préalable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="code">tax_ch_479</field>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_400" model="account.tax.report.line">
         <field name="name">400 TVA préalable sur biens et services</field>
         <field name="tag_name">400 TVA préalable sur biens et services</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_479"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_405" model="account.tax.report.line">
         <field name="name">405 TVA préalable sur invest. et autres ch.</field>
         <field name="tag_name">405 TVA préalable sur invest. et autres ch.</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_479"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_410" model="account.tax.report.line">
         <field name="name">410 Dégrèvement ultérieur de l'impot préalable</field>
         <field name="tag_name">410 Dégrèvement ultérieur de l'impot préalable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_479"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_415" model="account.tax.report.line">
         <field name="name">415 Correction de l'impot préalable</field>
         <field name="tag_name">415 Correction de l'impot préalable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_479"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_420" model="account.tax.report.line">
         <field name="name">420 Réduction de la déduction de l'impot préalable</field>
         <field name="tag_name">420 Réduction de la déduction de l'impot préalable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_479"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_solde" model="account.tax.report.line">
         <field name="name">SOLDE</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_500" model="account.tax.report.line">
         <field name="name">500 Solde de TVA a payer a l'AFC</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="formula">tax_ch_399 - tax_ch_479 &gt; 0 and tax_ch_399 - tax_ch_479 or 0.0</field>
         <field name="parent_id" ref="account_tax_report_line_chtax_solde"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_510" model="account.tax.report.line">
         <field name="name">510 Solde de TVA a recevoir de l'AFC</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="formula">tax_ch_479 - tax_ch_399 &gt; 0 and tax_ch_479 - tax_ch_399 or 0.0</field>
         <field name="parent_id" ref="account_tax_report_line_chtax_solde"/>
-        <field name="country_id" ref="base.ch"/>
     </record>
 
     <record id="account_tax_report_line_chtax_autres_mouv" model="account.tax.report.line">
         <field name="name">AUTRES MOUVEMENTS DE FONDS</field>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ch"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_chtax_900" model="account.tax.report.line">
@@ -269,7 +274,7 @@
         <field name="tag_name">900 Subventions, taxes touristiques</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_autres_mouv"/>
-        <field name="country_id" ref="base.ch"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_chtax_910" model="account.tax.report.line">
@@ -277,6 +282,6 @@
         <field name="tag_name">910 Les dons, les dividendes, les dédommagements, ...</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_chtax_autres_mouv"/>
-        <field name="country_id" ref="base.ch"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 </odoo>
diff --git a/addons/l10n_cl/data/account_tax_report_data.xml b/addons/l10n_cl/data/account_tax_report_data.xml
index 5c76c5ccb8c0227e546da9ee18f409e91b262019..2753a57354c2993f4e77ed875ae96c0254d5f671 100644
--- a/addons/l10n_cl/data/account_tax_report_data.xml
+++ b/addons/l10n_cl/data/account_tax_report_data.xml
@@ -1,182 +1,186 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.cl"/>
+    </record>
+
     <record id="tax_report_base_imponible_ventas" model="account.tax.report.line">
         <field name="name">Base Imponible Ventas</field>
         <field name="tag_name">Base Imponible Ventas</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_ventas_netas_gravadas_c_iva" model="account.tax.report.line">
         <field name="name">Ventas Netas Gravadas con IVA</field>
         <field name="tag_name">Ventas Netas Gravadas con IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_ventas_exentas" model="account.tax.report.line">
         <field name="name">Ventas Exentas</field>
         <field name="tag_name">Ventas Exentas</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_base_imponible_ventas"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_impuestos_renta" model="account.tax.report.line">
         <field name="name">Impuesto a la Renta Primera Categoría a Pagar</field>
         <field name="tag_name">Impuesto a la Renta Primera Categoría a Pagar</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_base_imponible_ventas"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_impuestos_originados_venta" model="account.tax.report.line">
         <field name="name">Impuesto Originado por la Venta</field>
         <field name="tag_name">Impuesto Originado por la Venta</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_iva_debito_fiscal" model="account.tax.report.line">
         <field name="name">IVA Debito Fiscal</field>
         <field name="tag_name">IVA Debito Fiscal</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_ppm" model="account.tax.report.line">
         <field name="name">PPM</field>
         <field name="tag_name">PPM</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_netas_gr_iva_recup" model="account.tax.report.line">
         <field name="name">Compras Netas Gravadas Con IVA (recuperable)</field>
         <field name="tag_name">Compras Netas Gravadas Con IVA (recuperable)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_netas_gr_iva_uso_comun" model="account.tax.report.line">
         <field name="name">Compra Netas Gravadas Con IVA Uso Comun</field>
         <field name="tag_name">Compra Netas Gravadas Con IVA Uso Comun</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_netas_gr_iva_no_recuperable" model="account.tax.report.line">
         <field name="name">Compras IVA No Recuperable</field>
         <field name="tag_name">Compras IVA No Recuperable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_supermercado" model="account.tax.report.line">
         <field name="name">Compras De Supermercado</field>
         <field name="tag_name">Compras De Supermercado</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_activo_fijo" model="account.tax.report.line">
         <field name="name">Compras de Activo Fijo</field>
         <field name="tag_name">Compras de Activo Fijo</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_activo_fijo_uso_comun" model="account.tax.report.line">
         <field name="name">Compras de Activo Fijo Uso Común</field>
         <field name="tag_name">Compras de Activo Fijo Uso Común</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_activo_fijo_no_recup" model="account.tax.report.line">
         <field name="name">Compras de Activo Fijo No Recuperable</field>
         <field name="tag_name">Compras de Activo Fijo No Recuperable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_no_gravadas_iva" model="account.tax.report.line">
         <field name="name">Compras No Gravadas Con IVA</field>
         <field name="tag_name">Compras No Gravadas Con IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_impuestos_pagados_compra" model="account.tax.report.line">
         <field name="name">Impuestos Pagados en la Compra</field>
         <field name="tag_name">Impuestos Pagados en la Compra</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_recup" model="account.tax.report.line">
         <field name="name">IVA Pagado Compras Recuperables</field>
         <field name="tag_name">IVA Pagado Compras Recuperables</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_uso_comun" model="account.tax.report.line">
         <field name="name">IVA Pagado Compras Uso Común</field>
         <field name="tag_name">IVA Pagado Compras Uso Común</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_no_recup" model="account.tax.report.line">
         <field name="name">IVA Pagado No Recuperable</field>
         <field name="tag_name">IVA Pagado No Recuperable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_supermercado" model="account.tax.report.line">
         <field name="name">IVA Pagado Compras Supermercado</field>
         <field name="tag_name">IVA Pagado Compras Supermercado</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_activo_fijo" model="account.tax.report.line">
         <field name="name">Compras Activo Fijo</field>
         <field name="tag_name">Compras Activo Fijo</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_activo_fijo_uso_comun" model="account.tax.report.line">
         <field name="name">Compras Activo Fijo Uso Común</field>
         <field name="tag_name">Compras Activo Fijo Uso Común</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_compras_iva_activo_fijo_no_recup" model="account.tax.report.line">
         <field name="name">Compras Activo Fijo No Recuperables</field>
         <field name="tag_name">Compras Activo Fijo No Recuperables</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_retencion_segunda_categ" model="account.tax.report.line">
         <field name="name">Retención Segunda Categoría</field>
         <field name="tag_name">Retención Segunda Categoría</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="tax_report_base_retencion_segunda_categ" model="account.tax.report.line">
         <field name="name">Base Retención Segunda Categoría</field>
         <field name="tag_name">Base Retención Segunda Categoría</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.cl"/>
     </record>
 
-
 </odoo>
diff --git a/addons/l10n_de/data/account_account_tags_data.xml b/addons/l10n_de/data/account_account_tags_data.xml
index fe3212c9e32feb0ee383aa36f715532dd38839d6..6366ee6106201b673461cfc830be038f487001b9 100644
--- a/addons/l10n_de/data/account_account_tags_data.xml
+++ b/addons/l10n_de/data/account_account_tags_data.xml
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.de"/>
+    </record>
+
     <!-- First level, one for base, one for tax -->
     <record id="tax_report_de_tag_01" model="account.tax.report.line">
         <field name="name">Bemessungsgrundlage</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
     </record>
     <record id="tax_report_de_tag_02" model="account.tax.report.line">
         <field name="name">Steuer</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.de"/>
     </record>
 
 
     <!-- BASE -->
     <record id="tax_report_de_tag_17" model="account.tax.report.line">
         <field name="name">I. Anmeldung der Umsatzsteuer-Vorauszahlung (zeile 17)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tag_01"/>
     </record>
 
@@ -26,26 +31,26 @@
 
     <record id="tax_report_de_tag_18" model="account.tax.report.line">
         <field name="name">Lieferungen und sonstige Leistungen (zeile 18)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tag_17"/>
     </record>
     <record id="tax_report_de_tag_31" model="account.tax.report.line">
         <field name="name">Innergemeinschaftliche Erwerbe (zeile 31)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tag_17"/>
     </record>
     <record id="tax_report_de_tag_37" model="account.tax.report.line">
         <field name="name">Ergänzende Angaben zu Umsätzen (zeile 37)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tag_17"/>
     </record>
     <record id="tax_report_de_tag_46" model="account.tax.report.line">
         <field name="name">Leistungsempfänger als Steuerschuldner (zeile 46)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tag_17"/>
     </record>
 
@@ -53,20 +58,20 @@
 
     <record id="tax_report_de_tag_19" model="account.tax.report.line">
         <field name="name">Steuerfreie Umsätze mit Vorsteuerabzug (zeile 19)</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tag_18"/>
     </record>
     <record id="tax_report_de_tag_24" model="account.tax.report.line">
         <field name="name">48. Steuerfreie Umsätze ohne Vorsteuerabzug (zeile 24)</field>
         <field name="tag_name">48</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_18"/>
     </record>
     <record id="tax_report_de_tag_25" model="account.tax.report.line">
         <field name="name">Steuerpflichtige Umsätze (zeile 25)</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tag_18"/>
     </record>
@@ -75,28 +80,28 @@
     <record id="tax_report_de_tag_41" model="account.tax.report.line">
         <field name="name">41. an Abnehmer mit USt-IdNr (zeile 20)</field>
         <field name="tag_name">41</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tag_19"/>
     </record>
     <record id="tax_report_de_tag_44" model="account.tax.report.line">
         <field name="name">44. neuer Fahrzeuge an Abnehmer ohne USt-IdNr (zeile 21)</field>
         <field name="tag_name">44</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_19"/>
     </record>
     <record id="tax_report_de_tag_49" model="account.tax.report.line">
         <field name="name">49. neuer Fahrzeuge außerhalb eines Unternehmens (zeile 22)</field>
         <field name="tag_name">49</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tag_19"/>
     </record>
     <record id="tax_report_de_tag_43" model="account.tax.report.line">
         <field name="name">43. Weitere steuerfreie Umsätze mit Vorsteuerabzug (zeile 23)</field>
         <field name="tag_name">43</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tag_19"/>
     </record>
@@ -104,35 +109,35 @@
     <record id="tax_report_de_tag_81" model="account.tax.report.line">
         <field name="name">81. zum Steuersatz von 19 % (zeile 26)</field>
         <field name="tag_name">81_BASE</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tag_25"/>
     </record>
     <record id="tax_report_de_tag_86" model="account.tax.report.line">
         <field name="name">86. zum Steuersatz von 7 % (zeile 27)</field>
         <field name="tag_name">86_BASE</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_25"/>
     </record>
     <record id="tax_report_de_tag_35" model="account.tax.report.line">
         <field name="name">35. zu anderen Steuersätzen (zeile 28)</field>
         <field name="tag_name">35</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_25"/>
     </record>
     <record id="tax_report_de_tag_77" model="account.tax.report.line">
         <field name="name">77. Lieferungen land- und forstwirtschaftlicher Betriebe nach § 24 UStG an Abnehmer mit USt-IdNr. (zeile 29)</field>
         <field name="tag_name">77</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tag_25"/>
     </record>
     <record id="tax_report_de_tag_76" model="account.tax.report.line">
         <field name="name">76. Umsätze, für die eine Steuer nach § 24 UStG zu entrichten ist (zeile 30)</field>
         <field name="tag_name">76</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
         <field name="parent_id" ref="tax_report_de_tag_25"/>
     </record>
@@ -141,35 +146,35 @@
     <record id="tax_report_de_tag_91" model="account.tax.report.line">
         <field name="name">91. Steuerfreie innergemeinschaftliche Erwerbe (zeile 32)</field>
         <field name="tag_name">91</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tag_31"/>
     </record>
     <record id="tax_report_de_tag_89" model="account.tax.report.line">
         <field name="name">89. Steuerpflichtige innergemeinschaftliche Erwerbe zum Steuersatz von 19 % (zeile 33)</field>
         <field name="tag_name">89_BASE</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_31"/>
     </record>
     <record id="tax_report_de_tag_93" model="account.tax.report.line">
         <field name="name">93. zum Steuersatz von 7 % (zeile 34)</field>
         <field name="tag_name">93_BASE</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tag_31"/>
     </record>
     <record id="tax_report_de_tag_95" model="account.tax.report.line">
         <field name="name">95. zu anderen Steuersätzen (zeile 35)</field>
         <field name="tag_name">95</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tag_31"/>
     </record>
     <record id="tax_report_de_tag_94" model="account.tax.report.line">
         <field name="name">94. neuer Fahrzeuge von Lieferern ohne (zeile 36)</field>
         <field name="tag_name">94</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
         <field name="parent_id" ref="tax_report_de_tag_31"/>
     </record>
@@ -178,35 +183,35 @@
     <record id="tax_report_de_tag_42" model="account.tax.report.line">
         <field name="name">42. Dreiecksgeschäften (zeile 38)</field>
         <field name="tag_name">42</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tag_37"/>
     </record>
     <record id="tax_report_de_tag_68" model="account.tax.report.line">
         <field name="name">68. Steuerpflichtige Umsätze, für die der Leistungsempfänger die Steuer nach § 13b Abs. 5 Satz 1 i.V.m. Abs. 2 Nr. 10 UStG schuldet (zeile 39)</field>
         <field name="tag_name">68</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_37"/>
     </record>
     <record id="tax_report_de_tag_60" model="account.tax.report.line">
         <field name="name">60. Übrige steuerpflichtige Umsätze, für die der Leistungsempfänger die Steuer nach § 13b Abs. 5 UStG schuldet (zeile 40)</field>
         <field name="tag_name">60</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tag_37"/>
     </record>
     <record id="tax_report_de_tag_21" model="account.tax.report.line">
         <field name="name">21. Nicht steuerbare sonstige Leistungen (zeile 41)</field>
         <field name="tag_name">21</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tag_37"/>
     </record>
     <record id="tax_report_de_tag_45" model="account.tax.report.line">
         <field name="name">45. Übrige nicht steuerbare Umsätze (zeile 42)</field>
         <field name="tag_name">45_BASE</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
         <field name="parent_id" ref="tax_report_de_tag_37"/>
     </record>
@@ -215,35 +220,35 @@
     <record id="tax_report_de_tag_48" model="account.tax.report.line">
         <field name="name">46. Steuerpflichtige sonstige Leistungen eines im übrigen Gemeinschaftsgebiet ansässigen Unternehmers (zeile 48)</field>
         <field name="tag_name">46</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tag_46"/>
     </record>
     <record id="tax_report_de_tag_52" model="account.tax.report.line">
         <field name="name">52. Andere Leistungen eines im Ausland ansässigen Unternehmers (zeile 49)</field>
         <field name="tag_name">52</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tag_46"/>
     </record>
     <record id="tax_report_de_tag_73" model="account.tax.report.line">
         <field name="name">73. Lieferungen sicherungsübereigneter Gegenstände und Umsätze, die unter das GrEStG fallen (zeile 50)</field>
         <field name="tag_name">73</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tag_46"/>
     </record>
     <record id="tax_report_de_tag_78" model="account.tax.report.line">
         <field name="name">78. Lieferungen von Mobilfunkgeräten, Tablet-Computern, Spielekonsolen und integrierten Schaltkreisen (zeile 51)</field>
         <field name="tag_name">78</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tag_46"/>
     </record>
     <record id="tax_report_de_tag_84" model="account.tax.report.line">
         <field name="name">84. Andere Leistungen (zeile 52)</field>
         <field name="tag_name">84</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
         <field name="parent_id" ref="tax_report_de_tag_46"/>
     </record>
@@ -253,8 +258,8 @@
 
     <record id="tax_report_de_tax_tag_17" model="account.tax.report.line">
         <field name="name">I. Anmeldung der Umsatzsteuer-Vorauszahlung (zeile 17)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tag_02"/>
     </record>
 
@@ -262,44 +267,44 @@
     <!-- Row 18 - 31 - 37 - 46 - 55 - 64 - 66 -->
     <record id="tax_report_de_tax_tag_18" model="account.tax.report.line">
         <field name="name">Lieferungen und sonstige Leistungen (zeile 18)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
     <record id="tax_report_de_tax_tag_31" model="account.tax.report.line">
         <field name="name">Innergemeinschaftliche Erwerbe (zeile 31)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
     <record id="tax_report_de_tax_tag_37" model="account.tax.report.line">
         <field name="name">Erganzende Angaben zu Umsatzen (zeile 37)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
     <record id="tax_report_de_tax_tag_46" model="account.tax.report.line">
         <field name="name">Leistungsempfanger als Steuerschuldner (zeile 46)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
     <record id="tax_report_de_tax_tag_55" model="account.tax.report.line">
         <field name="name">Abziehbare Vorsteuerbetrage (zeile 55)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
     <record id="tax_report_de_tax_tag_64" model="account.tax.report.line">
         <field name="name">Andere Steuerbetrage (zeile 64)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">6</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
     <record id="tax_report_de_tax_tag_66" model="account.tax.report.line">
         <field name="name">Umsatzsteuer-Vorauszahlung/Uberschuss (zeile 66)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">7</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
     </record>
 
@@ -307,28 +312,28 @@
     <record id="tax_report_de_tag_26" model="account.tax.report.line">
         <field name="name">81. zum Steuersatz von 19 % (zeile 26)</field>
         <field name="tag_name">81_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_18"/>
     </record>
     <record id="tax_report_de_tag_27" model="account.tax.report.line">
         <field name="name">86. zum Steuersatz von 7 % (zeile 27)</field>
         <field name="tag_name">86_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_18"/>
     </record>
     <record id="tax_report_de_tag_36" model="account.tax.report.line">
         <field name="name">36. zu anderen Steuersatzen (zeile 28)</field>
         <field name="tag_name">36</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_18"/>
     </record>
     <record id="tax_report_de_tag_80" model="account.tax.report.line">
         <field name="name">80. Umsatze, fur die eine Steuer nach § 24 UStG zu entrichten ist (zeile 30)</field>
         <field name="tag_name">80</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_18"/>
     </record>
@@ -337,28 +342,28 @@
     <record id="tax_report_de_tag_33" model="account.tax.report.line">
         <field name="name">89. zum Steuersatz von 19 % (zeile 33)</field>
         <field name="tag_name">89_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_31"/>
     </record>
     <record id="tax_report_de_tag_34" model="account.tax.report.line">
         <field name="name">93. zum Steuersatz von 7 % (zeile 34)</field>
         <field name="tag_name">93_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_31"/>
     </record>
     <record id="tax_report_de_tag_98" model="account.tax.report.line">
         <field name="name">98. zu anderen Steuersatzen (zeile 35)</field>
         <field name="tag_name">98</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_31"/>
     </record>
     <record id="tax_report_de_tag_96" model="account.tax.report.line">
         <field name="name">96. neuer Fahrzeuge von Lieferern ohne USt-IdNr. zum allgemeinen Steuersatz (zeile 36)</field>
         <field name="tag_name">96</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_31"/>
     </record>
@@ -367,8 +372,8 @@
     <record id="tax_report_de_tax_tag_45" model="account.tax.report.line">
         <field name="name">45. Ubertrag (zeile 45)</field>
         <field name="tag_name">45_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.de"/>
         <field name="parent_id" ref="tax_report_de_tax_tag_37"/>
     </record>
 
@@ -376,42 +381,42 @@
     <record id="tax_report_de_tag_47" model="account.tax.report.line">
         <field name="name">47. Steuerpflichtige sonstige Leistungen eines im übrigen Gemeinschaftsgebietansässigen Unternehmers (zeile 48)</field>
         <field name="tag_name">47</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_46"/>
     </record>
     <record id="tax_report_de_tag_53" model="account.tax.report.line">
         <field name="name">53. Andere Leistungen eines im Ausland ansässigen Unternehmers (zeile 49)</field>
         <field name="tag_name">53</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_46"/>
     </record>
     <record id="tax_report_de_tag_74" model="account.tax.report.line">
         <field name="name">74. Lieferungen sicherungsübereigneter Gegenstände und Umsätze, die unter das GrEStG fallen (zeile 50)</field>
         <field name="tag_name">74</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_46"/>
     </record>
     <record id="tax_report_de_tag_79" model="account.tax.report.line">
         <field name="name">79. Lieferungen von Mobilfunkgeräten, Tablet-Computern, Spielekonsolen und integrierten Schaltkreisen (zeile 51)</field>
         <field name="tag_name">79</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_46"/>
     </record>
     <record id="tax_report_de_tag_85" model="account.tax.report.line">
         <field name="name">85. Andere Leistungen (zeile 52)</field>
         <field name="tag_name">85</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_46"/>
     </record>
     <record id="tax_report_de_tag_65" model="account.tax.report.line">
         <field name="name">65. Steuer infolge Wechsels der Besteuerungsform sowie Nachsteuer auf versteuerte Anzahlungen u. ä. wegen Steuersatzänderung (zeile 53)</field>
         <field name="tag_name">65</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">6</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_46"/>
     </record>
@@ -420,49 +425,49 @@
     <record id="tax_report_de_tag_66" model="account.tax.report.line">
         <field name="name">66. Vorsteuerbeträge aus Rechnungen von anderen Unternehmern (zeile 56)</field>
         <field name="tag_name">66</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
     <record id="tax_report_de_tag_61" model="account.tax.report.line">
         <field name="name">61. Vorsteuerbeträge aus dem innergemeinschaftlichen Erwerb von Gegenständen (zeile 57)</field>
         <field name="tag_name">61</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
     <record id="tax_report_de_tag_62" model="account.tax.report.line">
         <field name="name">62. Entstandene Einfuhrumsatzsteuer (zeile 58)</field>
         <field name="tag_name">62</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
     <record id="tax_report_de_tag_67" model="account.tax.report.line">
         <field name="name">67. Vorsteuerbeträge aus Leistungen im Sinne des § 13b UStG (zeile 59)</field>
         <field name="tag_name">67</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">4</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
     <record id="tax_report_de_tag_63" model="account.tax.report.line">
         <field name="name">63. Vorsteuerbeträge, die nach allgemeinen Durchschnittssätzen berechnet sind (zeile 60)</field>
         <field name="tag_name">63</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">5</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
     <record id="tax_report_de_tag_64" model="account.tax.report.line">
         <field name="name">64. Berichtigung des Vorsteuerabzugs (zeile 61)</field>
         <field name="tag_name">64</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">6</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
     <record id="tax_report_de_tag_59" model="account.tax.report.line">
         <field name="name">59. Vorsteuerabzug für innergemeinschaftliche Lieferungen neuer Fahrzeuge außerhalb eines Unternehmens (zeile 62)</field>
         <field name="tag_name">59</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">7</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_55"/>
     </record>
@@ -471,7 +476,7 @@
     <record id="tax_report_de_tag_69" model="account.tax.report.line">
         <field name="name">69. In Rechnungen unrichtig oder unberechtigt ausgewiesene Steuerbeträge (zeile 65)</field>
         <field name="tag_name">69</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_64"/>
     </record>
@@ -480,14 +485,14 @@
     <record id="tax_report_de_tag_39" model="account.tax.report.line">
         <field name="name">39. Abzug der festgesetzten Sondervorauszahlung für Dauerfristverlängerung (zeile 67)</field>
         <field name="tag_name">39</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_66"/>
     </record>
     <record id="tax_report_de_tag_83" model="account.tax.report.line">
         <field name="name">83. Verbleibende Umsatzsteuer-Vorauszahlung (zeile 68)</field>
         <field name="tag_name">83</field>
-        <field name="country_id" ref="base.de"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
         <field name="parent_id" ref="tax_report_de_tax_tag_66"/>
     </record>
diff --git a/addons/l10n_do/data/account_tax_report_data.xml b/addons/l10n_do/data/account_tax_report_data.xml
index 4100b02f31c015e154bcaefb9a53e0affdf34946..fda5d6dbf56fc443564853a62b8efdeed3ab1a6b 100644
--- a/addons/l10n_do/data/account_tax_report_data.xml
+++ b/addons/l10n_do/data/account_tax_report_data.xml
@@ -1,69 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
     <record id="account_tax_report_total_operaciones" model="account.tax.report.line">
         <field name="name">II-1 Total de Operaciones</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_2A_ingrs_exprt" model="account.tax.report.line">
         <field name="name">II.A INGRESOS POR EXPORTACIONES DE BIENES O SERVICIOS EXENTOS</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_total_operaciones"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_2A2_ingrs_exprt" model="account.tax.report.line">
         <field name="name">II.A.2 INGRESOS POR EXPORTACIONES DE BIENES O SERVICIOS EXENTOS</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_2A_ingrs_exprt"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_2A3_ingrs_local_vnts" model="account.tax.report.line">
         <field name="name">II.A.3 INGRESOS POR VENTAS LOCALES DE BIENES O SERVICIOS EXENTOS</field>
         <field name="tag_name">II.A.3</field>
         <field name="code">DOTAX010102</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_2A_ingrs_exprt"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_2b_grvd" model="account.tax.report.line">
         <field name="name">II.B GRAVADAS</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_total_operaciones"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_2b6_grvd" model="account.tax.report.line">
         <field name="name">II.B.6 OPERACIONES GRAVADAS AL 18%</field>
         <field name="tag_name">II.B.6</field>
         <field name="code">DOTAX010201</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_2b_grvd"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_2b7_grvd" model="account.tax.report.line">
         <field name="name">II.B.7 OPERACIONES GRAVADAS AL 11%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_2b_grvd"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_3_liquidacion" model="account.tax.report.line">
         <field name="name">III LIQUIDACION</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_financial_report_line_02_01_do_account_tax_report_total_itbs" model="account.tax.report.line">
         <field name="name">III.10 TOTAL ITBIS COBRADO (Sumar casillas 8+9)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_3_liquidacion"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_itbs_18_casilla" model="account.tax.report.line">
@@ -72,72 +77,72 @@
         <field name="code">DOTAX020101</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_financial_report_line_02_01_do_account_tax_report_total_itbs"/>
-        <field name="country_id" ref="base.do"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_tbs_11_casilla" model="account.tax.report.line">
         <field name="name">III.9 TBIS COBRADO (11% de la casilla 7)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_financial_report_line_02_01_do_account_tax_report_total_itbs"/>
-        <field name="country_id" ref="base.do"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_total_itbs_pgdo" model="account.tax.report.line">
         <field name="name">III.14 TOTAL ITBIS PAGADO (Sumar casillas 11+12+13)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_3_liquidacion"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_itbs_pgdo_locales" model="account.tax.report.line">
         <field name="name">III.11 ITBIS PAGADO EN COMPRAS LOCALES</field>
         <field name="tag_name">III.11</field>
         <field name="code">DOTAX020201</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_total_itbs_pgdo"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_itbs_pgdo_dedubl" model="account.tax.report.line">
         <field name="name">III.12 ITBIS PAGADO POR SERVICIOS DEDUCIBLES</field>
         <field name="tag_name">III.12</field>
         <field name="code">DOTAX020202</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_total_itbs_pgdo"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_itbs_pgdo_imptcn" model="account.tax.report.line">
         <field name="name">III.13 ITBIS PAGADO EN IMPORTACIONES</field>
         <field name="tag_name">III.13</field>
         <field name="code">DOTAX020203</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_total_itbs_pgdo"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_itbs_rntnd" model="account.tax.report.line">
         <field name="name">A,1 ITBIS RETENIDO</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_retcn_prsn" model="account.tax.report.line">
         <field name="name">A.25 Servicios Sujetos a Retención Personas = Físicas y Entidad</field>
         <field name="tag_name">A.25</field>
         <field name="code">DOTAX0301</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_itbs_rntnd"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
     <record id="account_tax_report_itbs_retcn_prsn" model="account.tax.report.line">
         <field name="name">A.30 Itbis Por Servicios Sujetos A Retencion Personas Físicas</field>
         <field name="tag_name">A.30</field>
         <field name="code">DOTAX0302</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_itbs_rntnd"/>
-        <field name="country_id" ref="base.do"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_et/data/account_tax_report_data.xml b/addons/l10n_et/data/account_tax_report_data.xml
index 4c6e0e929c1c1b23cac25c0ab4088d4a8d2fecf4..f069da983ab840a3f95ba0d1d21526d389ae1ae2 100644
--- a/addons/l10n_et/data/account_tax_report_data.xml
+++ b/addons/l10n_et/data/account_tax_report_data.xml
@@ -1,222 +1,225 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
-
-        <record id="account_tax_report_purch_vt" model="account.tax.report.line">
-            <field name="name">Taxable Purchases - VAT</field>
-            <field name="sequence" eval="1"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_vt_out_scope" model="account.tax.report.line">
-            <field name="name">Taxable Purchase VAT Out of Scope</field>
-            <field name="tag_name">Taxable Purchase VAT Out of Scope</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_purch_vt"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_vt_exmpt" model="account.tax.report.line">
-            <field name="name">Taxable Purchase VAT Exempt</field>
-            <field name="tag_name">Taxable Purchase VAT Exempt</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_purch_vt"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_vt_ratd_0" model="account.tax.report.line">
-            <field name="name">Taxable Purchase VAT Rated 0%</field>
-            <field name="tag_name">Taxable Purchase VAT Rated 0%</field>
-            <field name="sequence" eval="3"/>
-            <field name="parent_id" ref="account_tax_report_purch_vt"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_vt_ratd_15" model="account.tax.report.line">
-            <field name="name">Taxable Purchase VAT Rated 15%</field>
-            <field name="tag_name">Taxable Purchase VAT Rated 15%</field>
-            <field name="sequence" eval="4"/>
-            <field name="parent_id" ref="account_tax_report_purch_vt"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_withholding" model="account.tax.report.line">
-            <field name="name">Taxable Purchases - Witholding</field>
-            <field name="sequence" eval="2"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_withholding_2" model="account.tax.report.line">
-            <field name="name">Taxable 2% Withholding on Purchases</field>
-            <field name="tag_name">Taxable 2% Withholding on Purchases</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_purch_withholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_withholding_35" model="account.tax.report.line">
-            <field name="name">Taxable 35% Withholding on Purchases</field>
-            <field name="tag_name">Taxable 35% Withholding on Purchases</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_purch_withholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_vat" model="account.tax.report.line">
-            <field name="name">Taxable Sales - VAT</field>
-            <field name="sequence" eval="3"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_vat_out_scope" model="account.tax.report.line">
-            <field name="name">Taxable Sales VAT Out of Scope (Sales)</field>
-            <field name="tag_name">Taxable Sales VAT Out of Scope (Sales)</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_sale_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_vat_exmpt" model="account.tax.report.line">
-            <field name="name">Taxable Sales VAT Exempt</field>
-            <field name="tag_name">Taxable Sales VAT Exempt</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_sale_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_vat_rated_0" model="account.tax.report.line">
-            <field name="name">Taxable Sales VAT Rated 0%</field>
-            <field name="tag_name">Taxable Sales VAT Rated 0%</field>
-            <field name="sequence" eval="3"/>
-            <field name="parent_id" ref="account_tax_report_sale_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_vat_rated_15" model="account.tax.report.line">
-            <field name="name">Taxable Sales VAT Rated 15%</field>
-            <field name="tag_name">Taxable Sales VAT Rated 15%</field>
-            <field name="sequence" eval="4"/>
-            <field name="parent_id" ref="account_tax_report_sale_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_withholding" model="account.tax.report.line">
-            <field name="name">Taxable Sales - Withholding</field>
-            <field name="sequence" eval="4"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_withholding_2" model="account.tax.report.line">
-            <field name="name">Taxable 2% Withholding on Sales</field>
-            <field name="tag_name">Taxable 2% Withholding on Sales</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_sale_withholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_withholding_35" model="account.tax.report.line">
-            <field name="name">Taxable 35% Withholding on Sales</field>
-            <field name="tag_name">Taxable 35% Withholding on Sales</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_sale_withholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_sale_vat_withholding" model="account.tax.report.line">
-            <field name="name">Taxable VAT Withholding on Sales</field>
-            <field name="tag_name">Taxable VAT Withholding on Sales</field>
-            <field name="sequence" eval="3"/>
-            <field name="parent_id" ref="account_tax_report_sale_withholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_vat" model="account.tax.report.line">
-            <field name="name">Net VAT to be Paid/Reclaimed</field>
-            <field name="sequence" eval="5"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_vat" model="account.tax.report.line">
-            <field name="name">Purchase VAT</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_net_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_purch_vat_rated_15" model="account.tax.report.line">
-            <field name="name">Purchase VAT Rated 15%</field>
-            <field name="tag_name">Purchase VAT Rated 15%</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_purch_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_sale_vat" model="account.tax.report.line">
-            <field name="name">Sales VAT</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_net_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_sale_vat_15" model="account.tax.report.line">
-            <field name="name">Sales VAT Rated 15%</field>
-            <field name="tag_name">Sales VAT Rated 15%</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_net_sale_vat"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_purch_witholding" model="account.tax.report.line">
-            <field name="name">Withholding on Purchases</field>
-            <field name="sequence" eval="6"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_purch_witholding_2" model="account.tax.report.line">
-            <field name="name">2% Withholding on Purchases</field>
-            <field name="tag_name">2% Withholding on Purchases</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_net_purch_witholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_purch_witholding_35" model="account.tax.report.line">
-            <field name="name">35% Withholding on Purchases</field>
-            <field name="tag_name">35% Withholding on Purchases</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_net_purch_witholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_sale_witholding" model="account.tax.report.line">
-            <field name="name">Withholding on Sales</field>
-            <field name="sequence" eval="7"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_sale_witheld_2" model="account.tax.report.line">
-            <field name="name">2% Withheld on Sales</field>
-            <field name="tag_name">2% Withheld on Sales</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_net_sale_witholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_sale_witheld_35" model="account.tax.report.line">
-            <field name="name">35% Withheld on Sales</field>
-            <field name="tag_name">35% Withheld on Sales</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref="account_tax_report_net_sale_witholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-        <record id="account_tax_report_net_sale_vat_witheld" model="account.tax.report.line">
-            <field name="name">VAT Withheld on Sales</field>
-            <field name="tag_name">VAT Withheld on Sales</field>
-            <field name="sequence" eval="3"/>
-            <field name="parent_id" ref="account_tax_report_net_sale_witholding"/>
-            <field name="country_id" ref="base.et"/>
-        </record>
-
-    </data>
+
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.et"/>
+    </record>
+
+    <record id="account_tax_report_purch_vt" model="account.tax.report.line">
+        <field name="name">Taxable Purchases - VAT</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+    </record>
+
+    <record id="account_tax_report_purch_vt_out_scope" model="account.tax.report.line">
+        <field name="name">Taxable Purchase VAT Out of Scope</field>
+        <field name="tag_name">Taxable Purchase VAT Out of Scope</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_purch_vt"/>
+    </record>
+
+    <record id="account_tax_report_purch_vt_exmpt" model="account.tax.report.line">
+        <field name="name">Taxable Purchase VAT Exempt</field>
+        <field name="tag_name">Taxable Purchase VAT Exempt</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_purch_vt"/>
+    </record>
+
+    <record id="account_tax_report_purch_vt_ratd_0" model="account.tax.report.line">
+        <field name="name">Taxable Purchase VAT Rated 0%</field>
+        <field name="tag_name">Taxable Purchase VAT Rated 0%</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_purch_vt"/>
+    </record>
+
+    <record id="account_tax_report_purch_vt_ratd_15" model="account.tax.report.line">
+        <field name="name">Taxable Purchase VAT Rated 15%</field>
+        <field name="tag_name">Taxable Purchase VAT Rated 15%</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="account_tax_report_purch_vt"/>
+    </record>
+
+    <record id="account_tax_report_purch_withholding" model="account.tax.report.line">
+        <field name="name">Taxable Purchases - Witholding</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+    </record>
+
+    <record id="account_tax_report_purch_withholding_2" model="account.tax.report.line">
+        <field name="name">Taxable 2% Withholding on Purchases</field>
+        <field name="tag_name">Taxable 2% Withholding on Purchases</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_purch_withholding"/>
+    </record>
+
+    <record id="account_tax_report_purch_withholding_35" model="account.tax.report.line">
+        <field name="name">Taxable 35% Withholding on Purchases</field>
+        <field name="tag_name">Taxable 35% Withholding on Purchases</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_purch_withholding"/>
+    </record>
+
+    <record id="account_tax_report_sale_vat" model="account.tax.report.line">
+        <field name="name">Taxable Sales - VAT</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+    </record>
+
+    <record id="account_tax_report_sale_vat_out_scope" model="account.tax.report.line">
+        <field name="name">Taxable Sales VAT Out of Scope (Sales)</field>
+        <field name="tag_name">Taxable Sales VAT Out of Scope (Sales)</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_sale_vat"/>
+    </record>
+
+    <record id="account_tax_report_sale_vat_exmpt" model="account.tax.report.line">
+        <field name="name">Taxable Sales VAT Exempt</field>
+        <field name="tag_name">Taxable Sales VAT Exempt</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_sale_vat"/>
+    </record>
+
+    <record id="account_tax_report_sale_vat_rated_0" model="account.tax.report.line">
+        <field name="name">Taxable Sales VAT Rated 0%</field>
+        <field name="tag_name">Taxable Sales VAT Rated 0%</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_sale_vat"/>
+    </record>
+
+    <record id="account_tax_report_sale_vat_rated_15" model="account.tax.report.line">
+        <field name="name">Taxable Sales VAT Rated 15%</field>
+        <field name="tag_name">Taxable Sales VAT Rated 15%</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="4"/>
+        <field name="parent_id" ref="account_tax_report_sale_vat"/>
+    </record>
+
+    <record id="account_tax_report_sale_withholding" model="account.tax.report.line">
+        <field name="name">Taxable Sales - Withholding</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="4"/>
+    </record>
+
+    <record id="account_tax_report_sale_withholding_2" model="account.tax.report.line">
+        <field name="name">Taxable 2% Withholding on Sales</field>
+        <field name="tag_name">Taxable 2% Withholding on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_sale_withholding"/>
+    </record>
+
+    <record id="account_tax_report_sale_withholding_35" model="account.tax.report.line">
+        <field name="name">Taxable 35% Withholding on Sales</field>
+        <field name="tag_name">Taxable 35% Withholding on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_sale_withholding"/>
+    </record>
+
+    <record id="account_tax_report_sale_vat_withholding" model="account.tax.report.line">
+        <field name="name">Taxable VAT Withholding on Sales</field>
+        <field name="tag_name">Taxable VAT Withholding on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_sale_withholding"/>
+    </record>
+
+    <record id="account_tax_report_net_vat" model="account.tax.report.line">
+        <field name="name">Net VAT to be Paid/Reclaimed</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="5"/>
+    </record>
+
+    <record id="account_tax_report_purch_vat" model="account.tax.report.line">
+        <field name="name">Purchase VAT</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_net_vat"/>
+    </record>
+
+    <record id="account_tax_report_purch_vat_rated_15" model="account.tax.report.line">
+        <field name="name">Purchase VAT Rated 15%</field>
+        <field name="tag_name">Purchase VAT Rated 15%</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_purch_vat"/>
+    </record>
+
+    <record id="account_tax_report_net_sale_vat" model="account.tax.report.line">
+        <field name="name">Sales VAT</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_net_vat"/>
+    </record>
+
+    <record id="account_tax_report_net_sale_vat_15" model="account.tax.report.line">
+        <field name="name">Sales VAT Rated 15%</field>
+        <field name="tag_name">Sales VAT Rated 15%</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_net_sale_vat"/>
+    </record>
+
+    <record id="account_tax_report_net_purch_witholding" model="account.tax.report.line">
+        <field name="name">Withholding on Purchases</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="6"/>
+    </record>
+
+    <record id="account_tax_report_net_purch_witholding_2" model="account.tax.report.line">
+        <field name="name">2% Withholding on Purchases</field>
+        <field name="tag_name">2% Withholding on Purchases</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_net_purch_witholding"/>
+    </record>
+
+    <record id="account_tax_report_net_purch_witholding_35" model="account.tax.report.line">
+        <field name="name">35% Withholding on Purchases</field>
+        <field name="tag_name">35% Withholding on Purchases</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_net_purch_witholding"/>
+    </record>
+
+    <record id="account_tax_report_net_sale_witholding" model="account.tax.report.line">
+        <field name="name">Withholding on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="7"/>
+    </record>
+
+    <record id="account_tax_report_net_sale_witheld_2" model="account.tax.report.line">
+        <field name="name">2% Withheld on Sales</field>
+        <field name="tag_name">2% Withheld on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_net_sale_witholding"/>
+    </record>
+
+    <record id="account_tax_report_net_sale_witheld_35" model="account.tax.report.line">
+        <field name="name">35% Withheld on Sales</field>
+        <field name="tag_name">35% Withheld on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_net_sale_witholding"/>
+    </record>
+
+    <record id="account_tax_report_net_sale_vat_witheld" model="account.tax.report.line">
+        <field name="name">VAT Withheld on Sales</field>
+        <field name="tag_name">VAT Withheld on Sales</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_net_sale_witholding"/>
+    </record>
+
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_fr/data/tax_report_data.xml b/addons/l10n_fr/data/tax_report_data.xml
index bf10b7c3a2f9d6a3cce6c1f8340817ef000b113d..f8d4fa724f2f18205533e63448eb1ad8145da4bb 100644
--- a/addons/l10n_fr/data/tax_report_data.xml
+++ b/addons/l10n_fr/data/tax_report_data.xml
@@ -1,750 +1,753 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
-
-        <record id="tax_report_base_coll" model="account.tax.report.line">
-            <field name="name">Base H.T. TVA collectée</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_base_coll_20" model="account.tax.report.line">
-            <field name="name">Base H.T. 20.0%</field>
-            <field name="tag_name">Base collectée 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_base_coll_19_6" model="account.tax.report.line">
-            <field name="name">Base H.T. 19.6%</field>
-            <field name="tag_name">Base collectée 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_base_coll_8_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 8.5%</field>
-            <field name="tag_name">Base collectée 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_base_coll_10" model="account.tax.report.line">
-            <field name="name">Base H.T. 10.0%</field>
-            <field name="tag_name">Base collectée 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_base_coll_7" model="account.tax.report.line">
-            <field name="name">Base H.T. 7.0%</field>
-            <field name="tag_name">Base collectée 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_base_coll_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.0%</field>
-            <field name="tag_name">Base collectée 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_base_coll_5_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.5%</field>
-            <field name="tag_name">Base collectée 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_base_coll_2_1" model="account.tax.report.line">
-            <field name="name">Base H.T. 2.1%</field>
-            <field name="tag_name">Base collectée 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_coll"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_tva_coll" model="account.tax.report.line">
-            <field name="name">TVA collectée</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_tva_coll_20" model="account.tax.report.line">
-            <field name="name">TVA 20.0%</field>
-            <field name="tag_name">TVA collectée 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_tva_coll_19_6" model="account.tax.report.line">
-            <field name="name">TVA 19.6%</field>
-            <field name="tag_name">TVA collectée 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_tva_coll_8_5" model="account.tax.report.line">
-            <field name="name">TVA 8.5%</field>
-            <field name="tag_name">TVA collectée 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_tva_coll_10" model="account.tax.report.line">
-            <field name="name">TVA 10.0%</field>
-            <field name="tag_name">TVA collectée 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_tva_coll_7" model="account.tax.report.line">
-            <field name="name">TVA 7.0%</field>
-            <field name="tag_name">TVA collectée 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_tva_coll_5" model="account.tax.report.line">
-            <field name="name">TVA 5.0%</field>
-            <field name="tag_name">TVA collectée 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_tva_coll_5_5" model="account.tax.report.line">
-            <field name="name">TVA 5.5%</field>
-            <field name="tag_name">TVA collectée 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_tva_coll_2_1" model="account.tax.report.line">
-            <field name="name">TVA 2.1%</field>
-            <field name="tag_name">TVA collectée 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_coll"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_base_acq" model="account.tax.report.line">
-            <field name="name">Base H.T. TVA acquittée</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_base_acq_20" model="account.tax.report.line">
-            <field name="name">Base H.T. 20.0%</field>
-            <field name="tag_name">Base acquittée 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_base_acq_19_6" model="account.tax.report.line">
-            <field name="name">Base H.T. 19.6%</field>
-            <field name="tag_name">Base acquittée 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_base_acq_8_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 8.5%</field>
-            <field name="tag_name">Base acquittée 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_base_acq_10" model="account.tax.report.line">
-            <field name="name">Base H.T. 10.0%</field>
-            <field name="tag_name">Base acquittée 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_base_acq_7" model="account.tax.report.line">
-            <field name="name">Base H.T. 7.0%</field>
-            <field name="tag_name">Base acquittée 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_base_acq_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.0%</field>
-            <field name="tag_name">Base acquittée 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_base_acq_5_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.5%</field>
-            <field name="tag_name">Base acquittée 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_base_acq_2_1" model="account.tax.report.line">
-            <field name="name">Base H.T. 2.1%</field>
-            <field name="tag_name">Base acquittée 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_tva_acq" model="account.tax.report.line">
-            <field name="name">TVA acquittée</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_tva_acq_20" model="account.tax.report.line">
-            <field name="name">TVA 20.0%</field>
-            <field name="tag_name">TVA acquittée 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_tva_acq_19_6" model="account.tax.report.line">
-            <field name="name">TVA 19.6%</field>
-            <field name="tag_name">TVA acquittée 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_tva_acq_8_5" model="account.tax.report.line">
-            <field name="name">TVA 8.5%</field>
-            <field name="tag_name">TVA acquittée 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_tva_acq_10" model="account.tax.report.line">
-            <field name="name">TVA 10.0%</field>
-            <field name="tag_name">TVA acquittée 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_tva_acq_7" model="account.tax.report.line">
-            <field name="name">TVA 7.0%</field>
-            <field name="tag_name">TVA acquittée 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_tva_acq_5" model="account.tax.report.line">
-            <field name="name">TVA 5.0%</field>
-            <field name="tag_name">TVA acquittée 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_tva_acq_5_5" model="account.tax.report.line">
-            <field name="name">TVA 5.5%</field>
-            <field name="tag_name">TVA acquittée 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_tva_acq_2_1" model="account.tax.report.line">
-            <field name="name">TVA 2.1%</field>
-            <field name="tag_name">TVA acquittée 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo" model="account.tax.report.line">
-            <field name="name">Base H.T. TVA acquittée pour immobilisations</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_20" model="account.tax.report.line">
-            <field name="name">Base H.T. 20.0%</field>
-            <field name="tag_name">Base acquittée immo. 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_19_6" model="account.tax.report.line">
-            <field name="name">Base H.T. 19.6%</field>
-            <field name="tag_name">Base acquittée immo. 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_8_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 8.5%</field>
-            <field name="tag_name">Base acquittée immo. 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_10" model="account.tax.report.line">
-            <field name="name">Base H.T. 10.0%</field>
-            <field name="tag_name">Base acquittée immo. 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_7" model="account.tax.report.line">
-            <field name="name">Base H.T. 7.0%</field>
-            <field name="tag_name">Base acquittée immo. 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.0%</field>
-            <field name="tag_name">Base acquittée immo. 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_5_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.5%</field>
-            <field name="tag_name">Base acquittée immo. 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_base_acq_immo_2_1" model="account.tax.report.line">
-            <field name="name">Base H.T. 2.1%</field>
-            <field name="tag_name">Base acquittée immo. 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_acq_immo"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo" model="account.tax.report.line">
-            <field name="name">TVA acquittée pour immobilisations</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_20" model="account.tax.report.line">
-            <field name="name">TVA 20.0%</field>
-            <field name="tag_name">TVA acquittée immo. 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_19_6" model="account.tax.report.line">
-            <field name="name">TVA 19.6%</field>
-            <field name="tag_name">TVA acquittée immo. 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_8_5" model="account.tax.report.line">
-            <field name="name">TVA 8.5%</field>
-            <field name="tag_name">TVA acquittée immo. 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_10" model="account.tax.report.line">
-            <field name="name">TVA 10.0%</field>
-            <field name="tag_name">TVA acquittée immo. 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_7" model="account.tax.report.line">
-            <field name="name">TVA 7.0%</field>
-            <field name="tag_name">TVA acquittée immo. 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_5" model="account.tax.report.line">
-            <field name="name">TVA 5.0%</field>
-            <field name="tag_name">TVA acquittée immo. 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_5_5" model="account.tax.report.line">
-            <field name="name">TVA 5.5%</field>
-            <field name="tag_name">TVA acquittée immo. 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_tva_acq_immo_2_1" model="account.tax.report.line">
-            <field name="name">TVA 2.1%</field>
-            <field name="tag_name">TVA acquittée immo. 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_acq_immo"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_base_due_intra" model="account.tax.report.line">
-            <field name="name">Base H.T. TVA due intracommunautaire</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_20" model="account.tax.report.line">
-            <field name="name">Base H.T. 20.0%</field>
-            <field name="tag_name">Base due intracom. 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_19_6" model="account.tax.report.line">
-            <field name="name">Base H.T. 19.6%</field>
-            <field name="tag_name">Base due intracom. 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_8_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 8.5%</field>
-            <field name="tag_name">Base due intracom. 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_10" model="account.tax.report.line">
-            <field name="name">Base H.T. 10.0%</field>
-            <field name="tag_name">Base due intracom. 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_7" model="account.tax.report.line">
-            <field name="name">Base H.T. 7.0%</field>
-            <field name="tag_name">Base due intracom. 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.0%</field>
-            <field name="tag_name">Base due intracom. 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_5_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.5%</field>
-            <field name="tag_name">Base due intracom. 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_base_due_intra_2_1" model="account.tax.report.line">
-            <field name="name">Base H.T. 2.1%</field>
-            <field name="tag_name">Base due intracom. 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_due_intra"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra" model="account.tax.report.line">
-            <field name="name">TVA due intracommunautaire</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_20" model="account.tax.report.line">
-            <field name="name">TVA 20.0%</field>
-            <field name="tag_name">TVA due intracom. 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_19_6" model="account.tax.report.line">
-            <field name="name">TVA 19.6%</field>
-            <field name="tag_name">TVA due intracom. 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_8_5" model="account.tax.report.line">
-            <field name="name">TVA 8.5%</field>
-            <field name="tag_name">TVA due intracom. 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_10" model="account.tax.report.line">
-            <field name="name">TVA 10.0%</field>
-            <field name="tag_name">TVA due intracom. 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_7" model="account.tax.report.line">
-            <field name="name">TVA 7.0%</field>
-            <field name="tag_name">TVA due intracom. 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_5" model="account.tax.report.line">
-            <field name="name">TVA 5.0%</field>
-            <field name="tag_name">TVA due intracom. 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_5_5" model="account.tax.report.line">
-            <field name="name">TVA 5.5%</field>
-            <field name="tag_name">TVA due intracom. 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_tva_due_intra_2_1" model="account.tax.report.line">
-            <field name="name">TVA 2.1%</field>
-            <field name="tag_name">TVA due intracom. 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_due_intra"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra" model="account.tax.report.line">
-            <field name="name">Base H.T. TVA déductible intracommunautaire</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">9</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_20" model="account.tax.report.line">
-            <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>
-        </record>
-
-        <record id="tax_report_base_ded_intra_19_6" model="account.tax.report.line">
-            <field name="name">Base H.T. 19.6%</field>
-            <field name="tag_name">Base déductible intracom. 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_8_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 8.5%</field>
-            <field name="tag_name">Base déductible intracom. 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_10" model="account.tax.report.line">
-            <field name="name">Base H.T. 10.0%</field>
-            <field name="tag_name">Base déductible intracom. 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_7" model="account.tax.report.line">
-            <field name="name">Base H.T. 7.0%</field>
-            <field name="tag_name">Base déductible intracom. 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.0%</field>
-            <field name="tag_name">Base déductible intracom. 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_5_5" model="account.tax.report.line">
-            <field name="name">Base H.T. 5.5%</field>
-            <field name="tag_name">Base déductible intracom. 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_base_ded_intra_2_1" model="account.tax.report.line">
-            <field name="name">Base H.T. 2.1%</field>
-            <field name="tag_name">Base déductible intracom. 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_base_ded_intra"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra" model="account.tax.report.line">
-            <field name="name">TVA déductible intracommunautaire</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">9</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_20" model="account.tax.report.line">
-            <field name="name">TVA 20.0%</field>
-            <field name="tag_name">TVA déductible intracom. 20.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_19_6" model="account.tax.report.line">
-            <field name="name">TVA 19.6%</field>
-            <field name="tag_name">TVA déductible intracom. 19.6%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_8_5" model="account.tax.report.line">
-            <field name="name">TVA 8.5%</field>
-            <field name="tag_name">TVA déductible intracom. 8.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_10" model="account.tax.report.line">
-            <field name="name">TVA 10.0%</field>
-            <field name="tag_name">TVA déductible intracom. 10.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">4</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_7" model="account.tax.report.line">
-            <field name="name">TVA 7.0%</field>
-            <field name="tag_name">TVA déductible intracom. 7.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_5" model="account.tax.report.line">
-            <field name="name">TVA 5.0%</field>
-            <field name="tag_name">TVA déductible intracom. 5.0%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">6</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_5_5" model="account.tax.report.line">
-            <field name="name">TVA 5.5%</field>
-            <field name="tag_name">TVA déductible intracom. 5.5%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="tax_report_tva_ded_intra_2_1" model="account.tax.report.line">
-            <field name="name">TVA 2.1%</field>
-            <field name="tag_name">TVA déductible intracom. 2.1%</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_tva_ded_intra"/>
-            <field name="sequence">8</field>
-        </record>
-
-        <record id="tax_report_non_imp" model="account.tax.report.line">
-            <field name="name">Base H.T. Opérations non imposables</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">10</field>
-        </record>
-
-        <record id="tax_report_non_imp_hors_ue" model="account.tax.report.line">
-            <field name="name">Exportations hors U.E.</field>
-            <field name="tag_name">Exportations hors U.E.</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_non_imp"/>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="tax_report_non_imp_livraisons_intra" model="account.tax.report.line">
-            <field name="name">Livraisons intracommunautaires</field>
-            <field name="tag_name">Livraisons intracommunautaires</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_non_imp"/>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="tax_report_non_imp_non_imposables" model="account.tax.report.line">
-            <field name="name">Autres opérations non imposables</field>
-            <field name="tag_name">Autres opérations non imposables</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_non_imp"/>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="tax_report_non_imp_non_ca3" model="account.tax.report.line">
-            <field name="name">Base H.T. Non présent sur la CA3</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="sequence">11</field>
-        </record>
-
-        <record id="tax_report_non_imp_achats_import" model="account.tax.report.line">
-            <field name="name">Achats import</field>
-            <field name="tag_name">Achats import</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="parent_id" ref="tax_report_non_imp_non_ca3"/>
-            <field name="sequence">5</field>
-        </record>
-
-    </data>
+
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.fr"/>
+    </record>
+
+    <record id="tax_report_base_coll" model="account.tax.report.line">
+        <field name="name">Base H.T. TVA collectée</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_base_coll_20" model="account.tax.report.line">
+        <field name="name">Base H.T. 20.0%</field>
+        <field name="tag_name">Base collectée 20.0%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_base_coll_19_6" model="account.tax.report.line">
+        <field name="name">Base H.T. 19.6%</field>
+        <field name="tag_name">Base collectée 19.6%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_base_coll_8_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 8.5%</field>
+        <field name="tag_name">Base collectée 8.5%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_base_coll_10" model="account.tax.report.line">
+        <field name="name">Base H.T. 10.0%</field>
+        <field name="tag_name">Base collectée 10.0%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_base_coll_7" model="account.tax.report.line">
+        <field name="name">Base H.T. 7.0%</field>
+        <field name="tag_name">Base collectée 7.0%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_base_coll_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.0%</field>
+        <field name="tag_name">Base collectée 5.0%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_base_coll_5_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.5%</field>
+        <field name="tag_name">Base collectée 5.5%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_base_coll_2_1" model="account.tax.report.line">
+        <field name="name">Base H.T. 2.1%</field>
+        <field name="tag_name">Base collectée 2.1%</field>
+        <field name="parent_id" ref="tax_report_base_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_tva_coll" model="account.tax.report.line">
+        <field name="name">TVA collectée</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_tva_coll_20" model="account.tax.report.line">
+        <field name="name">TVA 20.0%</field>
+        <field name="tag_name">TVA collectée 20.0%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_tva_coll_19_6" model="account.tax.report.line">
+        <field name="name">TVA 19.6%</field>
+        <field name="tag_name">TVA collectée 19.6%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_tva_coll_8_5" model="account.tax.report.line">
+        <field name="name">TVA 8.5%</field>
+        <field name="tag_name">TVA collectée 8.5%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_tva_coll_10" model="account.tax.report.line">
+        <field name="name">TVA 10.0%</field>
+        <field name="tag_name">TVA collectée 10.0%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_tva_coll_7" model="account.tax.report.line">
+        <field name="name">TVA 7.0%</field>
+        <field name="tag_name">TVA collectée 7.0%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_tva_coll_5" model="account.tax.report.line">
+        <field name="name">TVA 5.0%</field>
+        <field name="tag_name">TVA collectée 5.0%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_tva_coll_5_5" model="account.tax.report.line">
+        <field name="name">TVA 5.5%</field>
+        <field name="tag_name">TVA collectée 5.5%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_tva_coll_2_1" model="account.tax.report.line">
+        <field name="name">TVA 2.1%</field>
+        <field name="tag_name">TVA collectée 2.1%</field>
+        <field name="parent_id" ref="tax_report_tva_coll"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_base_acq" model="account.tax.report.line">
+        <field name="name">Base H.T. TVA acquittée</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_base_acq_20" model="account.tax.report.line">
+        <field name="name">Base H.T. 20.0%</field>
+        <field name="tag_name">Base acquittée 20.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_base_acq_19_6" model="account.tax.report.line">
+        <field name="name">Base H.T. 19.6%</field>
+        <field name="tag_name">Base acquittée 19.6%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_base_acq_8_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 8.5%</field>
+        <field name="tag_name">Base acquittée 8.5%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_base_acq_10" model="account.tax.report.line">
+        <field name="name">Base H.T. 10.0%</field>
+        <field name="tag_name">Base acquittée 10.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_base_acq_7" model="account.tax.report.line">
+        <field name="name">Base H.T. 7.0%</field>
+        <field name="tag_name">Base acquittée 7.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_base_acq_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.0%</field>
+        <field name="tag_name">Base acquittée 5.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_base_acq_5_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.5%</field>
+        <field name="tag_name">Base acquittée 5.5%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_base_acq_2_1" model="account.tax.report.line">
+        <field name="name">Base H.T. 2.1%</field>
+        <field name="tag_name">Base acquittée 2.1%</field>
+        <field name="parent_id" ref="tax_report_base_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_tva_acq" model="account.tax.report.line">
+        <field name="name">TVA acquittée</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_tva_acq_20" model="account.tax.report.line">
+        <field name="name">TVA 20.0%</field>
+        <field name="tag_name">TVA acquittée 20.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_tva_acq_19_6" model="account.tax.report.line">
+        <field name="name">TVA 19.6%</field>
+        <field name="tag_name">TVA acquittée 19.6%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_tva_acq_8_5" model="account.tax.report.line">
+        <field name="name">TVA 8.5%</field>
+        <field name="tag_name">TVA acquittée 8.5%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_tva_acq_10" model="account.tax.report.line">
+        <field name="name">TVA 10.0%</field>
+        <field name="tag_name">TVA acquittée 10.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_tva_acq_7" model="account.tax.report.line">
+        <field name="name">TVA 7.0%</field>
+        <field name="tag_name">TVA acquittée 7.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_tva_acq_5" model="account.tax.report.line">
+        <field name="name">TVA 5.0%</field>
+        <field name="tag_name">TVA acquittée 5.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_tva_acq_5_5" model="account.tax.report.line">
+        <field name="name">TVA 5.5%</field>
+        <field name="tag_name">TVA acquittée 5.5%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_tva_acq_2_1" model="account.tax.report.line">
+        <field name="name">TVA 2.1%</field>
+        <field name="tag_name">TVA acquittée 2.1%</field>
+        <field name="parent_id" ref="tax_report_tva_acq"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo" model="account.tax.report.line">
+        <field name="name">Base H.T. TVA acquittée pour immobilisations</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_20" model="account.tax.report.line">
+        <field name="name">Base H.T. 20.0%</field>
+        <field name="tag_name">Base acquittée immo. 20.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_19_6" model="account.tax.report.line">
+        <field name="name">Base H.T. 19.6%</field>
+        <field name="tag_name">Base acquittée immo. 19.6%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_8_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 8.5%</field>
+        <field name="tag_name">Base acquittée immo. 8.5%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_10" model="account.tax.report.line">
+        <field name="name">Base H.T. 10.0%</field>
+        <field name="tag_name">Base acquittée immo. 10.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_7" model="account.tax.report.line">
+        <field name="name">Base H.T. 7.0%</field>
+        <field name="tag_name">Base acquittée immo. 7.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.0%</field>
+        <field name="tag_name">Base acquittée immo. 5.0%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_5_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.5%</field>
+        <field name="tag_name">Base acquittée immo. 5.5%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_base_acq_immo_2_1" model="account.tax.report.line">
+        <field name="name">Base H.T. 2.1%</field>
+        <field name="tag_name">Base acquittée immo. 2.1%</field>
+        <field name="parent_id" ref="tax_report_base_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo" model="account.tax.report.line">
+        <field name="name">TVA acquittée pour immobilisations</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_20" model="account.tax.report.line">
+        <field name="name">TVA 20.0%</field>
+        <field name="tag_name">TVA acquittée immo. 20.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_19_6" model="account.tax.report.line">
+        <field name="name">TVA 19.6%</field>
+        <field name="tag_name">TVA acquittée immo. 19.6%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_8_5" model="account.tax.report.line">
+        <field name="name">TVA 8.5%</field>
+        <field name="tag_name">TVA acquittée immo. 8.5%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_10" model="account.tax.report.line">
+        <field name="name">TVA 10.0%</field>
+        <field name="tag_name">TVA acquittée immo. 10.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_7" model="account.tax.report.line">
+        <field name="name">TVA 7.0%</field>
+        <field name="tag_name">TVA acquittée immo. 7.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_5" model="account.tax.report.line">
+        <field name="name">TVA 5.0%</field>
+        <field name="tag_name">TVA acquittée immo. 5.0%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_5_5" model="account.tax.report.line">
+        <field name="name">TVA 5.5%</field>
+        <field name="tag_name">TVA acquittée immo. 5.5%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_tva_acq_immo_2_1" model="account.tax.report.line">
+        <field name="name">TVA 2.1%</field>
+        <field name="tag_name">TVA acquittée immo. 2.1%</field>
+        <field name="parent_id" ref="tax_report_tva_acq_immo"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_base_due_intra" model="account.tax.report.line">
+        <field name="name">Base H.T. TVA due intracommunautaire</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_20" model="account.tax.report.line">
+        <field name="name">Base H.T. 20.0%</field>
+        <field name="tag_name">Base due intracom. 20.0%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_19_6" model="account.tax.report.line">
+        <field name="name">Base H.T. 19.6%</field>
+        <field name="tag_name">Base due intracom. 19.6%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_8_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 8.5%</field>
+        <field name="tag_name">Base due intracom. 8.5%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_10" model="account.tax.report.line">
+        <field name="name">Base H.T. 10.0%</field>
+        <field name="tag_name">Base due intracom. 10.0%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_7" model="account.tax.report.line">
+        <field name="name">Base H.T. 7.0%</field>
+        <field name="tag_name">Base due intracom. 7.0%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.0%</field>
+        <field name="tag_name">Base due intracom. 5.0%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_5_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.5%</field>
+        <field name="tag_name">Base due intracom. 5.5%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_base_due_intra_2_1" model="account.tax.report.line">
+        <field name="name">Base H.T. 2.1%</field>
+        <field name="tag_name">Base due intracom. 2.1%</field>
+        <field name="parent_id" ref="tax_report_base_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra" model="account.tax.report.line">
+        <field name="name">TVA due intracommunautaire</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_20" model="account.tax.report.line">
+        <field name="name">TVA 20.0%</field>
+        <field name="tag_name">TVA due intracom. 20.0%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_19_6" model="account.tax.report.line">
+        <field name="name">TVA 19.6%</field>
+        <field name="tag_name">TVA due intracom. 19.6%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_8_5" model="account.tax.report.line">
+        <field name="name">TVA 8.5%</field>
+        <field name="tag_name">TVA due intracom. 8.5%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_10" model="account.tax.report.line">
+        <field name="name">TVA 10.0%</field>
+        <field name="tag_name">TVA due intracom. 10.0%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_7" model="account.tax.report.line">
+        <field name="name">TVA 7.0%</field>
+        <field name="tag_name">TVA due intracom. 7.0%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_5" model="account.tax.report.line">
+        <field name="name">TVA 5.0%</field>
+        <field name="tag_name">TVA due intracom. 5.0%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_5_5" model="account.tax.report.line">
+        <field name="name">TVA 5.5%</field>
+        <field name="tag_name">TVA due intracom. 5.5%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_tva_due_intra_2_1" model="account.tax.report.line">
+        <field name="name">TVA 2.1%</field>
+        <field name="tag_name">TVA due intracom. 2.1%</field>
+        <field name="parent_id" ref="tax_report_tva_due_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra" model="account.tax.report.line">
+        <field name="name">Base H.T. TVA déductible intracommunautaire</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">9</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_20" model="account.tax.report.line">
+        <field name="name">Base H.T. 20.0%</field>
+        <field name="tag_name">Base déductible intracom. 20.0%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_19_6" model="account.tax.report.line">
+        <field name="name">Base H.T. 19.6%</field>
+        <field name="tag_name">Base déductible intracom. 19.6%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_8_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 8.5%</field>
+        <field name="tag_name">Base déductible intracom. 8.5%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_10" model="account.tax.report.line">
+        <field name="name">Base H.T. 10.0%</field>
+        <field name="tag_name">Base déductible intracom. 10.0%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_7" model="account.tax.report.line">
+        <field name="name">Base H.T. 7.0%</field>
+        <field name="tag_name">Base déductible intracom. 7.0%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.0%</field>
+        <field name="tag_name">Base déductible intracom. 5.0%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_5_5" model="account.tax.report.line">
+        <field name="name">Base H.T. 5.5%</field>
+        <field name="tag_name">Base déductible intracom. 5.5%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_base_ded_intra_2_1" model="account.tax.report.line">
+        <field name="name">Base H.T. 2.1%</field>
+        <field name="tag_name">Base déductible intracom. 2.1%</field>
+        <field name="parent_id" ref="tax_report_base_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra" model="account.tax.report.line">
+        <field name="name">TVA déductible intracommunautaire</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">9</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_20" model="account.tax.report.line">
+        <field name="name">TVA 20.0%</field>
+        <field name="tag_name">TVA déductible intracom. 20.0%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_19_6" model="account.tax.report.line">
+        <field name="name">TVA 19.6%</field>
+        <field name="tag_name">TVA déductible intracom. 19.6%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_8_5" model="account.tax.report.line">
+        <field name="name">TVA 8.5%</field>
+        <field name="tag_name">TVA déductible intracom. 8.5%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_10" model="account.tax.report.line">
+        <field name="name">TVA 10.0%</field>
+        <field name="tag_name">TVA déductible intracom. 10.0%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">4</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_7" model="account.tax.report.line">
+        <field name="name">TVA 7.0%</field>
+        <field name="tag_name">TVA déductible intracom. 7.0%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_5" model="account.tax.report.line">
+        <field name="name">TVA 5.0%</field>
+        <field name="tag_name">TVA déductible intracom. 5.0%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">6</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_5_5" model="account.tax.report.line">
+        <field name="name">TVA 5.5%</field>
+        <field name="tag_name">TVA déductible intracom. 5.5%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">7</field>
+    </record>
+
+    <record id="tax_report_tva_ded_intra_2_1" model="account.tax.report.line">
+        <field name="name">TVA 2.1%</field>
+        <field name="tag_name">TVA déductible intracom. 2.1%</field>
+        <field name="parent_id" ref="tax_report_tva_ded_intra"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">8</field>
+    </record>
+
+    <record id="tax_report_non_imp" model="account.tax.report.line">
+        <field name="name">Base H.T. Opérations non imposables</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">10</field>
+    </record>
+
+    <record id="tax_report_non_imp_hors_ue" model="account.tax.report.line">
+        <field name="name">Exportations hors U.E.</field>
+        <field name="tag_name">Exportations hors U.E.</field>
+        <field name="parent_id" ref="tax_report_non_imp"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="tax_report_non_imp_livraisons_intra" model="account.tax.report.line">
+        <field name="name">Livraisons intracommunautaires</field>
+        <field name="tag_name">Livraisons intracommunautaires</field>
+        <field name="parent_id" ref="tax_report_non_imp"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">2</field>
+    </record>
+
+    <record id="tax_report_non_imp_non_imposables" model="account.tax.report.line">
+        <field name="name">Autres opérations non imposables</field>
+        <field name="tag_name">Autres opérations non imposables</field>
+        <field name="parent_id" ref="tax_report_non_imp"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">3</field>
+    </record>
+
+    <record id="tax_report_non_imp_non_ca3" model="account.tax.report.line">
+        <field name="name">Base H.T. Non présent sur la CA3</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">11</field>
+    </record>
+
+    <record id="tax_report_non_imp_achats_import" model="account.tax.report.line">
+        <field name="name">Achats import</field>
+        <field name="tag_name">Achats import</field>
+        <field name="parent_id" ref="tax_report_non_imp_non_ca3"/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">5</field>
+    </record>
+
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_gr/data/account_tax_report_data.xml b/addons/l10n_gr/data/account_tax_report_data.xml
index e5703b9a942ea2b81ab43b41f0173f80c662c850..197da07fac87fc589ca45abf9656542a9a94ebe0 100644
--- a/addons/l10n_gr/data/account_tax_report_data.xml
+++ b/addons/l10n_gr/data/account_tax_report_data.xml
@@ -1,101 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.gr"/>
+    </record>
+
     <record id="account_tax_report_line_311" model="account.tax.report.line">
         <field name="name">311 Σύνολο Εκροών</field>
         <field name="code">GRTAX_311</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
 
     <record id="account_tax_report_line_307" model="account.tax.report.line">
         <field name="name">307 Σύνολο φορολ. Εκροών</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_311"/>
         <field name="formula">GRTAX_303</field>
-        <field name="country_id" ref="base.gr"/>
     </record>
 
     <record id="account_tax_report_line_303" model="account.tax.report.line">
         <field name="name">303 Πωλήσεις 19-23%f</field>
         <field name="tag_name">303 Πωλήσεις 19-23%</field>
         <field name="code">GRTAX_303</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_307"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
 
     <record id="account_tax_report_line_358" model="account.tax.report.line">
         <field name="name">358 Σύνολο φορολ. Εισροών</field>
         <field name="code">GRTAX_358</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_353" model="account.tax.report.line">
         <field name="name">353 Αγορές ΦΠΑ 19-23%</field>
         <field name="tag_name">353 Αγορές ΦΠΑ 19-23%</field>
         <field name="code">GRTAX_353</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_358"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_357" model="account.tax.report.line">
         <field name="name">357 Δαπάνες/Έξοδα φορολ.</field>
         <field name="tag_name">357 Δαπάνες/Έξοδα φορολ.</field>
         <field name="code">GRTAX_357</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_358"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_501-511" model="account.tax.report.line">
         <field name="name">501-511 Υπόλοιπο ΦΠΑ</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_337" model="account.tax.report.line">
         <field name="name">337 ΦΠΑ Πωλήσεων</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_501-511"/>
         <field name="formula">GRTAX_333</field>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_333" model="account.tax.report.line">
         <field name="name">333 ΦΠΑ 19-23%</field>
         <field name="tag_name">333 ΦΠΑ 19-23%</field>
         <field name="code">GRTAX_333</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_337"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_420" model="account.tax.report.line">
         <field name="name">420 ΦΠΑ Αγορών</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_501-511"/>
         <field name="formula">GRTAX_373+GRTAX_377</field>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_378" model="account.tax.report.line">
         <field name="name">378 Σύνολο Φορ. Αγορών</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_420"/>
         <field name="formula">GRTAX_373+GRTAX_377</field>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_373" model="account.tax.report.line">
         <field name="name">373 ΦΠΑ Αγορών 19-23%</field>
         <field name="tag_name">373 ΦΠΑ Αγορών 19-23%</field>
         <field name="code">GRTAX_373</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_378"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
     <record id="account_tax_report_line_377" model="account.tax.report.line">
         <field name="name">377 ΦΠΑ Δαπανών</field>
         <field name="tag_name">377 ΦΠΑ Δαπανών</field>
         <field name="code">GRTAX_377</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_378"/>
-        <field name="country_id" ref="base.gr"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_hr/data/account_tax_report_data.xml b/addons/l10n_hr/data/account_tax_report_data.xml
index 282f7003b38cc7ce88526b9addf64e0e0e2251c3..8e81059eaacaab411a4fae7e46c25f8d5c57af72 100644
--- a/addons/l10n_hr/data/account_tax_report_data.xml
+++ b/addons/l10n_hr/data/account_tax_report_data.xml
@@ -1,643 +1,648 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.hr"/>
+    </record>
+
     <record id="account_tax_report_line_ostali_porezi" model="account.tax.report.line">
         <field name="name">Ostali porezi, carine, trošarine i sl.</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_porez" model="account.tax.report.line">
         <field name="name">Porez na potrošnju</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_ostali_porezi"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pdv" model="account.tax.report.line">
         <field name="name">PDV</field>
         <field name="formula">(((koje + (izvozne + isporuke + tuzemne + ostale) + isporuke_po) + (izdani_10 + izdani_25)) + (pretporez_10 + (0.7 * pretporez_25_70 + 0.3 * pretporez_25_30) + placeni_uvozu + placeni_usluge_10 + placeni_usluge_25 + pretporez_0)) + (((izdani_racuni + izdani_racuni_25) + (pretporez_10_tax + pretporez_25_tax + placeni_uvozu_tax + placeni_usluge_10_tax + placeni_usluge_25_ta))) + ((nepriznati_pretporez_25_other + (0.3 * nepriznati_pretporez_25_30) + (0.7 * nepriznati_pretporez_25_70)) + pretporez_koji + (nepriznati_pretporez_25_tax) + (pretporez_koji_neplaceni + pretporez_koji_neplaceni_25 + pretporez_koji_neplaceni_usluge_25))</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_obrazac_pdv" model="account.tax.report.line">
         <field name="name">OBRAZAC PDV</field>
         <field name="formula">(((koje + (izvozne + isporuke + tuzemne + ostale) + isporuke_po) + (izdani_10 + izdani_25)) + (pretporez_10 + (0.7 * pretporez_25_70 + 0.3 * pretporez_25_30) + placeni_uvozu + placeni_usluge_10 + placeni_usluge_25 + pretporez_0)) + (((izdani_racuni + izdani_racuni_25) + (pretporez_10_tax + pretporez_25_tax + placeni_uvozu_tax + placeni_usluge_10_tax + placeni_usluge_25_ta)))</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_pdv"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_osnovica" model="account.tax.report.line">
         <field name="name">O S N O V I C A</field>
         <field name="formula">((koje + (izvozne + isporuke + tuzemne + ostale) + isporuke_po) + (izdani_10 + izdani_25)) + (pretporez_10 + (0.7 * pretporez_25_70 + 0.3 * pretporez_25_30) + placeni_uvozu + placeni_usluge_10 + placeni_usluge_25 + pretporez_0)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obrazac_pdv"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_obracun" model="account.tax.report.line">
         <field name="name">Obračun isporuka (I+II)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_osnovica"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_obracun_isporuke" model="account.tax.report.line">
         <field name="name">I. Isporuke ne podliježu / oslobođene</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracun"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_koje" model="account.tax.report.line">
         <field name="name">I.1. Koje ne podliježu oporezivanju</field>
         <field name="tag_name">I.1. Koje ne podliježu oporezivanju</field>
         <field name="code">koje</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracun_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_oslobodene" model="account.tax.report.line">
         <field name="name">I.2. Oslobođene ukupno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_obracun_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_izvozne" model="account.tax.report.line">
         <field name="name">I.2.1. Izvozne</field>
         <field name="tag_name">I.2.1. Izvozne</field>
         <field name="code">izvozne</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oslobodene"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_isporuke" model="account.tax.report.line">
         <field name="name">I.2.2. Isporuke dobara</field>
         <field name="tag_name">I.2.2. Isporuke dobara</field>
         <field name="code">isporuke</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_oslobodene"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_tuzemne" model="account.tax.report.line">
         <field name="name">I.2.3. Tuzemne  - bez prava odbitka</field>
         <field name="tag_name">I.2.3. Tuzemne  - bez prava odbitka</field>
         <field name="code">tuzemne</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oslobodene"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_ostale" model="account.tax.report.line">
         <field name="name">I.2.4. Ostale – s pravom odbitka</field>
         <field name="tag_name">I.2.4. Ostale – s pravom odbitka</field>
         <field name="code">ostale</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_oslobodene"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_isporuke_po" model="account.tax.report.line">
         <field name="name">I.3. Isporuke po stopi od 0%</field>
         <field name="tag_name">I.3. Isporuke po stopi od 0%</field>
         <field name="code">isporuke_po</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_obracun_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_oporezive" model="account.tax.report.line">
         <field name="name">II. Oporezive isporuke</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_obracun"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (osnovica)</field>
         <field name="code">izdani_10</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_izdani_22_i_23" model="account.tax.report.line">
         <field name="name">II.2 Izdani računi po stopi 22% i 23%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (osnovica)</field>
         <field name="code">izdani_25</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nenaplaceni" model="account.tax.report.line">
         <field name="name">II.4 Nenaplaćeni izvoz</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_oslobodenje" model="account.tax.report.line">
         <field name="name">II.5 Oslobođenje izvoza – putnički promet</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_obracunani" model="account.tax.report.line">
         <field name="name">III. OBRAÄŒUNANI PRETPOREZ</field>
         <field name="formula">pretporez_10 + (0.7 * pretporez_25_70 + 0.3 * pretporez_25_30) + placeni_uvozu + placeni_usluge_10 + placeni_usluge_25 + pretporez_0</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_osnovica"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (osnovica)</field>
         <field name="code">pretporez_10</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_22_i_23" model="account.tax.report.line">
         <field name="name">III.2. Pretporez 22% i23%</field>
         <field name="tag_name">III.2. Pretporez 22% i23%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_25" model="account.tax.report.line">
         <field name="name">III.3. Pretporez 25%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="formula">0.3 * pretporez_25_30 + 0.7 * pretporez_25_70</field>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_25_30" model="account.tax.report.line">
         <field name="name">III.3. Pretporez 25% (30%)</field>
         <field name="tag_name">III.3. Pretporez 25% (30%)</field>
         <field name="code">pretporez_25_30</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_pretporez_25"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_25_70" model="account.tax.report.line">
         <field name="name">III.3. Pretporez 25% (70%)</field>
         <field name="tag_name">III.3. Pretporez 25% (70%)</field>
         <field name="code">pretporez_25_70</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_pretporez_25"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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 (osnovica)</field>
         <field name="code">placeni_uvozu</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (osnovica)</field>
         <field name="code">placeni_usluge_10</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_placeni_usluge_22_i_23" model="account.tax.report.line">
         <field name="name">III.6. Plaćeni PP na ino usluge 22% i 23%</field>
         <field name="tag_name">III.6. Plaćeni PP na ino usluge 22% i 23%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (osnovica)</field>
         <field name="code">placeni_usluge_25</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_0" model="account.tax.report.line">
         <field name="name">III.0. Pretporez 0%</field>
         <field name="tag_name">III.0. Pretporez 0%</field>
         <field name="code">pretporez_0</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pdv_porez" model="account.tax.report.line">
         <field name="name">PDV – POREZ – razlika za uplatu/preplata</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_obrazac_pdv"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_porezna" model="account.tax.report.line">
         <field name="name">VI. POREZNA OBVEZA U RAZDOBLJU</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_pdv_porez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_isporuke_ne" model="account.tax.report.line">
         <field name="name">I. Isporuke ne podliježu / oslobođene</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_porezna"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_oporezive_isporuke" model="account.tax.report.line">
         <field name="name">II. Oporezive isporuke</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_porezna"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (porez)</field>
         <field name="code">izdani_racuni</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_izdani_racuni_22_i_23" model="account.tax.report.line">
         <field name="name">II.2 Izdani računi po stopi 22% i 23%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (porez)</field>
         <field name="code">izdani_racuni_25</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_oslobodenje_izvoza" model="account.tax.report.line">
         <field name="name">II.4 Oslobođenje izvoza – putnički promet</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_obracunani_pretporez" model="account.tax.report.line">
         <field name="name">III. OBRAÄŒUNANI PRETPOREZ</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_porezna"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (porez)</field>
         <field name="code">pretporez_10_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_22_i_23_tax" model="account.tax.report.line">
         <field name="name">III.2. Pretporez 22% i 23%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_25_tax" model="account.tax.report.line">
         <field name="name">III.3. Pretporez 25%</field>
         <field name="tag_name">III.3. Pretporez 25%</field>
         <field name="code">pretporez_25_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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 (porez)</field>
         <field name="code">placeni_uvozu_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (porez)</field>
         <field name="code">placeni_usluge_10_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_placeni_usluge_22_i_23_tax" model="account.tax.report.line">
         <field name="name">III.6. Plaćeni PP na ino usluge 22% i 23%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <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% (porez)</field>
         <field name="code">placeni_usluge_25_ta</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_ispravci" model="account.tax.report.line">
         <field name="name">III.8. Ispravci pretporeza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_uplaceno" model="account.tax.report.line">
         <field name="name">Uplaćeno u razdoblju</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_pdv_porez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pdv_ostalo" model="account.tax.report.line">
         <field name="name">PDV - OSTALO</field>
         <field name="formula">(nepriznati_pretporez_25_other + (0.3 * nepriznati_pretporez_25_30) + (0.7 * nepriznati_pretporez_25_70)) + pretporez_koji + (nepriznati_pretporez_25_tax) + (pretporez_koji_neplaceni + pretporez_koji_neplaceni_25 + pretporez_koji_neplaceni_usluge_25)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_pdv"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_ostali_podaci" model="account.tax.report.line">
         <field name="name">Ostali podaci</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_pdv_ostalo"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_ispravak" model="account.tax.report.line">
         <field name="name">1. ZA ISPRAVAK PRETPOREZA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_ostali_podaci"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nabava" model="account.tax.report.line">
         <field name="name">1.1. NABAVA NEKRETNINA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_ispravak"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_prodaja" model="account.tax.report.line">
         <field name="name">1.2. PRODAJA NEKRETNINA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_ispravak"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nabava_osobnih" model="account.tax.report.line">
         <field name="name">1.3. NABAVA OSOBNIH VOZILA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_ispravak"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_prodaja_osobnih" model="account.tax.report.line">
         <field name="name">1.4. PRODAJA OSOBNIH VOZILA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_ispravak"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nabava_dugotrajne" model="account.tax.report.line">
         <field name="name">1.5. NABAVA DUGOTRAJNE IMOVINE</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_ispravak"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_prodaja_dugotrajne" model="account.tax.report.line">
         <field name="name">1.6. PRODAJA DUGOTRAJNE IMOVINE</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_ispravak"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_otudenje" model="account.tax.report.line">
         <field name="name">2. OTUĐENJE/STJECANJE GOSPODARSKE CJELINE ILI POGONA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_ostali_podaci"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nabava_dobara" model="account.tax.report.line">
         <field name="name">3. NABAVA DOBARA I USLUGA ZA REPREZENTACIJU</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_ostali_podaci"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nabava_osobnih_vozila" model="account.tax.report.line">
         <field name="name">4. NABAVA OSOBNIH VOZILA I DRUGIH SREDSTAVA ZA OSOBNI PRIJEVOZ</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_ostali_podaci"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_osnovica_za_obracun" model="account.tax.report.line">
         <field name="name">5. OSNOVICA ZA OBRAÄŒUN VLASTITE POTROÅ NJE ZA OSOBNA VOZILA NABAV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_ostali_podaci"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez" model="account.tax.report.line">
         <field name="name">NEPRIZNATI PRETPOREZ</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="formula">0.3 * nepriznati_pretporez_25_30 + 0.7 * nepriznati_pretporez_25_70 + nepriznati_pretporez_25_other + nepriznati_pretporez_10 + pretporez_koji + nepriznati_pretporez_porez + pretporez_koji_ukupno</field>
         <field name="parent_id" ref="account_tax_report_line_pdv_ostalo"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_osnovica_3070" model="account.tax.report.line">
         <field name="name">NEPRIZNATI PRETPOREZ (osnovica 30 ili 70%)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="formula">0.3 * nepriznati_pretporez_25_30 + 0.7 * nepriznati_pretporez_25_70 + nepriznati_pretporez_25_other + nepriznati_pretporez_10</field>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_10" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 10% (o)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="code">nepriznati_pretporez_10</field>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_osnovica_3070"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_22_i_23" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 22% i 23% (o)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_osnovica_3070"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_25" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 25% (o)</field>
         <field name="formula">0.3 * nepriznati_pretporez_25_30 + 0.7 * nepriznati_pretporez_25_70 + nepriznati_pretporez_25_other</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_osnovica_3070"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_25_30" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 25% (o) (30%)</field>
         <field name="tag_name">Nepriznati pretporez 25% (o) (30%)</field>
         <field name="code">nepriznati_pretporez_25_30</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_25"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_25_70" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 25% (o) (70%)</field>
         <field name="tag_name">Nepriznati pretporez 25% (o) (70%)</field>
         <field name="code">nepriznati_pretporez_25_70</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_25"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_25_other" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 25% (o)</field>
         <field name="tag_name">Nepriznati pretporez 25% (o)</field>
         <field name="code">nepriznati_pretporez_25_other</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_25"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_koji" model="account.tax.report.line">
         <field name="name">Pretporez koji još nije priznan (uključivo i neplaćeni R-2)</field>
         <field name="tag_name">Pretporez koji još nije priznan (uključivo i neplaćeni R-2)</field>
         <field name="code">pretporez_koji</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_porez" model="account.tax.report.line">
         <field name="name">NEPRIZNATI PRETPOREZ (porez)</field>
         <field name="code">nepriznati_pretporez_porez</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_3070" model="account.tax.report.line">
         <field name="name">NEPRIZNATI PRETPOREZ (30 ili 70%)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_porez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_10_tax" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 10% (p)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_3070"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_22_i_23_tax" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 22% i 23% (p)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_3070"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_nepriznati_pretporez_25_tax" model="account.tax.report.line">
         <field name="name">Nepriznati pretporez 25% (p)</field>
         <field name="tag_name">Nepriznati pretporez 25% (p)</field>
         <field name="code">nepriznati_pretporez_25_tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez_3070"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_koji_ukupno" model="account.tax.report.line">
         <field name="name">Pretporez koji još nije priznan (ukupno)</field>
         <field name="code">pretporez_koji_ukupno</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_nepriznati_pretporez"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_koji_neplaceni" model="account.tax.report.line">
         <field name="name">Pretporez koji još nije priznan (neplaćeni R2)</field>
         <field name="tag_name">Pretporez koji još nije priznan (neplaćeni R2)</field>
         <field name="code">pretporez_koji_neplaceni</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_pretporez_koji_ukupno"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_koji_neplaceni_25" model="account.tax.report.line">
         <field name="name">Pretporez koji još nije priznan (neplaćeni UVOZ dobara 25%)</field>
         <field name="tag_name">Pretporez koji još nije priznan (neplaćeni UVOZ dobara 25%)</field>
         <field name="code">pretporez_koji_neplaceni_25</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_pretporez_koji_ukupno"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_koji_neplaceni_usluge_25" model="account.tax.report.line">
         <field name="name">Pretporez koji još nije priznan (neplaćene INO usluge 25%)</field>
         <field name="tag_name">Pretporez koji još nije priznan (neplaćene INO usluge 25%)</field>
         <field name="code">pretporez_koji_neplaceni_usluge_25</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_pretporez_koji_ukupno"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
     <record id="account_tax_report_line_pretporez_koji_neplaceni_usluge_10" model="account.tax.report.line">
         <field name="name">Pretporez koji još nije priznan (neplaćene INO usluge 10%)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_pretporez_koji_ukupno"/>
-        <field name="country_id" ref="base.hr"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_hu/data/account_tax_report_data.xml b/addons/l10n_hu/data/account_tax_report_data.xml
index 6b2f0a7ad5c730d9c3276f0b2998791a1ef93ca8..0b629fe2bc7e80e44c716d72fa305e782fce2b29 100644
--- a/addons/l10n_hu/data/account_tax_report_data.xml
+++ b/addons/l10n_hu/data/account_tax_report_data.xml
@@ -1,184 +1,189 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.hu"/>
+    </record>
+
     <record id="tax_report_alap" model="account.tax.report.line">
         <field name="name">ÁFA alap</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_export" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA Export</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA Export</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_eu" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA EU</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA EU</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_targyi" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA tárgyi adómentes</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA tárgyi adómentes</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_alanyi" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA alanyi adómentes</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA alanyi adómentes</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_afa_5" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA 5%</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_afa_18" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA 18%</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA 18%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_fiz_afa_27" model="account.tax.report.line">
         <field name="name">Adóalap - Fizetendő ÁFA 27%</field>
         <field name="tag_name">Adóalap - Fizetendő ÁFA 27%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_viss" model="account.tax.report.line">
         <field name="name">Adóalap - Visszaigényelhető ÁFA EU</field>
         <field name="tag_name">Adóalap - Visszaigényelhető ÁFA EU</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_import" model="account.tax.report.line">
         <field name="name">Adóalap – Import ÁFA</field>
         <field name="tag_name">Adóalap – Import ÁFA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_forditott" model="account.tax.report.line">
         <field name="name">Adóalap – Fordított ÁFA</field>
         <field name="tag_name">Adóalap – Fordított ÁFA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_viss_alanyi" model="account.tax.report.line">
         <field name="name">Adóalap - Visszaigényelhető ÁFA alanyi adómentes</field>
         <field name="tag_name">Adóalap - Visszaigényelhető ÁFA alanyi adómentes</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_viss_targyi" model="account.tax.report.line">
         <field name="name">Adóalap - Visszaigényelhető ÁFA tárgyi adómentes</field>
         <field name="tag_name">Adóalap - Visszaigényelhető ÁFA tárgyi adómentes</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_viss_5" model="account.tax.report.line">
         <field name="name">Adóalap - Visszaigényelhető ÁFA 5%</field>
         <field name="tag_name">Adóalap - Visszaigényelhető ÁFA 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="13"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_viss_18" model="account.tax.report.line">
         <field name="name">Adóalap - Visszaigényelhető ÁFA 18%</field>
         <field name="tag_name">Adóalap - Visszaigényelhető ÁFA 18%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="14"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_alap_viss_27" model="account.tax.report.line">
         <field name="name">Adóalap - Visszaigényelhető ÁFA 27%</field>
         <field name="tag_name">Adóalap - Visszaigényelhető ÁFA 27%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="15"/>
         <field name="parent_id" ref="tax_report_alap"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo" model="account.tax.report.line">
         <field name="name">ÁFA fizetndő / visszaigényelhető</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo_5" model="account.tax.report.line">
         <field name="name">Fizetendő ÁFA 5%</field>
         <field name="tag_name">Fizetendő ÁFA 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_fizetndo"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo_18" model="account.tax.report.line">
         <field name="name">Fizetendő ÁFA 18%</field>
         <field name="tag_name">Fizetendő ÁFA 18%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_fizetndo"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo_27" model="account.tax.report.line">
         <field name="name">Fizetendő ÁFA 27%</field>
         <field name="tag_name">Fizetendő ÁFA 27%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_fizetndo"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo_viss_5" model="account.tax.report.line">
         <field name="name">Visszaigényelhető ÁFA 5%</field>
         <field name="tag_name">Visszaigényelhető ÁFA 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_fizetndo"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo_viss_18" model="account.tax.report.line">
         <field name="name">Visszaigényelhető ÁFA 18%</field>
         <field name="tag_name">Visszaigényelhető ÁFA 18%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_fizetndo"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
     <record id="tax_report_fizetndo_viss_27" model="account.tax.report.line">
         <field name="name">Visszaigényelhető ÁFA 27%</field>
         <field name="tag_name">Visszaigényelhető ÁFA 27%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_fizetndo"/>
-        <field name="country_id" ref="base.hu"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_in/data/account_tax_template_data.xml b/addons/l10n_in/data/account_tax_template_data.xml
index 14276a504a6f9cf6e445c8d37b82a1225f20850c..1dcd8688047b2f9b4beecc91b3850429dd49ec14 100644
--- a/addons/l10n_in/data/account_tax_template_data.xml
+++ b/addons/l10n_in/data/account_tax_template_data.xml
@@ -1,64 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.in"/>
+    </record>
+
     <record id="tax_report_line_gst" model="account.tax.report.line">
         <field name="name">GST</field>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">1</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
     <record id="tax_report_line_igst_root" model="account.tax.report.line">
         <field name="name">IGST</field>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">2</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
     <record id="tax_report_line_gst_others" model="account.tax.report.line">
         <field name="name">Others</field>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">3</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_line_sgst" model="account.tax.report.line">
         <field name="name">SGST</field>
         <field name="tag_name">SGST</field>
         <field name="parent_id" ref="tax_report_line_gst"/>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">1</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
     <record id="tax_report_line_cgst" model="account.tax.report.line">
         <field name="name">CGST</field>
         <field name="tag_name">CGST</field>
         <field name="parent_id" ref="tax_report_line_gst"/>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">2</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_line_igst" model="account.tax.report.line">
         <field name="name">IGST</field>
         <field name="tag_name">IGST</field>
         <field name="parent_id" ref="tax_report_line_igst_root"/>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">3</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
     <record id="tax_report_line_cess" model="account.tax.report.line">
         <field name="name">CESS</field>
         <field name="tag_name">CESS</field>
         <field name="parent_id" ref="tax_report_line_gst_others"/>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">4</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
     <record id="tax_report_line_exempt" model="account.tax.report.line">
         <field name="name">Exempt</field>
         <field name="tag_name">Exempt</field>
         <field name="parent_id" ref="tax_report_line_gst_others"/>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">5</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
     <record id="tax_report_line_nil_rated" model="account.tax.report.line">
         <field name="name">Nil Rated</field>
         <field name="tag_name">Nil Rated</field>
         <field name="parent_id" ref="tax_report_line_gst_others"/>
-        <field name="country_id" ref="base.in"/>
         <field name="sequence">6</field>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
 
diff --git a/addons/l10n_jp/data/account_tax_report_data.xml b/addons/l10n_jp/data/account_tax_report_data.xml
index a822b13da646cc14d29e8d1477bb2c334f3b1fbf..66ba50d339ac4c8fea1fd3d6643786494ac48785 100644
--- a/addons/l10n_jp/data/account_tax_report_data.xml
+++ b/addons/l10n_jp/data/account_tax_report_data.xml
@@ -1,140 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.jp"/>
+    </record>
+
     <record id="tax_report_to_pay" model="account.tax.report.line">
         <field name="name">支払対象税額</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_to_pay_temp_tx" model="account.tax.report.line">
         <field name="name">仮受税額</field>
         <field name="parent_id" ref="tax_report_to_pay"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_to_pay_temp_tx_output_8" model="account.tax.report.line">
         <field name="name">仮受消費税(8%)</field>
         <field name="tag_name">仮受消費税(8%)</field>
         <field name="parent_id" ref="tax_report_to_pay_temp_tx"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_to_pay_temp_tx_duty_free" model="account.tax.report.line">
         <field name="name">免税</field>
         <field name="tag_name">免税</field>
         <field name="parent_id" ref="tax_report_to_pay_temp_tx"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <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="parent_id" ref="tax_report_to_pay_temp_tx"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_to_pay_temp_pmt" model="account.tax.report.line">
         <field name="name">仮払税額</field>
         <field name="parent_id" ref="tax_report_to_pay"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_to_pay_temp_pmt_susp_cons_8" model="account.tax.report.line">
         <field name="name">仮払消費税(8%)</field>
         <field name="tag_name">仮払消費税(8%)</field>
         <field name="parent_id" ref="tax_report_to_pay_temp_pmt"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_to_pay_temp_pmt_import_8" model="account.tax.report.line">
         <field name="name">輸入</field>
         <field name="tag_name">輸入</field>
         <field name="parent_id" ref="tax_report_to_pay_temp_pmt"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <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="parent_id" ref="tax_report_to_pay_temp_pmt"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis" model="account.tax.report.line">
         <field name="name">税計算基準額</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_sales" model="account.tax.report.line">
         <field name="name">販売基準額</field>
         <field name="parent_id" ref="tax_report_comp_basis"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_sales_taxable_8" model="account.tax.report.line">
         <field name="name">課税対象売上(8%)</field>
         <field name="tag_name">課税対象売上(8%)</field>
         <field name="parent_id" ref="tax_report_comp_basis_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_sales_duty_free" model="account.tax.report.line">
         <field name="name">免税売上</field>
         <field name="tag_name">免税売上</field>
         <field name="parent_id" ref="tax_report_comp_basis_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_sales_tax_free" model="account.tax.report.line">
         <field name="name">不課税売上</field>
         <field name="tag_name">不課税売上</field>
         <field name="parent_id" ref="tax_report_comp_basis_sales"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_purchases" model="account.tax.report.line">
         <field name="name">購買基準額</field>
         <field name="parent_id" ref="tax_report_comp_basis"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_purchases_taxable_8" model="account.tax.report.line">
         <field name="name">課税対象仕入(8%)</field>
         <field name="tag_name">課税対象仕入(8%)</field>
         <field name="parent_id" ref="tax_report_comp_basis_purchases"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">1</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_purchases_import" model="account.tax.report.line">
         <field name="name">輸入仕入</field>
         <field name="tag_name">輸入仕入</field>
         <field name="parent_id" ref="tax_report_comp_basis_purchases"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">2</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
     <record id="tax_report_comp_basis_purchases_tax_free" model="account.tax.report.line">
         <field name="name">不課税仕入</field>
         <field name="tag_name">不課税仕入</field>
         <field name="parent_id" ref="tax_report_comp_basis_purchases"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence">3</field>
-        <field name="country_id" ref="base.jp"/>
     </record>
 
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_lu/data/account_tax_report_line.xml b/addons/l10n_lu/data/account_tax_report_line.xml
index bb1f87b70430740065be561f04f508cacdf7312f..75735f295ff23764edbe82d7d78279f52b964ffc 100644
--- a/addons/l10n_lu/data/account_tax_report_line.xml
+++ b/addons/l10n_lu/data/account_tax_report_line.xml
@@ -1,24 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
+
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.lu"/>
+    </record>
+
     <record id="account_tax_report_line_2_assesment_of_tax_due" model="account.tax.report.line">
       <field name="name">II. ASSESSMENT OF TAX DUE (output tax)</field>
       <field name="sequence">2</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2b_intra_community_acqui_of_goods_base" model="account.tax.report.line">
       <field name="name">II.B. Intra-Community acquisitions of goods – base (051)</field>
       <field name="sequence">3</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2b_base_3" model="account.tax.report.line">
       <field name="name">II.B. base 3% (049)</field>
       <field name="tag_name">049</field>
       <field name="sequence">9</field>
-      <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
     </record>
 
 
@@ -26,712 +32,712 @@
       <field name="name">II.B. base exempt (194)</field>
       <field name="tag_name">194</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2b_base_17" model="account.tax.report.line">
       <field name="name">II.B. base 17% (711)</field>
       <field name="tag_name">711</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2b_base_14" model="account.tax.report.line">
       <field name="name">II.B. base 14% (713)</field>
       <field name="tag_name">713</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2b_base_8" model="account.tax.report.line">
       <field name="name">II.B. base 8% (715)</field>
       <field name="tag_name">715</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acqui_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_importation_of_goods_base" model="account.tax.report.line">
       <field name="name">II.D. Importation of goods – base (065)</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_base_exempt" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: base exempt (196)</field>
       <field name="tag_name">196</field>
       <field name="sequence">12</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_base_17" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: base 17% (721)</field>
       <field name="tag_name">721</field>
       <field name="sequence">3</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_base_14" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: base 14% (723)</field>
       <field name="tag_name">723</field>
       <field name="sequence">4</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_base_8" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: base 8% (725)</field>
       <field name="tag_name">725</field>
       <field name="sequence">5</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_base_17" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: base 17% (731)</field>
       <field name="tag_name">731</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_base_14" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: base 14% (733)</field>
       <field name="tag_name">733</field>
       <field name="sequence">9</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_base_8" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: base 8% (735)</field>
       <field name="tag_name">735</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_base_3" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: base 3% (059)</field>
       <field name="tag_name">059</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_base_3" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: base 3% (063)</field>
       <field name="tag_name">063</field>
       <field name="sequence">11</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_base_exempt" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: base exempt (195)</field>
       <field name="tag_name">195</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2c_acquisitions_triangular_transactions_base" model="account.tax.report.line">
       <field name="name">II.C. Acquisitions, in the context of triangular transactions – base (152)</field>
       <field name="tag_name">152</field>
       <field name="sequence">5</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2e_supply_of_service_for_customer" model="account.tax.report.line">
       <field name="name">II.E. Supply of services for which the customer is liable for the payment of VAT – base (409)</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_base" model="account.tax.report.line">
       <field name="name">II.E.1. base (436)</field>
       <field name="sequence">1</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_base_3" model="account.tax.report.line">
       <field name="name">II.E.1.a) not exempt within the territory: base 3% (431)</field>
       <field name="tag_name">431</field>
       <field name="sequence">9</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_b_exempt" model="account.tax.report.line">
       <field name="name">II.E.1.b) exempt within the territory: exempt (435)</field>
       <field name="tag_name">435</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_base_17" model="account.tax.report.line">
       <field name="name">II.E.1.a) not exempt within the territory: base 17% (741)</field>
       <field name="tag_name">741</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_base_14" model="account.tax.report.line">
       <field name="name">II.E.1.a) not exempt within the territory: base 14% (743)</field>
       <field name="tag_name">743</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_base_8" model="account.tax.report.line">
       <field name="name">II.E.1.a) not exempt within the territory: base 8% (745)</field>
       <field name="tag_name">745</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_1_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_base" model="account.tax.report.line">
       <field name="name">II.E.2. base (463)</field>
       <field name="sequence">2</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_base_3" model="account.tax.report.line">
       <field name="name">II.E.2. not established or residing within the Community: base 3% (441)</field>
       <field name="tag_name">441</field>
       <field name="sequence">9</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_exempt" model="account.tax.report.line">
       <field name="name">II.E.2. not established or residing within the Community: exempt (445)</field>
       <field name="tag_name">445</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_base_17" model="account.tax.report.line">
       <field name="name">II.E.2. not established or residing within the Community: base 17% (751)</field>
       <field name="tag_name">751</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_base_14" model="account.tax.report.line">
       <field name="name">II.E.2. not established or residing within the Community: base 14% (753)</field>
       <field name="tag_name">753</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_base_8" model="account.tax.report.line">
       <field name="name">II.E.2. not established or residing within the Community: base 8% (755)</field>
       <field name="tag_name">755</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_2_base"/>
     </record>
 
     <record id="account_tax_report_line_2e_3_base" model="account.tax.report.line">
       <field name="name">II.E.3. base (765)</field>
       <field name="sequence">3</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer"/>
     </record>
 
     <record id="account_tax_report_line_2e_3_base_17" model="account.tax.report.line">
       <field name="name">II.E.3. suppliers established within the territory: base 17% (761)</field>
       <field name="tag_name">761</field>
       <field name="sequence">1</field>
-      <field name="parent_id" ref="account_tax_report_line_2e_3_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2e_3_base"/>
     </record>
 
     <record id="account_tax_report_line_1_assessment_taxable_turnover" model="account.tax.report.line">
       <field name="name">I. ASSESSMENT OF TAXABLE TURNOVER</field>
       <field name="sequence">1</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_1a_overall_turnover" model="account.tax.report.line">
       <field name="name">I.A. Overall turnover (012)</field>
       <field name="sequence">1</field>
-      <field name="parent_id" ref="account_tax_report_line_1_assessment_taxable_turnover"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1_assessment_taxable_turnover"/>
     </record>
 
     <record id="account_tax_report_line_1a_vat_acc_scheme" model="account.tax.report.line">
         <field name="name">I.A.1. VAT accounting scheme</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_1a_overall_turnover"/>
-        <field name="country_id" ref="base.lu"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_1a_total_sale" model="account.tax.report.line">
         <field name="name">I.A.2. Total Sales / Receipts (454)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_1a_overall_turnover"/>
-        <field name="country_id" ref="base.lu"/>
-    </record>
+        <field name="report_id" ref="tax_report"/>
+      </record>
 
     <record id="account_tax_report_line_1a_telecom_service" model="account.tax.report.line">
         <field name="name">I.A.2.a). Telecommunications services, radio and television broadcasting services... (471)</field>
         <field name="tag_name">471</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_1a_total_sale"/>
-        <field name="country_id" ref="base.lu"/>
-    </record>
+        <field name="report_id" ref="tax_report"/>
+      </record>
 
     <record id="account_tax_report_line_1a_other_sales" model="account.tax.report.line">
         <field name="name">I.A.2.b). Other sales / receipts (472)</field>
         <field name="tag_name">472</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_1a_total_sale"/>
-        <field name="country_id" ref="base.lu"/>
-    </record>
+        <field name="report_id" ref="tax_report"/>
+      </record>
 
     <record id="account_tax_report_line_1a_app_goods_non_bus" model="account.tax.report.line">
         <field name="name">I.A.3. Application of goods for non-business use and for business purposes (Art.13) (455)</field>
         <field name="tag_name">455</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_1a_overall_turnover"/>
-        <field name="country_id" ref="base.lu"/>
-    </record>
+        <field name="report_id" ref="tax_report"/>
+      </record>
 
     <record id="account_tax_report_line_1a_non_bus_gs" model="account.tax.report.line">
         <field name="name">I.A.4. Non-business use of goods and supply of services free of charge (Art.16) (456)</field>
         <field name="tag_name">456</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_1a_overall_turnover"/>
-        <field name="country_id" ref="base.lu"/>
-    </record>
+        <field name="report_id" ref="tax_report"/>
+      </record>
 
     <record id="account_tax_report_line_1b_exemptions_deductible_amounts" model="account.tax.report.line">
       <field name="name">I.B. Exemptions and deductible amounts (021)</field>
       <field name="sequence">2</field>
-      <field name="parent_id" ref="account_tax_report_line_1_assessment_taxable_turnover"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1_assessment_taxable_turnover"/>
     </record>
 
     <record id="account_tax_report_line_1b_2_export" model="account.tax.report.line">
       <field name="name">I.B.2. Exports (Art.43(1)(a) and (b)) (014)</field>
       <field name="tag_name">014</field>
       <field name="sequence">2</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_1_intra_community_goods_pi_vat" model="account.tax.report.line">
       <field name="name">I.B.1. Intra-Community supply of goods to persons identified for VAT purposes in another Member State (MS) (Art.43(1)(d),(e) and (f)) (3) (457)</field>
       <field name="tag_name">457</field>
       <field name="sequence">1</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_3_other_exemptions_art_43" model="account.tax.report.line">
       <field name="name">I.B.3. Other exemptions (Art.43 and 60bis) (015)</field>
       <field name="tag_name">015</field>
       <field name="sequence">3</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater" model="account.tax.report.line">
       <field name="name">I.B.4. Other exemptions (Art.44 and 56quater) (016)</field>
       <field name="tag_name">016</field>
       <field name="sequence">4</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_5_manufactured_tobacco_vat_collected" model="account.tax.report.line">
       <field name="name">I.B.5. Manufactured tobacco whose VAT was collected at the source or at the exit of the tax... (017)</field>
       <field name="tag_name">017</field>
       <field name="sequence">5</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_6_a_subsequent_to_intra_community" model="account.tax.report.line">
       <field name="name">I.B.6.a) Supply, subsequent to intra-Community acquisitions of goods, in the context of triangular transactions, when the customer identified,... (018)</field>
       <field name="tag_name">018</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_6_b1_non_exempt_customer_vat" model="account.tax.report.line">
       <field name="name">I.B.6.b)1) not exempt in the MS where the customer is liable for payment of VAT (Art.17(1)(b)) (5) (423)</field>
       <field name="tag_name">423</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_6_b2_exempt_ms_customer" model="account.tax.report.line">
       <field name="name">I.B.6.b)2) exempt in the MS where the customer is identified (Art.17(1)(b)) (424)</field>
       <field name="tag_name">424</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_6_c_supplies_scope_special_arrangement" model="account.tax.report.line">
       <field name="name">I.B.6.c) Supplies carried out within the scope of the special arrangement of art. 56sexies (226)</field>
       <field name="tag_name">226</field>
       <field name="sequence">9</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_6_d_supplies_other_referred" model="account.tax.report.line">
       <field name="name">I.B.6.d) Supplies other than referred to in (6)(a) and (6)(b) (019)</field>
       <field name="tag_name">019</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1b_7_inland_supplies_for_customer" model="account.tax.report.line">
       <field name="name">I.B.7. Inland supplies for which the customer is liable for the payment of VAT (419)</field>
       <field name="tag_name">419</field>
       <field name="sequence">11</field>
-      <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1b_exemptions_deductible_amounts"/>
     </record>
 
     <record id="account_tax_report_line_1c_taxable_turnover" model="account.tax.report.line">
       <field name="name">I.C. Taxable turnover (022)</field>
       <field name="tag_name">022</field>
       <field name="sequence">3</field>
-      <field name="parent_id" ref="account_tax_report_line_1_assessment_taxable_turnover"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_1_assessment_taxable_turnover"/>
     </record>
 
     <record id="account_tax_report_line_2a_breakdown_taxable_turnover_base" model="account.tax.report.line">
       <field name="name">II.A. Breakdown of taxable turnover – base (037)</field>
       <field name="sequence">1</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2a_base_3" model="account.tax.report.line">
       <field name="name">II.A. base 3% (031)</field>
       <field name="tag_name">031</field>
       <field name="sequence">9</field>
-      <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
     </record>
 
     <record id="account_tax_report_line_2a_base_0" model="account.tax.report.line">
       <field name="name">II.A. base 0%</field>
       <field name="tag_name">II.A. base 0%</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
     </record>
 
     <record id="account_tax_report_line_2a_base_17" model="account.tax.report.line">
       <field name="name">II.A. base 17% (701)</field>
       <field name="tag_name">701</field>
       <field name="sequence">6</field>
-      <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
     </record>
 
     <record id="account_tax_report_line_2a_base_14" model="account.tax.report.line">
       <field name="name">II.A. base 14% (703)</field>
       <field name="tag_name">703</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
     </record>
 
     <record id="account_tax_report_line_2a_base_8" model="account.tax.report.line">
       <field name="name">II.A. base 8% (705)</field>
       <field name="tag_name">705</field>
       <field name="sequence">8</field>
-      <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_base"/>
     </record>
 
     <record id="account_tax_report_line_4_tax_tobe_paid_or_reclaimed" model="account.tax.report.line">
       <field name="name">IV. TAX TO BE PAID OR TO BE RECLAIMED</field>
       <field name="sequence">4</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_4c_exceeding_amount" model="account.tax.report.line">
       <field name="name">IV.C. Exceeding amount (105)</field>
       <field name="sequence">3</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_4_tax_tobe_paid_or_reclaimed"/>
       <field name="formula">(LUTAX_702+LUTAX_704+LUTAX_706+LUTAX_040+LUTAX_IIA+LUTAX_712+LUTAX_714+LUTAX_716+LUTAX_054+LUTAX_722+LUTAX_724+LUTAX_726+LUTAX_068+LUTAX_732+LUTAX_734+LUTAX_736+LUTAX_073+LUTAX_742+LUTAX_744+LUTAX_746+LUTAX_432+LUTAX_752+LUTAX_754+LUTAX_756+LUTAX_442+LUTAX_762+LUTAX_764+LUTAX_227)-(LUTAX_458+LUTAX_459+LUTAX_460+LUTAX_090+LUTAX_461+LUTAX_092+LUTAX_228+LUTAX_094+LUTAX_095)</field>
-      <field name="country_id" ref="base.lu"/>
-    </record>
+  </record>
 
     <!-- Note: this should have same formula as of section `II.H. Total tax due (076)` here above -->
     <record id="account_tax_report_line_4a_total_tax_due" model="account.tax.report.line">
       <field name="name">IV.A. Total tax due (103)</field>
       <field name="sequence">1</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_4_tax_tobe_paid_or_reclaimed"/>
       <field name="formula">LUTAX_702+LUTAX_704+LUTAX_706+LUTAX_040+LUTAX_IIA+LUTAX_712+LUTAX_714+LUTAX_716+LUTAX_054+LUTAX_722+LUTAX_724+LUTAX_726+LUTAX_068+LUTAX_732+LUTAX_734+LUTAX_736+LUTAX_073+LUTAX_742+LUTAX_744+LUTAX_746+LUTAX_432+LUTAX_752+LUTAX_754+LUTAX_756+LUTAX_442+LUTAX_762+LUTAX_764+LUTAX_227</field>
-      <field name="country_id" ref="base.lu"/>
-    </record>
+  </record>
 
     <record id="account_tax_report_line_2f_supply_goods_base" model="account.tax.report.line">
       <field name="name">II.F. Supply of goods for which the purchaser is liable for the payment of VAT - base (767)</field>
       <field name="sequence">10</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2f_supply_goods_base_8" model="account.tax.report.line">
       <field name="name">II.F. base 8% (763)</field>
       <field name="tag_name">763</field>
       <field name="sequence">1</field>
-      <field name="parent_id" ref="account_tax_report_line_2f_supply_goods_base"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2f_supply_goods_base"/>
     </record>
 
     <record id="account_tax_report_line_2f_supply_goods_tax" model="account.tax.report.line">
       <field name="name">II.F. Supply of goods for which the purchaser is liable for the payment of VAT - tax (768)</field>
       <field name="sequence">11</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2f_supply_goods_tax_8" model="account.tax.report.line">
       <field name="name">II.F. tax 8% (764)</field>
       <field name="tag_name">764</field>
       <field name="sequence">1</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2f_supply_goods_tax"/>
       <field name="code">LUTAX_764</field>
-      <field name="country_id" ref="base.lu"/>
-    </record>
+  </record>
 
     <record id="account_tax_report_line_2g_special_arrangement" model="account.tax.report.line">
       <field name="name">II.G. Special arrangement for tax suspension: adjustment (Art.60bis, (5) and (8)) (227)</field>
       <field name="tag_name">227</field>
       <field name="sequence">12</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
       <field name="code">LUTAX_227</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <!-- Note: any change in formula here should be reflected in section `IV.A. Total tax due (103)` below -->
     <record id="account_tax_report_line_2h_total_tax_due" model="account.tax.report.line">
       <field name="name">II.H. Total tax due (076)</field>
       <field name="sequence">13</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
       <field name="formula">LUTAX_702+LUTAX_704+LUTAX_706+LUTAX_040+LUTAX_IIA+LUTAX_712+LUTAX_714+LUTAX_716+LUTAX_054+LUTAX_722+LUTAX_724+LUTAX_726+LUTAX_068+LUTAX_732+LUTAX_734+LUTAX_736+LUTAX_073+LUTAX_742+LUTAX_744+LUTAX_746+LUTAX_432+LUTAX_752+LUTAX_754+LUTAX_756+LUTAX_442+LUTAX_762+LUTAX_764+LUTAX_227</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2a_breakdown_taxable_turnover_tax" model="account.tax.report.line">
       <field name="name">II.A. Breakdown of taxable turnover – tax (046)</field>
       <field name="sequence">2</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2a_tax_3" model="account.tax.report.line">
       <field name="name">II.A. tax 3% (040)</field>
       <field name="tag_name">040</field>
       <field name="sequence">9</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
       <field name="code">LUTAX_040</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2a_tax_0" model="account.tax.report.line">
       <field name="name">II.A. tax 0%</field>
       <field name="tag_name">II.A. tax 0%</field>
       <field name="sequence">10</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
       <field name="code">LUTAX_IIA</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2a_tax_17" model="account.tax.report.line">
       <field name="name">II.A. tax 17% (702)</field>
       <field name="tag_name">702</field>
       <field name="sequence">6</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
       <field name="code">LUTAX_702</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2a_tax_14" model="account.tax.report.line">
       <field name="name">II.A. tax 14% (704)</field>
       <field name="tag_name">704</field>
       <field name="sequence">7</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
       <field name="code">LUTAX_704</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2a_tax_8" model="account.tax.report.line">
       <field name="name">II.A. tax 8% (706)</field>
       <field name="tag_name">706</field>
       <field name="sequence">8</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2a_breakdown_taxable_turnover_tax"/>
       <field name="code">LUTAX_706</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2b_intra_community_acquisitions_goods_tax" model="account.tax.report.line">
       <field name="name">II.B. Intra-Community acquisitions of goods – tax (056)</field>
       <field name="sequence">4</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2b_tax_3" model="account.tax.report.line">
       <field name="name">II.B. tax 3% (054)</field>
       <field name="tag_name">054</field>
       <field name="sequence">8</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
       <field name="code">LUTAX_054</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2b_tax_17" model="account.tax.report.line">
       <field name="name">II.B. tax 17% (712)</field>
       <field name="tag_name">712</field>
       <field name="sequence">5</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
       <field name="code">LUTAX_712</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2b_tax_14" model="account.tax.report.line">
       <field name="name">II.B. tax 14% (714)</field>
       <field name="tag_name">714</field>
       <field name="sequence">6</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
       <field name="code">LUTAX_714</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2b_tax_8" model="account.tax.report.line">
       <field name="name">II.B. tax 8% (716)</field>
       <field name="tag_name">716</field>
       <field name="sequence">7</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2b_intra_community_acquisitions_goods_tax"/>
       <field name="code">LUTAX_716</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_importation_of_goods_tax" model="account.tax.report.line">
       <field name="name">II.D. Importation of goods – tax (407)</field>
       <field name="sequence">7</field>
-      <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
+        <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_tax_14" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: tax 14% (724)</field>
       <field name="tag_name">724</field>
       <field name="sequence">2</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_724</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_tax_8" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: tax 8% (726)</field>
       <field name="tag_name">726</field>
       <field name="sequence">3</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_726</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_tax_17" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: tax 17% (732)</field>
       <field name="tag_name">732</field>
       <field name="sequence">5</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_732</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_tax_14" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: tax 14% (734)</field>
       <field name="tag_name">734</field>
       <field name="sequence">6</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_734</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_tax_8" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: tax 8% (736)</field>
       <field name="tag_name">736</field>
       <field name="sequence">7</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_736</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_tax_3" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: tax 3% (068)</field>
       <field name="tag_name">068</field>
       <field name="sequence">4</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_068</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_2_tax_3" model="account.tax.report.line">
       <field name="name">II.D.2. for non-business purposes: tax 3% (073)</field>
       <field name="tag_name">073</field>
       <field name="sequence">8</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_073</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2d_1_tax_17" model="account.tax.report.line">
       <field name="name">II.D.1. for business purposes: tax 17% (722)</field>
       <field name="tag_name">722</field>
       <field name="sequence">1</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2d_importation_of_goods_tax"/>
       <field name="code">LUTAX_722</field>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax" model="account.tax.report.line">
       <field name="name">II.E. Supply of services for which the customer is liable for the payment of VAT – tax (410)</field>
       <field name="sequence">9</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2_assesment_of_tax_due"/>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_tax" model="account.tax.report.line">
       <field name="name">II.E.1.a) tax (462)</field>
       <field name="sequence">1</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax"/>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_tax_3" model="account.tax.report.line">
@@ -740,7 +746,7 @@
       <field name="sequence">8</field>
       <field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
       <field name="code">LUTAX_432</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_tax_17" model="account.tax.report.line">
@@ -749,7 +755,7 @@
       <field name="sequence">5</field>
       <field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
       <field name="code">LUTAX_742</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_tax_14" model="account.tax.report.line">
@@ -758,7 +764,7 @@
       <field name="sequence">6</field>
       <field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
       <field name="code">LUTAX_744</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_1_a_tax_8" model="account.tax.report.line">
@@ -767,14 +773,14 @@
       <field name="sequence">7</field>
       <field name="parent_id" ref="account_tax_report_line_2e_1_a_tax"/>
       <field name="code">LUTAX_746</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_tax" model="account.tax.report.line">
       <field name="name">II.E.2. tax (464)</field>
       <field name="sequence">2</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax"/>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_tax_3" model="account.tax.report.line">
@@ -783,7 +789,7 @@
       <field name="sequence">8</field>
       <field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
       <field name="code">LUTAX_442</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_tax_17" model="account.tax.report.line">
@@ -792,7 +798,7 @@
       <field name="sequence">5</field>
       <field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
       <field name="code">LUTAX_752</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_tax_14" model="account.tax.report.line">
@@ -801,7 +807,7 @@
       <field name="sequence">6</field>
       <field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
       <field name="code">LUTAX_754</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_2_tax_8" model="account.tax.report.line">
@@ -810,14 +816,14 @@
       <field name="sequence">7</field>
       <field name="parent_id" ref="account_tax_report_line_2e_2_tax"/>
       <field name="code">LUTAX_756</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_2e_3_tax" model="account.tax.report.line">
       <field name="name">II.E.3. tax (766)</field>
       <field name="sequence">3</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax"/>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_2e_3_tax_17" model="account.tax.report.line">
@@ -826,7 +832,7 @@
       <field name="sequence">2</field>
       <field name="parent_id" ref="account_tax_report_line_2e_3_tax"/>
       <field name="code">LUTAX_762</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <!-- Note: this should have same formula as of section `III.C. Total input tax deductible (102)` here below -->
@@ -835,27 +841,27 @@
       <field name="sequence">2</field>
       <field name="parent_id" ref="account_tax_report_line_4_tax_tobe_paid_or_reclaimed"/>
       <field name="formula">LUTAX_458+LUTAX_459+LUTAX_460+LUTAX_090+LUTAX_461+LUTAX_092+LUTAX_228+LUTAX_094+LUTAX_095</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3_assessment_deducible_tax" model="account.tax.report.line">
       <field name="name">III. ASSESSMENT OF DEDUCTIBLE TAX (input tax)</field>
       <field name="sequence">3</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_total_input_tax" model="account.tax.report.line">
       <field name="name">III.A. Total input tax (093)</field>
       <field name="sequence">1</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_3_assessment_deducible_tax"/>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_3b_total_input_tax_nd" model="account.tax.report.line">
       <field name="name">III.B. Total input tax non-deductible (097)</field>
       <field name="sequence">2</field>
+      <field name="report_id" ref="tax_report"/>
       <field name="parent_id" ref="account_tax_report_line_3_assessment_deducible_tax"/>
-      <field name="country_id" ref="base.lu"/>
     </record>
 
     <record id="account_tax_report_line_3b1_rel_trans" model="account.tax.report.line">
@@ -863,8 +869,7 @@
       <field name="sequence">1</field>
       <field name="parent_id" ref="account_tax_report_line_3b_total_input_tax_nd"/>
       <field name="code">LUTAX_094</field>
-      <field name="country_id" ref="base.lu"/>
-      <field name="code">LUTAX_094</field>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3b2_ded_prop" model="account.tax.report.line">
@@ -872,7 +877,7 @@
       <field name="sequence">2</field>
       <field name="parent_id" ref="account_tax_report_line_3b_total_input_tax_nd"/>
       <field name="code">LUTAX_095</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <!-- Note: any change in formula here should be reflected in section `IV.B. Total input tax deductible (104)` above -->
@@ -881,7 +886,7 @@
       <field name="sequence">3</field>
       <field name="parent_id" ref="account_tax_report_line_3_assessment_deducible_tax"/>
       <field name="formula">LUTAX_458+LUTAX_459+LUTAX_460+LUTAX_090+LUTAX_461+LUTAX_092+LUTAX_228+LUTAX_094+LUTAX_095</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_4_due_respect_application_goods" model="account.tax.report.line">
@@ -890,7 +895,7 @@
       <field name="sequence">4</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_090</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_6_paid_joint_several_guarantee" model="account.tax.report.line">
@@ -899,7 +904,7 @@
       <field name="sequence">6</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_092</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_7_adjusted_tax_special_arrangement" model="account.tax.report.line">
@@ -908,7 +913,7 @@
       <field name="sequence">7</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_228</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_1_invoiced_by_other_taxable_person" model="account.tax.report.line">
@@ -917,7 +922,7 @@
       <field name="sequence">1</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_458</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_2_due_respect_intra_comm_goods" model="account.tax.report.line">
@@ -926,7 +931,7 @@
       <field name="sequence">2</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_459</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_3_due_paid_respect_importation_goods" model="account.tax.report.line">
@@ -935,7 +940,7 @@
       <field name="sequence">3</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_460</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_3a_5_due_under_reverse_charge" model="account.tax.report.line">
@@ -944,7 +949,7 @@
       <field name="sequence">5</field>
       <field name="parent_id" ref="account_tax_report_line_3a_total_input_tax"/>
       <field name="code">LUTAX_461</field>
-      <field name="country_id" ref="base.lu"/>
+      <field name="report_id" ref="tax_report"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_ma/data/account_tax_report_data.xml b/addons/l10n_ma/data/account_tax_report_data.xml
index 220bad623802a0b7249f2102b45ae6d6c764a54f..04e928290ade56ef55f044b3abb1a4fdb9715042 100644
--- a/addons/l10n_ma/data/account_tax_report_data.xml
+++ b/addons/l10n_ma/data/account_tax_report_data.xml
@@ -1,301 +1,306 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.ma"/>
+    </record>
+
     <record id="tax_report_ventilation_chiffre_affaires_imposable" model="account.tax.report.line">
         <field name="name">Ventilation du chiffre d’affaires imposable</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_taux_normal_20" model="account.tax.report.line">
         <field name="name">TAUX NORMAL DE 20% (Base HT)</field>
         <field name="tag_name">TAUX NORMAL DE 20% (Base HT)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="code">MATAXB_1</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_taux_normal_tva_20" model="account.tax.report.line">
         <field name="name">TAUX NORMAL DE 20% (TVA exigible)</field>
         <field name="tag_name">TAUX NORMAL DE 20% (TVA exigible)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="code">MATAXB_2</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
      <record id="tax_report_tauz_reduit_ht_14" model="account.tax.report.line">
         <field name="name">TAUX REDUIT DE 14% (Base HT)</field>
         <field name="tag_name">TAUX REDUIT DE 14% (Base HT)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="code">MATAXB_3</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_taux_rediut_tva_14" model="account.tax.report.line">
         <field name="name">TAUX REDUIT DE 14% (TVA exigible)</field>
         <field name="tag_name">TAUX REDUIT DE 14% (TVA exigible)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="code">MATAXB_4</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="account_report_taux_reduit_base_ht_10" model="account.tax.report.line">
         <field name="name">TAUX REDUIT DE 1O% (Base HT)</field>
         <field name="tag_name">TAUX REDUIT DE 1O% (Base HT)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="code">MATAXB_5</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_taux_reduit_tva_10" model="account.tax.report.line">
         <field name="name">TAUX REDUIT DE 1O% (TVA exigible)</field>
         <field name="tag_name">TAUX REDUIT DE 1O% (TVA exigible)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="code">MATAXB_6</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_taux_reduit_ht_7" model="account.tax.report.line">
         <field name="name">TAUX REDUIT DE 7% (Base HT)</field>
         <field name="tag_name">TAUX REDUIT DE 7% (Base HT)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="code">MATAXB_7</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_taux_reduit_tva_7" model="account.tax.report.line">
         <field name="name">TAUX REDUIT DE 7% (TVA exigible)</field>
         <field name="tag_name">TAUX REDUIT DE 7% (TVA exigible)</field>
         <field name="parent_id" ref="tax_report_ventilation_chiffre_affaires_imposable"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="code">MATAXB_8</field>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_ventilation_des_deductions" model="account.tax.report.line">
         <field name="name">Ventilation des déductions</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_non_immobilises_ht" model="account.tax.report.line">
         <field name="name">1-ACHATS NON IMMOBILISES (Base HT)</field>
         <field name="parent_id" ref="tax_report_ventilation_des_deductions"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_travaux_facons_ht" model="account.tax.report.line">
         <field name="name">Travaux à façons (HT)</field>
         <field name="parent_id" ref="tax_report_achats_non_immobilises_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_sous_traitance_immobiliers_ht" model="account.tax.report.line">
         <field name="name">Sous-traitance (travaux immobiliers) (HT)</field>
         <field name="parent_id" ref="tax_report_achats_non_immobilises_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_biens_materiels_ht" model="account.tax.report.line">
         <field name="name">Biens matériels (Base HT)</field>
         <field name="parent_id" ref="tax_report_achats_non_immobilises_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_importation_ht_20" model="account.tax.report.line">
         <field name="name">Achats à l'importation (20%) (HT)</field>
         <field name="tag_name">Achats à l'importation (20%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_ht_20" model="account.tax.report.line">
         <field name="name">Achats à l'intérieur (20%) (HT)</field>
         <field name="tag_name">Achats à l'intérieur (20%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_importation_ht_14" model="account.tax.report.line">
         <field name="name">Achats à l'importation (14%) (HT)</field>
         <field name="tag_name">Achats à l'importation (14%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_ht_14" model="account.tax.report.line">
         <field name="name">Achats à l'intérieur (14%) (HT)</field>
         <field name="tag_name">Achats à l'intérieur (14%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <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"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_ht_10" model="account.tax.report.line">
         <field name="name">Achats à l'intérieur (10%) (HT)</field>
         <field name="tag_name">Achats à l'intérieur (10%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achat_importation_ht_7" model="account.tax.report.line">
         <field name="name">Achat à l'importation (7%) (HT)</field>
         <field name="tag_name">Achat à l'importation (7%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_ht_7" model="account.tax.report.line">
         <field name="name">Achat à l'intérieur (7%) (HT)</field>
         <field name="tag_name">Achat à l'intérieur (7%) (HT)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_prestations_services_ht_1" model="account.tax.report.line">
         <field name="name">Prestations de services (Base HT)</field>
         <field name="parent_id" ref="tax_report_achats_non_immobilises_ht"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_immobilises_deductible_tva" model="account.tax.report.line">
         <field name="name">1-ACHATS NON IMMOBILISES (TVA déductible)</field>
         <field name="parent_id" ref="tax_report_ventilation_des_deductions"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_travaux_facons_tva" model="account.tax.report.line">
         <field name="name">Travaux à façons (TVA déductible)</field>
         <field name="parent_id" ref="tax_report_achats_immobilises_deductible_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_sous_traitance_immobiliers_tva" model="account.tax.report.line">
         <field name="name">Sous-traitance (travaux immobiliers) (TVA déductible)</field>
         <field name="parent_id" ref="tax_report_achats_immobilises_deductible_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_biens_materiels_tva" model="account.tax.report.line">
         <field name="name">Biens matériels (TVA déductible)</field>
         <field name="parent_id" ref="tax_report_achats_immobilises_deductible_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_importation_tva_20" model="account.tax.report.line">
         <field name="name">Achats à l'importation (20%) (TVA)</field>
         <field name="tag_name">Achats à l'importation (20%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_tva_20" model="account.tax.report.line">
         <field name="name">Achats à l'intérieur (20%) (TVA)</field>
         <field name="tag_name">Achats à l'intérieur (20%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_importation_tva_14" model="account.tax.report.line">
         <field name="name">Achats à l'importation (14%) (TVA)</field>
         <field name="tag_name">Achats à l'importation (14%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_tva_14" model="account.tax.report.line">
         <field name="name">Achats à l'intérieur (14%) (TVA)</field>
         <field name="tag_name">Achats à l'intérieur (14%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_importation_tva_10" model="account.tax.report.line">
         <field name="name">Achats à l'importation (10%) (TVA)</field>
         <field name="tag_name">Achats à l'importation (10%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_tva_10" model="account.tax.report.line">
         <field name="name">Achats à l'intérieur (10%) (TVA)</field>
         <field name="tag_name">Achats à l'intérieur (10%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_importation_tva_7" model="account.tax.report.line">
         <field name="name">Achat à l'importation (7%) (TVA)</field>
         <field name="tag_name">Achat à l'importation (7%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_achats_interieur_tva_7" model="account.tax.report.line">
         <field name="name">Achat à l'intérieur (7%) (TVA)</field>
         <field name="tag_name">Achat à l'intérieur (7%) (TVA)</field>
         <field name="parent_id" ref="tax_report_biens_materiels_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_prestations_service_deductible_tva" model="account.tax.report.line">
         <field name="name">Prestations de services (TVA déductible)</field>
         <field name="parent_id" ref="tax_report_achats_immobilises_deductible_tva"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_immobilisations_base_ht" model="account.tax.report.line">
         <field name="name">2-IMMOBILISATIONS (Base HT)</field>
         <field name="tag_name">Immobilisations (Base HT)</field>
         <field name="parent_id" ref="tax_report_ventilation_des_deductions"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 
     <record id="tax_report_immobilisations_deductible_tva" model="account.tax.report.line">
         <field name="name">2-IMMOBILISATIONS (TVA déductible)</field>
         <field name="tag_name">Immobilisations (TVA déductible)</field>
         <field name="parent_id" ref="tax_report_ventilation_des_deductions"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ma"/>
     </record>
 </odoo>
diff --git a/addons/l10n_nl/data/account_tax_report_data.xml b/addons/l10n_nl/data/account_tax_report_data.xml
index f6cd13d6336fad4218e74c122562ea60a9f2f378..25cef8a02b8b0b69d4f466e06735adea7507dc70 100644
--- a/addons/l10n_nl/data/account_tax_report_data.xml
+++ b/addons/l10n_nl/data/account_tax_report_data.xml
@@ -1,270 +1,275 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.nl"/>
+    </record>
+
     <record id="tax_report_rub_1" model="account.tax.report.line">
         <field name="name">Rubriek 1: Prestaties binnenland</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_1a" model="account.tax.report.line">
         <field name="name">1a. Leveringen/diensten belast met hoog tarief (omzet)</field>
         <field name="tag_name">1a (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_1b" model="account.tax.report.line">
         <field name="name">1b. Leveringen/diensten belast met laag tarief (omzet)</field>
         <field name="tag_name">1b (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_rub_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_1c" model="account.tax.report.line">
         <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (omzet)</field>
         <field name="tag_name">1c (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_rub_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_1d" model="account.tax.report.line">
         <field name="name">1d. Privégebruik (omzet)</field>
         <field name="tag_name">1d (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_rub_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_1e" model="account.tax.report.line">
         <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (omzet)</field>
         <field name="tag_name">1e (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_rub_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_2" model="account.tax.report.line">
         <field name="name">Rubriek 2: Verleggingsregelingen binnenland (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_2a" model="account.tax.report.line">
         <field name="name">2a. Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
         <field name="tag_name">2a (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_2"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_3" model="account.tax.report.line">
         <field name="name">Rubriek 3: Prestaties naar of in het buitenland (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_3a" model="account.tax.report.line">
         <field name="name">3a. Leveringen naar landen buiten de EU (uitvoer) (omzet)</field>
         <field name="tag_name">3a (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_3"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_3b" model="account.tax.report.line">
         <field name="name">3b. Leveringen naar/diensten in landen binnen de EU (omzet)</field>
         <field name="tag_name">3b (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_rub_3"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_3c" model="account.tax.report.line">
         <field name="name">3c. Installatie/afstandsverkopen binnen de EU (omzet)</field>
         <field name="tag_name">3c (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_rub_3"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_4" model="account.tax.report.line">
         <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_4a" model="account.tax.report.line">
         <field name="name">4a. Leveringen/diensten uit landen buiten de EU (invoer) (omzet)</field>
         <field name="tag_name">4a (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_4"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_4b" model="account.tax.report.line">
         <field name="name">4b. Leveringen/diensten uit landen binnen de EU (omzet)</field>
         <field name="tag_name">4b (omzet)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_rub_4"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_1" model="account.tax.report.line">
         <field name="code">NLTAX_B1</field>
         <field name="name">Rubriek 1: Prestaties binnenland (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_1a" model="account.tax.report.line">
         <field name="name">1a. Leveringen/diensten belast met 21% (BTW)</field>
         <field name="tag_name">1a (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_btw_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_1b" model="account.tax.report.line">
         <field name="name">1b. Leveringen/diensten belast met laag tarief (BTW)</field>
         <field name="tag_name">1b (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_rub_btw_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_1c" model="account.tax.report.line">
         <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (BTW)</field>
         <field name="tag_name">1c (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_rub_btw_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_1d" model="account.tax.report.line">
         <field name="name">1d. Privégebruik (BTW)</field>
         <field name="tag_name">1d (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_rub_btw_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_1e" model="account.tax.report.line">
         <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (BTW)</field>
         <field name="tag_name">1e (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_rub_btw_1"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_2" model="account.tax.report.line">
         <field name="name">Rubriek 2: Verleggingsregelingen binnenland (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_2a" model="account.tax.report.line">
         <field name="name">2a. Leveringen/diensten waarbij de heffing van Heffing van omzetbelasting naar u is verlegd (BTW)</field>
         <field name="code">NLTAX_B2</field>
         <field name="tag_name">2a (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_btw_2"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_4" model="account.tax.report.line">
         <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_4a" model="account.tax.report.line">
         <field name="name">4a. Leveringen/diensten uit landen buiten de EU (BTW)</field>
         <field name="tag_name">4a (BTW)</field>
         <field name="code">NLTAX_B4a</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_btw_4"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_4b" model="account.tax.report.line">
         <field name="name">4b. Leveringen/diensten uit landen binnen de EU (BTW)</field>
         <field name="tag_name">4b (BTW)</field>
         <field name="code">NLTAX_B4b</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_rub_btw_4"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5" model="account.tax.report.line">
         <field name="name">Rubriek 5: Voorbelasting, kleineondernemersregeling en totaal (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5a" model="account.tax.report.line">
         <field name="name">5a. Verschuldigde omzetbelasting (rubrieken 1a t/m 4b) (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
         <field name="formula">NLTAX_B1 + NLTAX_B2 + abs(NLTAX_B4a) + abs(NLTAX_B4b)</field>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5b" model="account.tax.report.line">
         <field name="code">NLTAX_B5b</field>
         <field name="name">5b. Voorbelasting (BTW)</field>
         <field name="tag_name">5b (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5c" model="account.tax.report.line">
         <field name="code"></field>
         <field name="name">5c. Subtotaal (rubriek 5a min 5b) (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="formula">NLTAX_B1 + NLTAX_B2 + NLTAX_B4a + NLTAX_B4b - NLTAX_B5b</field>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5d" model="account.tax.report.line">
         <field name="code">NLTAX_B5d</field>
         <field name="name">5d. Vermindering volgens de kleineondernemersregeling (BTW)</field>
         <field name="tag_name">5d. (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5e" model="account.tax.report.line">
         <field name="code">NLTAX_B5e</field>
         <field name="name">5e. Schatting vorige aangifte(n) (BTW)</field>
         <field name="tag_name">5e. (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5f" model="account.tax.report.line">
         <field name="code">NLTAX_B5f</field>
         <field name="name">5f. Schatting deze aangifte (BTW)</field>
         <field name="tag_name">5f. (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
     <record id="tax_report_rub_btw_5g" model="account.tax.report.line">
         <field name="code">NLTAX_B5g</field>
         <field name="name">5g. Totaal te betalen/terug te vragen (BTW)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="formula">NLTAX_B1 + NLTAX_B2 + NLTAX_B4a + NLTAX_B4b - NLTAX_B5b - NLTAX_B5d - NLTAX_B5e - NLTAX_B5f</field>
         <field name="parent_id" ref="tax_report_rub_btw_5"/>
-        <field name="country_id" ref="base.nl"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_no/data/account_tax_report_data.xml b/addons/l10n_no/data/account_tax_report_data.xml
index 290061087c20bfc2250f12bccf8478631a7bd5c2..c59e47a77018900c53cd12e76fe91817bda3095b 100644
--- a/addons/l10n_no/data/account_tax_report_data.xml
+++ b/addons/l10n_no/data/account_tax_report_data.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
     <record id="account_tax_report_line_sum_avgiftsgrunnlag" model="account.tax.report.line">
         <field name="name">Sum avgiftsgrunnlag</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
     </record>
 
     <record id="account_tax_report_line_samlet_omsetning" model="account.tax.report.line">
         <field name="name">A. Samlet omsetning, uttak og innførsel</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_1" model="account.tax.report.line">
@@ -19,7 +24,7 @@
         <field name="code">NOTAX_01</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_samlet_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_2" model="account.tax.report.line">
@@ -28,13 +33,13 @@
         <field name="code">NOTAX_02</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_samlet_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_innenlands_omsetning" model="account.tax.report.line">
         <field name="name">B. Innenlands omsetning og uttak</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_3" model="account.tax.report.line">
@@ -43,7 +48,7 @@
         <field name="code">NOTAX_03</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_3_tax" model="account.tax.report.line">
@@ -52,7 +57,7 @@
         <field name="code">NOTAX_03_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_4" model="account.tax.report.line">
@@ -61,7 +66,7 @@
         <field name="code">NOTAX_04</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_4_tax" model="account.tax.report.line">
@@ -70,7 +75,7 @@
         <field name="code">NOTAX_04_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_5" model="account.tax.report.line">
@@ -79,7 +84,7 @@
         <field name="code">NOTAX_05</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_5_tax" model="account.tax.report.line">
@@ -88,7 +93,7 @@
         <field name="code">NOTAX_05_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_6" model="account.tax.report.line">
@@ -97,7 +102,7 @@
         <field name="code">NOTAX_06</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_7" model="account.tax.report.line">
@@ -106,13 +111,13 @@
         <field name="code">NOTAX_07</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_utforsel" model="account.tax.report.line">
         <field name="name">C. Utførsel</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_8" model="account.tax.report.line">
@@ -121,13 +126,13 @@
         <field name="code">NOTAX_08</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_utforsel"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_innforsel_av_varer" model="account.tax.report.line">
         <field name="name">D. Innførsel av varer</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_9" model="account.tax.report.line">
@@ -136,7 +141,7 @@
         <field name="code">NOTAX_09</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_9_tax" model="account.tax.report.line">
@@ -145,7 +150,7 @@
         <field name="code">NOTAX_09_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_10" model="account.tax.report.line">
@@ -154,7 +159,7 @@
         <field name="code">NOTAX_10</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_10_tax" model="account.tax.report.line">
@@ -163,7 +168,7 @@
         <field name="code">NOTAX_10_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_11" model="account.tax.report.line">
@@ -172,13 +177,13 @@
         <field name="code">NOTAX_11</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_kjop_med_omvendt_avgiftsplikt" model="account.tax.report.line">
         <field name="name">E. Kjøp med omvendt avgiftsplikt</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_12" model="account.tax.report.line">
@@ -187,7 +192,7 @@
         <field name="code">NOTAX_12</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_12_tax" model="account.tax.report.line">
@@ -196,7 +201,7 @@
         <field name="code">NOTAX_12_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_13" model="account.tax.report.line">
@@ -205,7 +210,7 @@
         <field name="code">NOTAX_13</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_13_tax" model="account.tax.report.line">
@@ -214,13 +219,13 @@
         <field name="code">NOTAX_13_1</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_fradragsberettigen_innenlands" model="account.tax.report.line">
         <field name="name">F. Fradragsberettiget innenlands inngående avgift</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_14" model="account.tax.report.line">
@@ -229,7 +234,7 @@
         <field name="code">NOTAX_14</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_fradragsberettigen_innenlands"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_15" model="account.tax.report.line">
@@ -238,7 +243,7 @@
         <field name="code">NOTAX_15</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_fradragsberettigen_innenlands"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_16" model="account.tax.report.line">
@@ -247,13 +252,13 @@
         <field name="code">NOTAX_16</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_fradragsberettigen_innenlands"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_fradragsberettiget_innforselsmerverdiavgift" model="account.tax.report.line">
         <field name="name">G. Fradragsberettiget innførselsmerverdiavgift</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_17" model="account.tax.report.line">
@@ -262,7 +267,7 @@
         <field name="code">NOTAX_17</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_fradragsberettiget_innforselsmerverdiavgift"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_18" model="account.tax.report.line">
@@ -271,13 +276,13 @@
         <field name="code">NOTAX_18</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_fradragsberettiget_innforselsmerverdiavgift"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_sum" model="account.tax.report.line">
         <field name="name">H. Sum</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="account_tax_report_line_post_19" model="account.tax.report.line">
@@ -286,7 +291,7 @@
         <field name="code">NOTAX_19</field>
         <field name="sequence" eval="0"/>
         <field name="parent_id" ref="account_tax_report_line_sum"/>
-        <field name="country_id" ref="base.no"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_pl/data/account_tax_report_data.xml b/addons/l10n_pl/data/account_tax_report_data.xml
index f7b2bb2195841d6c5bc8164a1fb76bc3ff3de32e..f8ea3e59959df8559abe84020d2a7d17683fa1b1 100644
--- a/addons/l10n_pl/data/account_tax_report_data.xml
+++ b/addons/l10n_pl/data/account_tax_report_data.xml
@@ -1,383 +1,388 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.pl"/>
+    </record>
+
     <record id="account_tax_report_line_razem_c" model="account.tax.report.line">
         <field name="name">Podstawa - Razem C</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="formula">PLTAXC_01_10 + PLTAXC_02_11 + PLTAXC_03_13 + PLTAXC_04_15 + PLTAXC_05_17 + PLTAXC_06_19 + PLTAXC_07_21 + PLTAXC_08_22 + PLTAXC_09_23 + PLTAXC_10_25 + PLTAXC_11_27 + PLTAXC_12_31</field>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_kraj_zwolnione" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów/usług, kraj, zwolnione</field>
         <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, zwolnione</field>
         <field name="code">PLTAXC_01_10</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_poza_kraj" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów/usług, poza kraj</field>
         <field name="tag_name">Podstawa - Dostawa towarów/usług, poza kraj</field>
         <field name="code">PLTAXC_02_11</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_uslugi_art_100_1_4" model="account.tax.report.line">
         <field name="name">Podstawa - W tym usługi art 100.1.4</field>
         <field name="tag_name">Podstawa - W tym usługi art 100.1.4</field>
         <field name="code">PLTAXC_02a_12</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_poza_kraj"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_uslugi_kraj_0" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów/usług, kraj, 0%</field>
         <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 0%</field>
         <field name="code">PLTAXC_03_13</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_towary_art_129" model="account.tax.report.line">
         <field name="name">Podstawa - W tym towary art 129</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_uslugi_kraj_0"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_kraj_3_lub_5" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów/usług, kraj, 3% lub 5%</field>
         <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 3% lub 5%</field>
         <field name="code">PLTAXC_04_15</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_kraj_7_lub_8" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów/usług, kraj, 7% lub 8%</field>
         <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 7% lub 8%</field>
         <field name="code">PLTAXC_05_17</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_kraj_22_lub_23" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów/usług, kraj, 22% lub 23%</field>
         <field name="tag_name">Podstawa - Dostawa towarów/usług, kraj, 22% lub 23%</field>
         <field name="code">PLTAXC_06_19</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_dostawa_towarow" model="account.tax.report.line">
         <field name="name">Podstawa - Wew-wspól dostawa towarów</field>
         <field name="tag_name">Podstawa - Wew-wspól dostawa towarów</field>
         <field name="code">PLTAXC_07_21</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_eksport_towarow" model="account.tax.report.line">
         <field name="name">Podstawa - Eksport towarów</field>
         <field name="tag_name">Podstawa - Eksport towarów</field>
         <field name="code">PLTAXC_08_22</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_nabycie_towarow" model="account.tax.report.line">
         <field name="name">Podstawa - Wewn-wspól. nabycie towarów</field>
         <field name="tag_name">Podstawa - Wewn-wspól. nabycie towarów</field>
         <field name="code">PLTAXC_09_23</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_art_33a" model="account.tax.report.line">
         <field name="name">Podstawa - Import towarów art. 33a</field>
         <field name="tag_name">Podstawa - Import towarów art. 33a</field>
         <field name="code">PLTAXC_10_25</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="10"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_import_uslug" model="account.tax.report.line">
         <field name="name">Podstawa - Import usług</field>
         <field name="tag_name">Podstawa - Import usług</field>
         <field name="code">PLTAXC_11_27</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_art_28b" model="account.tax.report.line">
         <field name="name">Podstawa - W tym nabycie wg art 28b</field>
         <field name="tag_name">Podstawa - W tym nabycie wg art 28b</field>
         <field name="code">PLTAXC_11a_29</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_import_uslug"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatnik_nabywca" model="account.tax.report.line">
         <field name="name">Podstawa - Dostawa towarów, podatnik nabywca</field>
         <field name="tag_name">Podstawa - Dostawa towarów, podatnik nabywca</field>
         <field name="code">PLTAXC_12_31</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref="account_tax_report_line_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_razem_d" model="account.tax.report.line">
         <field name="name">Podstawa - Razem D</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_uslug_s_trwale" model="account.tax.report.line">
         <field name="name">Podstawa - Nabycie towarów i usług ś.trwałe</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_uslug_pozostalych" model="account.tax.report.line">
         <field name="name">Podstawa - Nabycie towarów i usług pozostałych</field>
         <field name="tag_name">Podstawa - Nabycie towarów i usług pozostałych</field>
         <field name="code">PLTAXD_02_41a</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_do_przeniesienia" model="account.tax.report.line">
         <field name="name">Podatek - Do przeniesienia</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32 + PLTAXD_02_42</field>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_nad_naleznym" model="account.tax.report.line">
         <field name="name">Podatek - Nadwyżka naliczonego nad należnym</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32 + PLTAXD_02_42</field>
         <field name="parent_id" ref="account_tax_report_line_do_przeniesienia"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_do_US" model="account.tax.report.line">
         <field name="name">Podatek - Do wpłaty do US</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32 + PLTAXD_02_42</field>
         <field name="parent_id" ref="account_tax_report_line_nad_naleznym"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_kasy_rejestrujace" model="account.tax.report.line">
         <field name="name">Podatek - Wydatek na kasy rejestrujÄ…ce</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_do_US"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_zaniechaniem_poboru" model="account.tax.report.line">
         <field name="name">Podatek - Objęty zaniechaniem poboru</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_do_US"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_razem_c" model="account.tax.report.line">
         <field name="name">Podatek - Razem C</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="formula">PLTAXC_04_16 + PLTAXC_05_18 + PLTAXC_06_20 + PLTAXC_09_24 + PLTAXC_10_26 + PLTAXC_11_28 + PLTAXC_12_32</field>
         <field name="parent_id" ref="account_tax_report_line_do_US"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_kraj_3_lub_5" model="account.tax.report.line">
         <field name="name">Podatek - Dostawa towarów/usług, kraj, 3% lub 5%</field>
         <field name="tag_name">Podatek - Dostawa towarów/usług, kraj, 3% lub 5%</field>
         <field name="code">PLTAXC_04_16</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_kraj_7_lub_8" model="account.tax.report.line">
         <field name="name">Podatek - Dostawa towarów/usług, kraj, 7% lub 8%</field>
         <field name="tag_name">Podatek - Dostawa towarów/usług, kraj, 7% lub 8%</field>
         <field name="code">PLTAXC_05_18</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_kraj_22_lub_23" model="account.tax.report.line">
         <field name="name">Podatek - Dostawa towarów/usług, kraj, 22% lub 23%</field>
         <field name="tag_name">Podatek - Dostawa towarów/usług, kraj, 22% lub 23%</field>
         <field name="code">PLTAXC_06_20</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_nabycie_towarow" model="account.tax.report.line">
         <field name="name">Podatek - Wewn-wspól. nabycie towarów</field>
         <field name="tag_name">Podatek - Wewn-wspól. nabycie towarów</field>
         <field name="code">PLTAXC_09_24</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_art_33a" model="account.tax.report.line">
         <field name="name">Podatek - Import towarów art. 33a</field>
         <field name="tag_name">Podatek - Import towarów art. 33a</field>
         <field name="code">PLTAXC_10_26</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_import_uslug" model="account.tax.report.line">
         <field name="name">Podatek - Import usług</field>
         <field name="tag_name">Podatek - Import usług</field>
         <field name="code">PLTAXC_11_28</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_art_28b" model="account.tax.report.line">
         <field name="name">Podatek - W tym nabycie wg art 28b</field>
         <field name="tag_name">Podatek - W tym nabycie wg art 28b</field>
         <field name="code">PLTAXC_11a_30</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_import_uslug"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_podatnik_nabywca" model="account.tax.report.line">
         <field name="name">Podatek - Dostawa towarów, podatnik nabywca</field>
         <field name="tag_name">Podatek - Dostawa towarów, podatnik nabywca</field>
         <field name="code">PLTAXC_12_32</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_art_14_5" model="account.tax.report.line">
         <field name="name">Podatek - Ze spisu z natury art 14.5</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_transp_termin" model="account.tax.report.line">
         <field name="name">Podatek - Wew.wspól. nabycie środk. transp. termin</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_c"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_razem_d" model="account.tax.report.line">
         <field name="name">Podatek - Razem D</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_do_US"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_deklaracji" model="account.tax.report.line">
         <field name="name">Podatek - Nadwyżka z poprzedniej deklaracji</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_pl_03_01_01_04_02" model="account.tax.report.line">
         <field name="name">Podatek - Naliczony ze spisu z natury, art.113</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_s_trwale" model="account.tax.report.line">
         <field name="name">Podatek - Nabycie towarów i usług ś.trwałe</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_uslug_pozostalych" model="account.tax.report.line">
         <field name="name">Podatek - Nabycie towarów i usług pozostałych</field>
         <field name="tag_name">Podatek - Nabycie towarów i usług pozostałych</field>
         <field name="code">PLTAXD_02_42</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_s_trwalych" model="account.tax.report.line">
         <field name="name">Podatek - Korekta naliczonego od nabycia ś.trwałych</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_pozostalych_nabyc" model="account.tax.report.line">
         <field name="name">Podatek - Korekta naliczonego od pozostałych nabyć</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_razem_d"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_okresie" model="account.tax.report.line">
         <field name="name">Podatek - Wydatek na kasy do zwrotu w tym okresie</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_nad_naleznym"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_podatek_do_zwrotu" model="account.tax.report.line">
         <field name="name">Podatek - Do zwrotu</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_do_przeniesienia"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_do_zwrotu_25_dni" model="account.tax.report.line">
         <field name="name">Podatek - Do zwrotu 25 dni</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_do_zwrotu"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_do_zwrotu_60_dni" model="account.tax.report.line">
         <field name="name">Podatek - Do zwrotu 60 dni</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_do_zwrotu"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
     <record id="account_tax_report_line_do_zwrotu_180_dni" model="account.tax.report.line">
         <field name="name">Podatek - Do zwrotu 180 dni</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_podatek_do_zwrotu"/>
-        <field name="country_id" ref="base.pl"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_ro/data/account_tax_report_data.xml b/addons/l10n_ro/data/account_tax_report_data.xml
index a390419ef688a0a231fa58783e56be08843cb889..38bcf3ed7bc2ca6295ddd0a8a87b8649a468a394 100644
--- a/addons/l10n_ro/data/account_tax_report_data.xml
+++ b/addons/l10n_ro/data/account_tax_report_data.xml
@@ -1,405 +1,410 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.ro"/>
+    </record>
+
     <record id="account_tax_report_baza_tva_clt" model="account.tax.report.line">
         <field name="name">BAZA TVA COLECTAT</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_baza_tva_0" model="account.tax.report.line">
         <field name="name">Baza TVA 0%</field>
         <field name="tag_name">Baza TVA 0%</field>
         <field name="code">ROTAX_TVA_colectata_0_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <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_19" model="account.tax.report.line">
         <field name="name">Baza TVA 19%</field>
         <field name="tag_name">Baza TVA 19%</field>
         <field name="code">ROTAX_TVA_colectata_19_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <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_24" model="account.tax.report.line">
         <field name="name">Baza TVA 24%</field>
         <field name="tag_name">Baza TVA 24%</field>
         <field name="code">ROTAX_TVA_colectata_24_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <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_5" model="account.tax.report.line">
         <field name="name">Baza TVA 5%</field>
         <field name="tag_name">Baza TVA 5%</field>
         <field name="code">ROTAX_TVA_colectata_5_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <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_9" model="account.tax.report.line">
         <field name="name">Baza TVA 9%</field>
         <field name="tag_name">Baza TVA 9%</field>
         <field name="code">ROTAX_TVA_colectata_9_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <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_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="report_id" ref="tax_report"/>
         <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_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="report_id" ref="tax_report"/>
         <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_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="report_id" ref="tax_report"/>
         <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_tva_colcta" model="account.tax.report.line">
         <field name="name">TVA COLECTATA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_tva_0" model="account.tax.report.line">
         <field name="name">TVA 0%</field>
         <field name="tag_name">TVA 0% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_0</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_tva_19" model="account.tax.report.line">
         <field name="name">TVA 19%</field>
         <field name="tag_name">TVA 19% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_19</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_tva_24" model="account.tax.report.line">
         <field name="name">TVA 24%</field>
         <field name="tag_name">TVA 24% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_24</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_tva_5" model="account.tax.report.line">
         <field name="name">TVA 5%</field>
         <field name="tag_name">TVA 5% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_5</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_tva_9" model="account.tax.report.line">
         <field name="name">TVA 9%</field>
         <field name="tag_name">TVA 9% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_9</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_tva_intracmunitr_bunri" model="account.tax.report.line">
         <field name="name">TVA Intracomunitar Bunuri (TVA colectata)</field>
         <field name="tag_name">TVA Intracomunitar Bunuri (TVA colectata)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_intra_srvci" model="account.tax.report.line">
         <field name="name">TVA Intracomunitar Servicii (TVA colectata)</field>
         <field name="tag_name">TVA Intracomunitar Servicii (TVA colectata)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_tx_invrsa" model="account.tax.report.line">
         <field name="name">TVA Taxare Inversa (TVA colectata)</field>
         <field name="tag_name">TVA Taxare Inversa (TVA colectata)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_baza_tva_deducbl" model="account.tax.report.line">
         <field name="name">BAZA TVA DEDUCTIBILA</field>
+        <field name="report_id" ref="tax_report"/>
         <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% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_0_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <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% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_19_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <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% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_24_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <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% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_5_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <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% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_9_Baza</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <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_intracmunitr_bnuri" model="account.tax.report.line">
         <field name="name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
         <field name="tag_name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_intracmunitr_srvci" model="account.tax.report.line">
         <field name="name">Baza TVA Intracomunitar Servicii (deductibila)</field>
         <field name="tag_name">Baza TVA Intracomunitar Servicii (deductibila)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_tx_invrsa" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare Inversa (deductibila)</field>
         <field name="tag_name">Baza TVA Taxare Inversa (deductibila)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_tva_decucible" model="account.tax.report.line">
         <field name="name">TVA DEDUCTIBILA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_0" model="account.tax.report.line">
         <field name="name">TVA 0%</field>
         <field name="tag_name">TVA 0%</field>
         <field name="code">ROTAX_TVA_deductibila_0</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <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_decucible_19" model="account.tax.report.line">
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <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_decucible_24" model="account.tax.report.line">
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <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_decucible_5" model="account.tax.report.line">
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <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_decucible_9" model="account.tax.report.line">
         <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="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <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_intracmunitr_bunri" model="account.tax.report.line">
         <field name="name">TVA Intracomunitar Bunuri (deductibila)</field>
         <field name="tag_name">TVA Intracomunitar Bunuri (deductibila)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_intracmunitr_srvci" model="account.tax.report.line">
         <field name="name">TVA Intracomunitar Servicii (deductibila)</field>
         <field name="tag_name">TVA Intracomunitar Servicii (deductibila)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_tx_invrsa" model="account.tax.report.line">
         <field name="name">TVA Taxare Inversa (deductibila)</field>
         <field name="tag_name">TVA Taxare Inversa (deductibila)</field>
+        <field name="report_id" ref="tax_report"/>
         <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_baza_tva_nxgibl" model="account.tax.report.line">
         <field name="name">BAZA TVA NEEXIGIBILA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_nxgibl_colcta" model="account.tax.report.line">
         <field name="name">Baza TVA Neexigibil Colectat</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_nxgibl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_nxgibl_deducble" model="account.tax.report.line">
         <field name="name">Baza TVA Neexigibil Deductibil</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_nxgibl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_tva_nxgibl" model="account.tax.report.line">
         <field name="name">TVA NEEXIGIBILA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_tva_nxgibl_colcta" model="account.tax.report.line">
         <field name="name">TVA Neexigibil Colectat</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_nxgibl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_tva_nxgibl_deducble" model="account.tax.report.line">
         <field name="name">TVA Neexigibil Deductibil</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_nxgibl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_invrs" model="account.tax.report.line">
         <field name="name">BAZA TVA TAXARE INVERSA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx1_invrs" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare inversa</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrs"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_scutita" model="account.tax.report.line">
         <field name="name">BAZA TVA TAXARE SCUTITA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_scutita_achizt" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare Scutita - Achizitii</field>
         <field name="tag_name">Baza TVA Taxare Scutita - Achizitii</field>
         <field name="code">ROTAX_Baza_TVA_Taxare_Scutita_Achizitii</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_scutita"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_scutita_vnzari" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare Scutita - Vanzari</field>
         <field name="tag_name">Baza TVA Taxare Scutita - Vanzari</field>
         <field name="code">ROTAX_Baza_TVA_Taxare_Scutita_Vanzari</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_scutita"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_intracmutr_nempzbl" model="account.tax.report.line">
         <field name="name">BAZA TVA TAXARE INTRACOMUNITARA NEIMPOZABILA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_intracmutr_nempzbl_achzti" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare intracomunitara neimpozabila - Achizitii</field>
         <field name="tag_name">Baza TVA Taxare intracomunitara neimpozabila - Achizitii</field>
         <field name="code">ROTAX_Baza_TVA_Taxare_intracomunitara_neimpozabila_Achizitii</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_intracmutr_nempzbl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_ro_baza_tva_tx_intracmutr_nempzbl_vnzari" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare intracomunitara neimpozabila - Vanzari</field>
         <field name="tag_name">Baza TVA Taxare intracomunitara neimpozabila - Vanzari</field>
         <field name="code">ROTAX_Baza_TVA_Taxare_intracomunitara_neimpozabila_Vanzari</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_intracmutr_nempzbl"/>
-        <field name="country_id" ref="base.ro"/>
     </record>
 
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_sg/data/account_tax_report_data.xml b/addons/l10n_sg/data/account_tax_report_data.xml
index 26e8509b486f877680b352b7bb5de88f3f5d4f02..453387ea6e0725334d5c1f352a2e471e66098a7d 100644
--- a/addons/l10n_sg/data/account_tax_report_data.xml
+++ b/addons/l10n_sg/data/account_tax_report_data.xml
@@ -1,119 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
-        <record id="account_tax_report_line_supplies" model="account.tax.report.line">
-            <field name="name">Supplies</field>
-            <field name="sequence" eval="1"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_std_rated_supplies" model="account.tax.report.line">
-            <field name="name">Box 1 - Total value of standard-rated supplies</field>
-            <field name="tag_name">Box 1</field>
-            <field name="code">BOX1</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref='account_tax_report_line_supplies'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_zero_rated_supplies" model="account.tax.report.line">
-            <field name="name">Box 2 - Total value of zero-rated supplies</field>
-            <field name="tag_name">Box 2</field>
-            <field name="code">BOX2</field>
-            <field name="sequence" eval="2"/>
-            <field name="parent_id" ref='account_tax_report_line_supplies'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_exempt_supplies" model="account.tax.report.line">
-            <field name="name">Box 3 - Total value of exempt supplies</field>
-            <field name="tag_name">Box 3</field>
-            <field name="code">BOX3</field>
-            <field name="sequence" eval="3"/>
-            <field name="parent_id" ref='account_tax_report_line_supplies'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_total_supplies" model="account.tax.report.line">
-            <field name="name">Box 4 - Total value of (1) + (2) + (3)</field>
-            <field name="sequence" eval="4"/>
-            <field name="formula">BOX1 + BOX2 + BOX3</field>
-            <field name="parent_id" ref='account_tax_report_line_supplies'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_purchases" model="account.tax.report.line">
-            <field name="name">Purchases</field>
-            <field name="sequence" eval="2"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_total_taxable_purchases" model="account.tax.report.line">
-            <field name="name">Box 5 - Total value of taxable purchases</field>
-            <field name="tag_name">Box 5</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref='account_tax_report_line_purchases'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_taxes" model="account.tax.report.line">
-            <field name="name">Taxes</field>
-            <field name="sequence" eval="3"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_output_tax_due" model="account.tax.report.line">
-            <field name="name">Box 6 - Output tax due</field>
-            <field name="tag_name">Box 6</field>
-            <field name="code">BOX6</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref='account_tax_report_line_taxes'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_inp_tax_refund_claim" model="account.tax.report.line">
-            <field name="name">Box 7 - Less : Input tax and refunds claimed</field>
-            <field name="tag_name">Box 7</field>
-            <field name="code">BOX7</field>
-            <field name="parent_id" ref='account_tax_report_line_taxes'/>
-            <field name="sequence" eval="2"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_total_gst_paid_iras" model="account.tax.report.line">
-            <field name="name">Box 8 - Equals : Net GST to be paid to IRAS</field>
-            <field name="sequence" eval="3"/>
-            <field name="formula">BOX6 - BOX7</field>
-            <field name="parent_id" ref='account_tax_report_line_taxes'/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_applicable" model="account.tax.report.line">
-            <field name="name">Applicable to Taxable Persons under Major Exported Scheme / Approved 3rd Party Logistics Company / Other Approved Schemes Only</field>
-            <field name="sequence" eval="4"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_applicable_goods_imported_value" model="account.tax.report.line">
-            <field name="name">Box 9 - Total value of goods imported under this scheme</field>
-            <field name="tag_name">Box 9</field>
-            <field name="sequence" eval="1"/>
-            <field name="parent_id" ref="account_tax_report_line_applicable"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_revenues" model="account.tax.report.line">
-            <field name="name">Revenue</field>
-            <field name="sequence" eval="6"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-
-        <record id="account_tax_report_line_revenues_accounting_period" model="account.tax.report.line">
-            <field name="name">Box 13 - Revenue for the accounting period</field>
-            <field name="sequence" eval="1"/>
-            <field name="formula">net_profit</field>
-            <field name="parent_id" ref="account_tax_report_line_revenues"/>
-            <field name="country_id" ref="base.sg"/>
-        </record>
-    </data>
+
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.sg"/>
+    </record>
+
+    <record id="account_tax_report_line_supplies" model="account.tax.report.line">
+        <field name="name">Supplies</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+    </record>
+
+    <record id="account_tax_report_line_std_rated_supplies" model="account.tax.report.line">
+        <field name="name">Box 1 - Total value of standard-rated supplies</field>
+        <field name="tag_name">Box 1</field>
+        <field name="code">BOX1</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref='account_tax_report_line_supplies'/>
+    </record>
+
+    <record id="account_tax_report_line_zero_rated_supplies" model="account.tax.report.line">
+        <field name="name">Box 2 - Total value of zero-rated supplies</field>
+        <field name="tag_name">Box 2</field>
+        <field name="code">BOX2</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref='account_tax_report_line_supplies'/>
+    </record>
+
+    <record id="account_tax_report_line_exempt_supplies" model="account.tax.report.line">
+        <field name="name">Box 3 - Total value of exempt supplies</field>
+        <field name="tag_name">Box 3</field>
+        <field name="code">BOX3</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref='account_tax_report_line_supplies'/>
+    </record>
+
+    <record id="account_tax_report_line_total_supplies" model="account.tax.report.line">
+        <field name="name">Box 4 - Total value of (1) + (2) + (3)</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="4"/>
+        <field name="formula">BOX1 + BOX2 + BOX3</field>
+        <field name="parent_id" ref='account_tax_report_line_supplies'/>
+    </record>
+
+    <record id="account_tax_report_line_purchases" model="account.tax.report.line">
+        <field name="name">Purchases</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+    </record>
+
+    <record id="account_tax_report_line_total_taxable_purchases" model="account.tax.report.line">
+        <field name="name">Box 5 - Total value of taxable purchases</field>
+        <field name="tag_name">Box 5</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref='account_tax_report_line_purchases'/>
+    </record>
+
+    <record id="account_tax_report_line_taxes" model="account.tax.report.line">
+        <field name="name">Taxes</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+    </record>
+
+    <record id="account_tax_report_line_output_tax_due" model="account.tax.report.line">
+        <field name="name">Box 6 - Output tax due</field>
+        <field name="tag_name">Box 6</field>
+        <field name="code">BOX6</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref='account_tax_report_line_taxes'/>
+    </record>
+
+    <record id="account_tax_report_line_inp_tax_refund_claim" model="account.tax.report.line">
+        <field name="name">Box 7 - Less : Input tax and refunds claimed</field>
+        <field name="tag_name">Box 7</field>
+        <field name="code">BOX7</field>
+        <field name="parent_id" ref='account_tax_report_line_taxes'/>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="2"/>
+    </record>
+
+    <record id="account_tax_report_line_total_gst_paid_iras" model="account.tax.report.line">
+        <field name="name">Box 8 - Equals : Net GST to be paid to IRAS</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="3"/>
+        <field name="formula">BOX6 - BOX7</field>
+        <field name="parent_id" ref='account_tax_report_line_taxes'/>
+    </record>
+
+    <record id="account_tax_report_line_applicable" model="account.tax.report.line">
+        <field name="name">Applicable to Taxable Persons under Major Exported Scheme / Approved 3rd Party Logistics Company / Other Approved Schemes Only</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="4"/>
+    </record>
+
+    <record id="account_tax_report_line_applicable_goods_imported_value" model="account.tax.report.line">
+        <field name="name">Box 9 - Total value of goods imported under this scheme</field>
+        <field name="tag_name">Box 9</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_line_applicable"/>
+    </record>
+
+    <record id="account_tax_report_line_revenues" model="account.tax.report.line">
+        <field name="name">Revenue</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="6"/>
+    </record>
+
+    <record id="account_tax_report_line_revenues_accounting_period" model="account.tax.report.line">
+        <field name="name">Box 13 - Revenue for the accounting period</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence" eval="1"/>
+        <field name="formula">net_profit</field>
+        <field name="parent_id" ref="account_tax_report_line_revenues"/>
+    </record>
 </odoo>
diff --git a/addons/l10n_si/data/account_tax_report_data.xml b/addons/l10n_si/data/account_tax_report_data.xml
index 92366c3efd6cac0f71c50c6b985a6ae2ee35ff68..6c7404765d5af85bd769cd957ddbfe0b68d2dd1f 100644
--- a/addons/l10n_si/data/account_tax_report_data.xml
+++ b/addons/l10n_si/data/account_tax_report_data.xml
@@ -1,198 +1,203 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.si"/>
+    </record>
+
 	<record id="tax_report_zo_dvd" model="account.tax.report.line">
         <field name="name">Znesek osnov za DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_neo" model="account.tax.report.line">
         <field name="name">Neodbitni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_neo_sdtopni" model="account.tax.report.line">
         <field name="name">Vstopni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd_neo"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <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 (Neodbitni)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <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 (Neodbitni)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb" model="account.tax.report.line">
         <field name="name">Odbitni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb_izstopni" model="account.tax.report.line">
         <field name="name">Izstopni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb_izstopni_opr" model="account.tax.report.line">
         <field name="name">Prodaja oproščena DDV</field>
         <field name="tag_name">Prodaja oproščena DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_izstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb_izstopni_osn" model="account.tax.report.line">
         <field name="name">Prodaja po osnovni stopnji DDV</field>
         <field name="tag_name">Prodaja po osnovni stopnji DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_izstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb_izstopni_zni" model="account.tax.report.line">
         <field name="name">Prodaja po znižani stopnji DDV</field>
         <field name="tag_name">Prodaja po znižani stopnji DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_izstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb_vstopni" model="account.tax.report.line">
         <field name="name">Vstopni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zo_dvd_odb_vstopni_opr" model="account.tax.report.line">
         <field name="name">Nabave oproščene DDV</field>
         <field name="tag_name">Nabave oproščene DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <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 (Vstopni)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <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 (Vstopni)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd" model="account.tax.report.line">
         <field name="name">Znesek DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_neo" model="account.tax.report.line">
         <field name="name">Neodbitni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zn_dvd"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_neo_vstopni" model="account.tax.report.line">
         <field name="name">Vstopni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zn_dvd_neo"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_neo_vstopni_osnnovna" model="account.tax.report.line">
         <field name="name">Neodbitni DDV – osnovna stopnja</field>
         <field name="tag_name">Neodbitni DDV – osnovna stopnja</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zn_dvd_neo_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_neo_vstopni_zni" model="account.tax.report.line">
         <field name="name">Neodbitni DDV – znižana stopnja</field>
         <field name="tag_name">Neodbitni DDV – znižana stopnja</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zn_dvd_neo_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb" model="account.tax.report.line">
         <field name="name">Odbitni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zn_dvd"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb_izstopni" model="account.tax.report.line">
         <field name="name">Izstopni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zn_dvd_odb"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb_izstopni_osn" model="account.tax.report.line">
         <field name="name">Izstopni DDV - osnovna stopnja</field>
         <field name="tag_name">Izstopni DDV - osnovna stopnja</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zn_dvd_odb_izstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb_izstopni_zni" model="account.tax.report.line">
         <field name="tag_name">Izstopni DDV - znižana stopnja</field>
         <field name="name">Izstopni DDV - znižana stopnja</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zn_dvd_odb_izstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb_vstopni" model="account.tax.report.line">
         <field name="name">Vstopni DDV</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zn_dvd_odb"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb_vstopni_osn" model="account.tax.report.line">
         <field name="name">Vstopni DDV - osnovna stopnja</field>
         <field name="tag_name">Vstopni DDV - osnovna stopnja</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_zn_dvd_odb_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
     <record id="tax_report_zn_dvd_odb_vstopni_zni" model="account.tax.report.line">
         <field name="name">Vstopni DDV - znižana stopnja</field>
         <field name="tag_name">Vstopni DDV - znižana stopnja</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_zn_dvd_odb_vstopni"/>
-        <field name="country_id" ref="base.si"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_th/data/account_tax_report_data.xml b/addons/l10n_th/data/account_tax_report_data.xml
index e03c2915c930147911e1ff532f540be60d9548c1..df672097205a9df56bdc7870e6147c0e42a21b96 100644
--- a/addons/l10n_th/data/account_tax_report_data.xml
+++ b/addons/l10n_th/data/account_tax_report_data.xml
@@ -1,129 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.th"/>
+    </record>
+
     <record id="tax_report_out_tax_title" model="account.tax.report.line">
         <field name="name">Output Tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_out_tax_sale" model="account.tax.report.line">
         <field name="name">1. Sales amount</field>
         <field name="tag_name">1. Sales amount</field>
         <field name="code">OUTPUTTAX_SALEAMOUNT</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_out_tax_title"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_out_tax_less_sales_0_rate" model="account.tax.report.line">
         <field name="name">2. Less sales subject to 0% tax rate </field>
         <field name="tag_name">2. Less sales subject to 0% tax rate </field>
         <field name="code">OUTPUTTAX_SALE_ZERO</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_out_tax_title"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_out_tax_less_exempted_sales" model="account.tax.report.line">
         <field name="name">3. Less exempted sales</field>
         <field name="tag_name">3. Less exempted sales</field>
         <field name="code">OUTPUTTAX_EXEMPTED</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_out_tax_title"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_out_tax_taxable_sales_amount" model="account.tax.report.line">
         <field name="name">4. Taxable sales amount(1. -2. -3.)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_out_tax_title"/>
         <field name="formula">OUTPUTTAX_SALEAMOUNT-(OUTPUTTAX_SALE_ZERO+OUTPUTTAX_EXEMPTED)</field>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_out_tax" model="account.tax.report.line">
         <field name="name">5. Output tax</field>
         <field name="tag_name">5. Output tax</field>
         <field name="code">OUTPUTTAX_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="tax_report_out_tax_title"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_input_tax_title" model="account.tax.report.line">
         <field name="name">Input Tax</field>
         <field name="code">INPUTTAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_input_tax_purchase_from_out_tax" model="account.tax.report.line">
         <field name="name">6. Purchase amount that is entitled to deduction of input tax from output tax in tax computation</field>
         <field name="tag_name">6. Purchase amount that is entitled to deduction of input tax from output tax in tax computation</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_input_tax_title"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_input_tax" model="account.tax.report.line">
         <field name="name">7. Input tax (according to invoice of purchase amount in 6.)</field>
         <field name="tag_name">7. Input tax (according to invoice of purchase amount in 6.)</field>
         <field name="code">INPUTTAX_TAX</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_input_tax_title"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_vat" model="account.tax.report.line">
         <field name="name">Value Added Tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_vat_payable" model="account.tax.report.line">
         <field name="name">8. Tax payable (5. minus 7. (if 5. is greater than 7.))</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_vat"/>
         <field name="formula">OUTPUTTAX_TAX - INPUTTAX_TAX if (OUTPUTTAX_TAX > INPUTTAX_TAX) else 0</field>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_vat_excess" model="account.tax.report.line">
         <field name="name">9. Excess tax payable (7. minus 5. (if 5. is less than 7.))</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_vat"/>
         <field name="formula">INPUTTAX_TAX - OUTPUTTAX_TAX if (INPUTTAX_TAX > OUTPUTTAX_TAX) else 0</field>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_vat_payment_last_period" model="account.tax.report.line">
         <field name="name">10. Excess tax payment carried forward from last period</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_vat"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_net_vat" model="account.tax.report.line">
         <field name="name">Net Tax</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_net_vat_payable" model="account.tax.report.line">
         <field name="name">11. Net tax payable (if 8. is greater than 10.)</field>
         <field name="tag_name">11. Net tax payable (if 8. is greater than 10.)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_net_vat"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
     <record id="tax_report_net_vat_excess" model="account.tax.report.line">
         <field name="name">12. Net excess tax payable ((if 10. is greater than 8.) or (9. plus 10.))</field>
         <field name="tag_name">12. Net excess tax payable ((if 10. is greater than 8.) or (9. plus 10.))</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_net_vat"/>
-        <field name="country_id" ref="base.th"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_uk/data/account_tax_report_data.xml b/addons/l10n_uk/data/account_tax_report_data.xml
index dd054d02167068d2000e696653935878522be50e..65caaa7ee8e0c2be5812799a8a71f1d70c3c68b4 100644
--- a/addons/l10n_uk/data/account_tax_report_data.xml
+++ b/addons/l10n_uk/data/account_tax_report_data.xml
@@ -1,99 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.uk"/>
+    </record>
+
     <record id="account_tax_report_line_vat_cal" model="account.tax.report.line">
         <field name="name">VAT calculations</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_vat_box1" model="account.tax.report.line">
         <field name="name">[BOX 1] VAT due on sales and other outputs</field>
         <field name="tag_name">1</field>
         <field name="code">UKTAX_1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_vat_cal"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_vat_box2" model="account.tax.report.line">
         <field name="name">[BOX 2] VAT due on acquisitions from EC</field>
         <field name="tag_name">2</field>
         <field name="code">UKTAX_2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_vat_cal"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_vat_box3" model="account.tax.report.line">
         <field name="name">[BOX 3] Total VAT due (box 1 + box 2)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="formula">UKTAX_1 + UKTAX_2</field>
         <field name="parent_id" ref="account_tax_report_line_vat_cal"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_vat_box4" model="account.tax.report.line">
         <field name="name">[BOX 4] VAT reclaimed on purchases and other inputs (including acquisitions from EC)</field>
         <field name="tag_name">4</field>
         <field name="code">UKTAX_4</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_vat_cal"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_vat_box5" model="account.tax.report.line">
         <field name="name">[BOX 5] VAT to pay/reclaim</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="formula">UKTAX_1 + UKTAX_2 - UKTAX_4</field>
         <field name="parent_id" ref="account_tax_report_line_vat_cal"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_exd_vat" model="account.tax.report.line">
         <field name="name">Sales and Purchases Excluding VAT</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_exd_vat_box6" model="account.tax.report.line">
         <field name="name">[BOX 6] Total value of sales and other outputs excluding VAT (including EC supplies)</field>
         <field name="tag_name">6</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_exd_vat"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_ec_exd_vat" model="account.tax.report.line">
         <field name="name">EC Sales and Purchases excluding VAT</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_exd_vat_box7" model="account.tax.report.line">
         <field name="name">[BOX 7] Total value of purchases and inputs excluding VAT (including EC acquisitions)</field>
         <field name="tag_name">7</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_exd_vat"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_exd_vat_box8" model="account.tax.report.line">
         <field name="name">[BOX 8] Total value of EC sales excluding VAT</field>
         <field name="tag_name">8</field>
         <field name="code">UKTAX_8</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_ec_exd_vat"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
     <record id="account_tax_report_line_exd_vat_box9" model="account.tax.report.line">
         <field name="name">[BOX 9] Total value of EC purchases excluding VAT</field>
         <field name="tag_name">9</field>
         <field name="code">UKTAX_9</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_ec_exd_vat"/>
-        <field name="country_id" ref="base.uk"/>
     </record>
 
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_uk/demo/l10n_uk_demo.xml b/addons/l10n_uk/demo/l10n_uk_demo.xml
index b25c0cb93f6fa02dee0ea6c256e7070a917a4d73..7afc04baeefaf5c3e66e8515da473bb424565490 100644
--- a/addons/l10n_uk/demo/l10n_uk_demo.xml
+++ b/addons/l10n_uk/demo/l10n_uk_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data noupdate="1">       
+<data noupdate="1">
         <record id="smartmode" model="res.partner">
             <field name="name">SmartMode LTD</field>
             <field name="is_company">1</field>
diff --git a/addons/l10n_uy/data/account_tax_report_data.xml b/addons/l10n_uy/data/account_tax_report_data.xml
index 1584ebb54b1fab5e9146208e3aaeffd63732c45c..2b21598ece5852d27f0017b1dc25e37efd78fe79 100644
--- a/addons/l10n_uy/data/account_tax_report_data.xml
+++ b/addons/l10n_uy/data/account_tax_report_data.xml
@@ -1,184 +1,189 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.uy"/>
+    </record>
+
     <record id="account_tax_report_base_impb" model="account.tax.report.line">
         <field name="name">Base Imponible</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_cmprs" model="account.tax.report.line">
         <field name="name">Base Imponible Compras</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_base_impb"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_cmprs_22" model="account.tax.report.line">
         <field name="name">Base Compras 22%</field>
         <field name="tag_name">Base Compras 22%</field>
         <field name="code">UYTAX_010101</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_base_impb_cmprs"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_cmprs_10" model="account.tax.report.line">
         <field name="name">Base Compras 10%</field>
         <field name="tag_name">Base Compras 10%</field>
         <field name="code">UYTAX_020101</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_base_impb_cmprs"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_cmprs_0" model="account.tax.report.line">
         <field name="name">Base Compras 0%</field>
         <field name="tag_name">Base Compras 0%</field>
         <field name="code">UYTAX_030101</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_base_impb_cmprs"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_impb_cmprs" model="account.tax.report.line">
         <field name="name">Base Imponible Compras</field>
         <field name="tag_name">Base Imponible Compras</field>
         <field name="code">UYTAX_040101</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_base_impb_cmprs"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_vnts" model="account.tax.report.line">
         <field name="name">Base Imponible Ventas</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_base_impb"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_vnts_22" model="account.tax.report.line">
         <field name="name">Base Ventas 22%</field>
         <field name="tag_name">Base Ventas 22%</field>
         <field name="code">UYTAX_010201</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_base_impb_vnts"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_vnts_10" model="account.tax.report.line">
         <field name="name">Base Ventas 10%</field>
         <field name="tag_name">Base Ventas 10%</field>
         <field name="code">UYTAX_020201</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_base_impb_vnts"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_base_impb_vnts_0" model="account.tax.report.line">
         <field name="name">Base Ventas 0%</field>
         <field name="tag_name">Base Ventas 0%</field>
         <field name="code">UYTAX_030201</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_base_impb_vnts"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_impb_vnts" model="account.tax.report.line">
         <field name="name">Base Imponible Ventas</field>
         <field name="tag_name">Base Imponible Ventas</field>
         <field name="code">UYTAX_040201</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_base_impb_vnts"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_sldo_iva" model="account.tax.report.line">
         <field name="name">Saldo de IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_iva_cmprs_pagdo" model="account.tax.report.line">
         <field name="name">IVA Compras - pagado</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_sldo_iva"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_iva_cmprs_22" model="account.tax.report.line">
         <field name="name">IVA Compras 22%</field>
         <field name="tag_name">IVA Compras 22%</field>
         <field name="code">UYTAX_010102</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_iva_cmprs_pagdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_iva_cmprs_10" model="account.tax.report.line">
         <field name="name">IVA Compras 10%</field>
         <field name="tag_name">IVA Compras 10%</field>
         <field name="code">UYTAX_020102</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_iva_cmprs_pagdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_cmprs_exnto_iva" model="account.tax.report.line">
         <field name="name">Compras Exento IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_iva_cmprs_pagdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_cmprs_pagdo" model="account.tax.report.line">
         <field name="name">IVA Compras - pagado</field>
         <field name="tag_name">IVA Compras - pagado</field>
         <field name="code">UYTAX_040102</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_sldo_iva"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_iva_vnts_prcbdo" model="account.tax.report.line">
         <field name="name">IVA Ventas - percibido</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_sldo_iva"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_iva_vnts_22" model="account.tax.report.line">
         <field name="name">IVA Ventas 22%</field>
         <field name="tag_name">IVA Ventas 22%</field>
         <field name="code">UYTAX_010202</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_iva_vnts_prcbdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_iva_vnts_10" model="account.tax.report.line">
         <field name="name">IVA Ventas 10%</field>
         <field name="tag_name">IVA Ventas 10%</field>
         <field name="code">UYTAX_020202</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_iva_vnts_prcbdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_vnts_iva" model="account.tax.report.line">
         <field name="name">Ventas Exento IVA</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_iva_vnts_prcbdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
     <record id="account_tax_report_vnts_prcbdo" model="account.tax.report.line">
         <field name="name">IVA Ventas - percibido</field>
         <field name="tag_name">IVA Ventas - percibido</field>
         <field name="code">UYTAX_040202</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_iva_vnts_prcbdo"/>
-        <field name="country_id" ref="base.uy"/>
     </record>
 
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_vn/data/account_tax_report_data.xml b/addons/l10n_vn/data/account_tax_report_data.xml
index c57acf4ec007496349f23835fd8b80d3ede98921..700dc431e8a02715516114773ec37c88ab6da931 100644
--- a/addons/l10n_vn/data/account_tax_report_data.xml
+++ b/addons/l10n_vn/data/account_tax_report_data.xml
@@ -1,138 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.vn"/>
+    </record>
+
      <record id="account_tax_report_line_01_vn" model="account.tax.report.line">
         <field name="name">HHDV mua vào</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_01_01_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV mua vào</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_01_01_01_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV mua vào chịu thuế 0%</field>
         <field name="tag_name">Thuế GTGT HHDV mua vào chịu thuế 0%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_01_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_01_01_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV mua vào chịu thuế 5%</field>
         <field name="tag_name">Thuế GTGT HHDV mua vào chịu thuế 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_01_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_03_01_01_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV mua vào chịu thuế 10%</field>
         <field name="tag_name">Thuế GTGT HHDV mua vào chịu thuế 10%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_01_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_01_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV mua vào</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_01_02_01_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV mua vào chịu thuế 0%</field>
         <field name="tag_name">Giá trị HHDV mua vào chịu thuế 0%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_02_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_02_01_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV mua vào chịu thuế 5%</field>
         <field name="tag_name">Giá trị HHDV mua vào chịu thuế 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_02_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_03_02_01_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV mua vào chịu thuế 10%</field>
         <field name="tag_name">Giá trị HHDV mua vào chịu thuế 10%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_02_01_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_vn" model="account.tax.report.line">
         <field name="name">HHDV bán ra</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_01_02_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV bán ra</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_01_01_02_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV bán ra chịu thuế 0%</field>
         <field name="tag_name">Thuế GTGT HHDV bán ra chịu thuế 0%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_01_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_01_02_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV bán ra chịu thuế 5%</field>
         <field name="tag_name">Thuế GTGT HHDV bán ra chịu thuế 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_01_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_03_01_02_vn" model="account.tax.report.line">
         <field name="name">Thuế GTGT HHDV bán ra chịu thuế 10%</field>
         <field name="tag_name">Thuế GTGT HHDV bán ra chịu thuế 10%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_01_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_02_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV bán ra</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.vn"/>
         <field name="parent_id" ref="account_tax_report_line_02_vn"/>
     </record>
 
     <record id="account_tax_report_line_01_02_02_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV bán ra chịu thuế 0%</field>
         <field name="tag_name">Giá trị HHDV bán ra chịu thuế 0%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_02_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_02_02_02_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV bán ra chịu thuế 5%</field>
         <field name="tag_name">Giá trị HHDV bán ra chịu thuế 5%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_line_02_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 
     <record id="account_tax_report_line_03_02_02_vn" model="account.tax.report.line">
         <field name="name">Giá trị HHDV bán ra chịu thuế 10%</field>
         <field name="tag_name">Giá trị HHDV bán ra chịu thuế 10%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_02_02_vn"/>
-        <field name="country_id" ref="base.vn"/>
     </record>
 </odoo>
diff --git a/addons/l10n_za/data/account_tax_report_data.xml b/addons/l10n_za/data/account_tax_report_data.xml
index e0a53422a554a4db2cf0db73e99b6ebed7977747..0eb16ed5193866b57e93706a8cdf40bb1732a948 100644
--- a/addons/l10n_za/data/account_tax_report_data.xml
+++ b/addons/l10n_za/data/account_tax_report_data.xml
@@ -1,248 +1,253 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.za"/>
+    </record>
+
     <record id="total_vat_payable" model="account.tax.report.line">
         <field name="name">[20] VAT PAYABLE/REFUNDABLE (Total A - Total B)</field>
         <field name="formula"> (VAT4 + VAT4A + (SEC6 * 60/100 + SEC7) + VAT11 + VAT12) - (VAT14 + VAT14A + VAT15 + VAT16 + VAT17 + VAT18)</field>
-        <field name="country_id" ref="base.za"/>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
     </record>
 
     <record id="total_output_tax" model="account.tax.report.line">
         <field name="name">[13] Total A: TOTAL OUTPUT TAX (4 + 4A + 9 + 11 + 12)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="formula">VAT4 + VAT4A + (SEC6 * 60/100 + SEC7) + VAT11 + VAT12</field>
         <field name="parent_id" ref='total_vat_payable'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="total_input_tax" model="account.tax.report.line">
         <field name="name">[19] Total B: TOTAL INPUT TAX (14 + 14A + 15 + 16 + 17 + 18)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="formula">VAT14 + VAT14A + VAT15 + VAT16 + VAT17 + VAT18</field>
         <field name="parent_id" ref='total_vat_payable'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="standard_rate_exclude_capital_goods_service" model="account.tax.report.line">
         <field name="name">[1] Standard Rate (Excluding Capital goods and/or services and accomodation)</field>
         <field name="tag_name">[1] Standard Rate (Excluding Capital goods and/or services and accomodation)</field>
         <field name="code">VAT1</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_on_standard_rate_exclude_capital_goods_service" model="account.tax.report.line">
         <field name="name">[4] x 15/ (100 + 15)</field>
         <field name="tag_name">[4] x 15/ (100 + 15)</field>
         <field name="code">VAT4</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="standard_rate_only_capital_goods_service" model="account.tax.report.line">
         <field name="name">[1A] Standard Rate (Only Capital goods and/or services)</field>
         <field name="tag_name">[1A] Standard Rate (Only Capital goods and/or services)</field>
         <field name="code">VAT1A</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_on_standard_rate_only_capital_goods_service" model="account.tax.report.line">
         <field name="name">[4A] x 15/ (100 + 15)</field>
         <field name="tag_name">[4A] x 15/ (100 + 15)</field>
         <field name="code">VAT4A</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="zero_rate_exclude_goods_exported" model="account.tax.report.line">
         <field name="name">[2] Zero Rate (excluding goods exported)</field>
         <field name="tag_name">[2] Zero Rate (excluding goods exported)</field>
         <field name="code">VAT2</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="zero_rate_only_goods_exported" model="account.tax.report.line">
         <field name="name">[2A] Zero Rate (Only goods exported)</field>
         <field name="tag_name">[2A] Zero Rate (Only goods exported)</field>
         <field name="code">VAT2A</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="exempt_and_non_supplies" model="account.tax.report.line">
         <field name="name">[3] Exempt and Non supplies</field>
         <field name="tag_name">[3] Exempt and Non supplies</field>
         <field name="code">VAT3</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="accomodation_exceeding_28_days" model="account.tax.report.line">
         <field name="name">[5] Accomodation exceeding 28 days</field>
         <field name="tag_name">[5] Accomodation exceeding 28 days</field>
         <field name="code">VAT5</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="9"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="accomodation_exceeding_28_days_60_percent" model="account.tax.report.line">
         <field name="name">[6] x 60%</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="11"/>
         <field name="formula"> VAT5 * 60 / 100</field>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="accomodation_under_28_days" model="account.tax.report.line">
         <field name="name">[7] Accomodation under 28 days</field>
         <field name="tag_name">[7] Accomodation under 28 days</field>
         <field name="code">VAT7</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="12"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="accomodation_28_days" model="account.tax.report.line">
         <field name="name">[8] Total (6 + 7)</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="14"/>
         <field name="formula">(VAT5 * 60 / 100) + VAT7</field>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_on_accomodation_28_days" model="account.tax.report.line">
         <field name="name">[9] x 15 / (100 ??) </field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="15"/>
         <field name="formula"> SEC6 * 60/100 + SEC7 </field>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_on_accomodation_exceeding_28_days" model="account.tax.report.line">
         <field name="name">VAT on Accomodation exceeding 28 days</field>
         <field name="tag_name">VAT on Accomodation exceeding 28 days</field>
         <field name="code">SEC6</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref='vat_on_accomodation_28_days'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_on_accomodation_under_28_days" model="account.tax.report.line">
         <field name="name">VAT on Accomodation under 28 days</field>
         <field name="tag_name">VAT on Accomodation under 28 days</field>
         <field name="code">SEC7</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref='vat_on_accomodation_28_days'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_plus_base_of_second_hand_goods_export" model="account.tax.report.line">
         <field name="name">[10] Change in use and export of second-hand goods</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="17"/>
         <field name="formula"> VAT10a + VAT11</field>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="second_hand_goods_export" model="account.tax.report.line">
         <field name="name">[10] Base Amount: Change in use and export of second-hand goods</field>
         <field name="tag_name">[10] Change in use and export of second-hand goods</field>
         <field name="code">VAT10a</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref='vat_plus_base_of_second_hand_goods_export'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="vat_on_second_hand_goods_export" model="account.tax.report.line">
         <field name="name">[11] x 15 / (100 + 15)</field>
         <field name="tag_name">[11] x 15 / (100 + 15)</field>
         <field name="code">VAT11</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="18"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="other_imported_services" model="account.tax.report.line">
         <field name="name">[12] Other and imported services</field>
         <field name="tag_name">[12] Other and imported services</field>
         <field name="code">VAT12</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="19"/>
         <field name="parent_id" ref='total_output_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="capital_goods_services_supplied" model="account.tax.report.line">
         <field name="name">[14] Capital Goods and/or services supplied to you</field>
         <field name="tag_name">[14] Capital Goods and/or services supplied to you</field>
         <field name="code">VAT14</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="21"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="capital_goods_imported" model="account.tax.report.line">
         <field name="name">[14A] Capital Goods imported by you</field>
         <field name="tag_name">[14A] Capital Goods imported by you</field>
         <field name="code">VAT14A</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="22"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="other_goods_services_supplied" model="account.tax.report.line">
         <field name="name">[15] Other goods and/or services supplied to you (not Capital Goods)</field>
         <field name="tag_name">[15] Other goods and/or services supplied to you (not Capital Goods)</field>
         <field name="code">VAT15</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="23"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="other_goods_imported" model="account.tax.report.line">
         <field name="name">[15A] Other goods imported by you (not Capital Goods)</field>
         <field name="tag_name">[15A] Other goods imported by you (not Capital Goods)</field>
         <field name="code">VAT15A</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="24"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="change_in_use" model="account.tax.report.line">
         <field name="name">[16] Change in Use</field>
         <field name="tag_name">[16] Change in Use</field>
         <field name="code">VAT16</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="25"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="bad_debts" model="account.tax.report.line">
         <field name="name">[17] Bad Debts</field>
         <field name="tag_name">[17] Bad Debts</field>
         <field name="code">VAT17</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="26"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
     <record id="others" model="account.tax.report.line">
         <field name="name">[18] Other</field>
         <field name="tag_name">[18] Other</field>
         <field name="code">VAT18</field>
+        <field name="report_id" ref="tax_report"/>
         <field name="sequence" eval="27"/>
         <field name="parent_id" ref='total_input_tax'/>
-        <field name="country_id" ref="base.za"/>
     </record>
 
 </odoo>