odoo-addon-l10n-es-vat-book 15.0.2.3.0__py3-none-any.whl → 17.0.1.3.5__py3-none-any.whl

odoo/addons/l10n_es_vat_book/i18n/vi.po

@@ -318,13 +318,11 @@ msgstr ""
 
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__message_needaction
-#: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__message_has_error
-#: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -402,19 +400,19 @@ msgid "Journal in which post the move."
 msgstr ""
 
 #. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__representative_vat
-msgid "L.R. VAT number"
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_tax_summary__move_line_ids
+msgid "Journal items"
 msgstr ""
 
 #. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line____last_update
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book____last_update
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_line____last_update
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_line_tax____last_update
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_summary____last_update
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_tax_summary____last_update
-msgid "Last Modified on"
-msgstr "Sửa lần cuối vào"
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_tax_summary__base_move_line_ids
+msgid "Journal items (Base)"
+msgstr ""
+
+#. module: l10n_es_vat_book
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__representative_vat
+msgid "L.R. VAT number"
+msgstr ""
 
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line__write_uid
@@ -451,11 +449,6 @@ msgstr ""
 msgid "Line Type"
 msgstr ""
 
-#. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__message_has_error
 msgid "Message Delivery error"
@@ -466,11 +459,6 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__model_id
-msgid "Model"
-msgstr ""
-
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__number
 msgid "Model number"
@@ -482,6 +470,11 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
+#. module: l10n_es_vat_book
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_line_tax__base_move_line_ids
+msgid "Move Lines (Base)"
+msgstr ""
+
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__contact_name
 msgid "Must have name and surname."
@@ -534,7 +527,7 @@ msgstr ""
 
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: l10n_es_vat_book
@@ -542,11 +535,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: l10n_es_vat_book
-#: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__partner_id
 msgid "Partner"
@@ -635,8 +623,8 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__message_has_sms_error
-msgid "SMS Delivery error"
+#: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.view_vat_book_tax_summary_tree
+msgid "Show journal items"
 msgstr ""
 
 #. module: l10n_es_vat_book
@@ -743,10 +731,16 @@ msgid "Tax"
 msgstr ""
 
 #. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line__tax_account_id
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line__account_xmlid_id
 msgid "Tax Account Restriction"
 msgstr ""
 
+#. module: l10n_es_vat_book
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line__tax_agency_ids
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__tax_agency_ids
+msgid "Tax Agency"
+msgstr ""
+
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_summary__tax_amount
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book_tax_summary__tax_amount
@@ -775,7 +769,7 @@ msgid "Tax fee"
 msgstr ""
 
 #. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line__tax_tmpl_ids
+#: model:ir.model.fields,field_description:l10n_es_vat_book.field_aeat_vat_book_map_line__tax_xmlid_ids
 #: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.view_vat_book_line_form
 msgid "Taxes"
 msgstr ""
@@ -788,12 +782,14 @@ msgid ""
 msgstr ""
 
 #. module: l10n_es_vat_book
+#. odoo-python
 #: code:addons/l10n_es_vat_book/models/l10n_es_vat_book.py:0
 #, python-format
 msgid "This book has warnings. Fix it before confirm"
 msgstr ""
 
 #. module: l10n_es_vat_book
+#. odoo-python
 #: code:addons/l10n_es_vat_book/models/l10n_es_vat_book.py:0
 #, python-format
 msgid "This company doesn't have VAT"
@@ -829,16 +825,6 @@ msgstr ""
 msgid "Type xlsx column"
 msgstr ""
 
-#. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: l10n_es_vat_book
-#: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: l10n_es_vat_book
 #: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.vat_book_invoices_head
 msgid "VAT"
@@ -914,12 +900,14 @@ msgid "Website communication history"
 msgstr ""
 
 #. module: l10n_es_vat_book
+#. odoo-python
 #: code:addons/l10n_es_vat_book/models/l10n_es_vat_book.py:0
 #, python-format
 msgid "Without Partner"
 msgstr ""
 
 #. module: l10n_es_vat_book
+#. odoo-python
 #: code:addons/l10n_es_vat_book/models/l10n_es_vat_book.py:0
 #, python-format
 msgid "Without VAT"
@@ -930,25 +918,10 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#. module: l10n_es_vat_book
-#: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.view_l10n_es_vat_book_form
-msgid "You have"
-msgstr ""
-
-#. module: l10n_es_vat_book
-#: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.view_l10n_es_vat_book_form
-msgid "errors"
-msgstr ""
-
-#. module: l10n_es_vat_book
-#: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.view_l10n_es_vat_book_form
-msgid ""
-"in this report.\n"
-"                        You will not be able to <strong>confirm and submit</"
-"strong> it until they are resolved."
-msgstr ""
-
 #. module: l10n_es_vat_book
 #: model:ir.actions.report,print_report_name:l10n_es_vat_book.l10n_es_vat_book_xlsx
 msgid "object.get_report_file_name()"
 msgstr ""
+
+#~ msgid "Last Modified on"
+#~ msgstr "Sửa lần cuối vào"

odoo/addons/l10n_es_vat_book/models/aeat_vat_book_map_line.py

@@ -24,15 +24,30 @@ class AeatVatBookMapLines(models.Model):
     )
     fee_type_xlsx_column = fields.Char(string="Type xlsx column")
     fee_amount_xlsx_column = fields.Char(string="Base xlsx column")
-    tax_tmpl_ids = fields.Many2many(
-        comodel_name="account.tax.template",
-        string="Taxes",
+    tax_xmlid_ids = fields.Many2many(
+        comodel_name="l10n.es.aeat.map.tax.line.tax", string="Taxes"
     )
-    tax_account_id = fields.Many2one(
-        comodel_name="account.account.template",
+    account_xmlid_id = fields.Many2one(
+        comodel_name="l10n.es.aeat.map.tax.line.account",
         string="Tax Account Restriction",
     )
+    tax_agency_ids = fields.Many2many("aeat.tax.agency", string="Tax Agency")
 
-    def get_taxes(self, report):
+    def get_taxes_for_company(self, company):
+        """Obtain the taxes corresponding to this line according the given company."""
         self.ensure_one()
-        return report.get_taxes_from_templates(self.tax_tmpl_ids)
+        tax_ids = set()
+        for tax_xmlid in self.tax_xmlid_ids:
+            tax_id = company._get_tax_id_from_xmlid(tax_xmlid.name)
+            if tax_id:
+                tax_ids.add(tax_id)
+        return self.env["account.tax"].browse(list(tax_ids))
+
+    def get_accounts_for_company(self, company):
+        """Obtain the accounts corresponding to the line according the given company."""
+        self.ensure_one()
+        account_ids = set()
+        account_id = company._get_account_id_from_xmlid(self.account_xmlid_id.name)
+        if account_id:
+            account_ids.add(account_id)
+        return self.env["account.account"].browse(list(account_ids))

odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book.py

@@ -20,14 +20,14 @@ class L10nEsVatBook(models.Model):
     _aeat_number = "LIVA"
     _period_yearly = True
 
-    number = fields.Char(default="vat_book", readonly="True")
+    number = fields.Char(default="vat_book", readonly=True)
 
     line_ids = fields.One2many(
         comodel_name="l10n.es.vat.book.line",
         inverse_name="vat_book_id",
         string="Issued/Received invoices",
         copy=False,
-        readonly="True",
+        readonly=True,
     )
 
     issued_line_ids = fields.One2many(
@@ -36,7 +36,7 @@ class L10nEsVatBook(models.Model):
         domain=[("line_type", "=", "issued")],
         string="Issued invoices",
         copy=False,
-        readonly="True",
+        readonly=True,
     )
 
     rectification_issued_line_ids = fields.One2many(
@@ -45,7 +45,7 @@ class L10nEsVatBook(models.Model):
         domain=[("line_type", "=", "rectification_issued")],
         string="Issued Refund Invoices",
         copy=False,
-        readonly="True",
+        readonly=True,
     )
 
     received_line_ids = fields.One2many(
@@ -54,7 +54,7 @@ class L10nEsVatBook(models.Model):
         domain=[("line_type", "=", "received")],
         string="Received invoices",
         copy=False,
-        readonly="True",
+        readonly=True,
     )
 
     rectification_received_line_ids = fields.One2many(
@@ -63,7 +63,7 @@ class L10nEsVatBook(models.Model):
         domain=[("line_type", "=", "rectification_received")],
         string="Received Refund Invoices",
         copy=False,
-        readonly="True",
+        readonly=True,
     )
 
     calculation_date = fields.Date()
@@ -72,7 +72,7 @@ class L10nEsVatBook(models.Model):
         comodel_name="l10n.es.vat.book.tax.summary",
         string="Tax Summary",
         inverse_name="vat_book_id",
-        readonly="True",
+        readonly=True,
     )
 
     issued_tax_summary_ids = fields.One2many(
@@ -80,7 +80,7 @@ class L10nEsVatBook(models.Model):
         string="Issued Tax Summary",
         inverse_name="vat_book_id",
         domain=[("book_type", "=", "issued")],
-        readonly="True",
+        readonly=True,
     )
 
     received_tax_summary_ids = fields.One2many(
@@ -88,14 +88,14 @@ class L10nEsVatBook(models.Model):
         string="Received Tax Summary",
         inverse_name="vat_book_id",
         domain=[("book_type", "=", "received")],
-        readonly="True",
+        readonly=True,
     )
 
     summary_ids = fields.One2many(
         comodel_name="l10n.es.vat.book.summary",
         string="Summary",
         inverse_name="vat_book_id",
-        readonly="True",
+        readonly=True,
     )
 
     issued_summary_ids = fields.One2many(
@@ -103,7 +103,7 @@ class L10nEsVatBook(models.Model):
         string="Issued Summary",
         inverse_name="vat_book_id",
         domain=[("book_type", "=", "issued")],
-        readonly="True",
+        readonly=True,
     )
 
     received_summary_ids = fields.One2many(
@@ -111,11 +111,11 @@ class L10nEsVatBook(models.Model):
         string="Received Summary",
         inverse_name="vat_book_id",
         domain=[("book_type", "=", "received")],
-        readonly="True",
+        readonly=True,
     )
 
     auto_renumber = fields.Boolean(
-        "Auto renumber invoices received", states={"draft": [("readonly", False)]}
+        "Auto renumber invoices received",
     )
 
     error_count = fields.Integer(
@@ -150,6 +150,8 @@ class L10nEsVatBook(models.Model):
                     "tax_id": tax_line.tax_id.id,
                     "vat_book_id": self.id,
                     "special_tax_group": tax_line.special_tax_group,
+                    "base_move_line_ids": tax_line.base_move_line_ids.ids,
+                    "move_line_ids": tax_line.move_line_ids.ids,
                 }
             tax_summary_data_recs[tax_line.tax_id][
                 "base_amount"
@@ -158,6 +160,12 @@ class L10nEsVatBook(models.Model):
             tax_summary_data_recs[tax_line.tax_id][
                 "total_amount"
             ] += tax_line.total_amount
+            tax_summary_data_recs[tax_line.tax_id][
+                "base_move_line_ids"
+            ] += tax_line.base_move_line_ids.ids
+            tax_summary_data_recs[tax_line.tax_id][
+                "move_line_ids"
+            ] += tax_line.move_line_ids.ids
         return tax_summary_data_recs
 
     @api.model
@@ -222,14 +230,16 @@ class L10nEsVatBook(models.Model):
         ext_ref = ""
         invoice = move_line.move_id
         partner = move_line.partner_id
+        invoice_date = move_line.date
         if invoice:
             if invoice.is_invoice():
                 partner = invoice.commercial_partner_id
+                invoice_date = invoice.invoice_date
             ref = invoice.name
             ext_ref = invoice.ref
         return {
             "line_type": line_type,
-            "invoice_date": move_line.date,
+            "invoice_date": invoice_date,
             "partner_id": partner.id,
             "vat_number": partner.vat,
             "move_id": invoice.id,
@@ -249,28 +259,31 @@ class L10nEsVatBook(models.Model):
             balance if move_line.tax_ids and not move_line.tax_line_id else 0.0
         )
         fee_amount_untaxed = balance if move_line.tax_line_id else 0.0
-        return {
+        vals = {
             "tax_id": move_line.tax_line_id.id,
             "base_amount": base_amount_untaxed,
             "tax_amount": fee_amount_untaxed,
-            "total_amount": base_amount_untaxed + fee_amount_untaxed,
-            "move_line_ids": [(4, move_line.id)],
+            "base_move_line_ids": [],
+            "move_line_ids": [],
             "special_tax_group": False,
         }
+        if move_line.tax_ids:
+            vals["base_move_line_ids"].append((4, move_line.id))
+        elif move_line.tax_line_id:
+            vals["move_line_ids"].append((4, move_line.id))
+        return vals
 
     def upsert_book_line_tax(self, move_line, vat_book_line, implied_taxes):
         vals = self._prepare_book_line_tax_vals(move_line, vat_book_line)
         tax_lines = vat_book_line["tax_lines"]
-        implied_lines = []
         if move_line.tax_line_id:
             key = self.get_book_line_tax_key(move_line, move_line.tax_line_id)
             if key not in tax_lines:
-                tax_lines[key] = vals.copy()
+                tax_lines[key] = vals
             else:
+                tax_lines[key]["tax_id"] = move_line.tax_line_id.id
                 tax_lines[key]["tax_amount"] += vals["tax_amount"]
-                tax_lines[key]["total_amount"] += vals["total_amount"]
                 tax_lines[key]["move_line_ids"] += vals["move_line_ids"]
-            implied_lines.append(tax_lines[key])
         for i, tax in enumerate(move_line.tax_ids):
             if i == 0:
                 vat_book_line["base_amount"] += vals["base_amount"]
@@ -282,31 +295,9 @@ class L10nEsVatBook(models.Model):
                 tax_lines[key]["tax_id"] = tax.id
             else:
                 tax_lines[key]["base_amount"] += vals["base_amount"]
-                tax_lines[key]["total_amount"] += vals["total_amount"]
-                # if i == 0:
-                tax_lines[key]["move_line_ids"] += vals["move_line_ids"]
-            implied_lines.append(tax_lines[key])
-            sp_taxes_dic = self.get_special_taxes_dic()
-            if tax.id in sp_taxes_dic:
-                tax_group = sp_taxes_dic[tax.id]["special_tax_group"]
-                vat_book_line["special_tax_group"] = tax_group
-                tax_lines[key]["special_tax_group"] = tax_group
-        if vat_book_line["special_tax_group"]:
-            base_line = next(
-                filter(lambda l: not l["special_tax_group"], implied_lines), None
-            )
-            special_line = next(
-                filter(lambda l: l["special_tax_group"], implied_lines), None
-            )
-            if base_line and special_line:
-                base_line.update(
-                    {
-                        "special_tax_id": special_line["tax_id"],
-                        "special_tax_amount": special_line["tax_amount"],
-                        "total_amount_special_include": base_line["total_amount"]
-                        + special_line["tax_amount"],
-                    }
-                )
+                tax_lines[key]["base_move_line_ids"] += vals["base_move_line_ids"]
+            # For later matching special taxes
+            tax_lines[key]["other_tax_ids"] = (move_line.tax_ids - tax).ids
 
     def _clear_old_data(self):
         """
@@ -323,6 +314,7 @@ class L10nEsVatBook(models.Model):
             ("date", ">=", self.date_start),
             ("date", "<=", self.date_end),
             ("parent_state", "=", "posted"),
+            ("display_type", "not in", ("line_section", "line_note")),
         ]
         if taxes:
             domain.append(("tax_ids", "in", taxes.ids))
@@ -347,7 +339,6 @@ class L10nEsVatBook(models.Model):
             self._account_move_line_domain(taxes=taxes, account=account)
         )
 
-    @ormcache("self.id")
     def get_pos_partner_ids(self):
         return (
             self.env["res.partner"]
@@ -358,12 +349,15 @@ class L10nEsVatBook(models.Model):
 
     @ormcache("self.id")
     def get_special_taxes_dic(self):
-        map_lines = self.env["aeat.vat.book.map.line"].search(
-            [("special_tax_group", "!=", False)]
-        )
+        domain = [("special_tax_group", "!=", False)]
+        if self.tax_agency_ids:
+            domain += [
+                ("tax_agency_ids", "in", [False] + self.tax_agency_ids.ids),
+            ]
+        map_lines = self.env["aeat.vat.book.map.line"].search(domain)
         special_dic = {}
         for map_line in map_lines:
-            for tax in map_line.get_taxes(self):
+            for tax in map_line.get_taxes_for_company(self.company_id):
                 special_dic[tax.id] = {
                     "name": map_line.name,
                     "book_type": map_line.book_type,
@@ -374,23 +368,32 @@ class L10nEsVatBook(models.Model):
         return special_dic
 
     def get_book_line_key(self, move_line):
-        return move_line.move_id.id, move_line.move_id.id
+        return move_line.move_id.id
 
     def get_book_line_tax_key(self, move_line, tax):
-        return move_line.move_id.id, move_line.move_id.id, tax.id
+        return move_line.move_id.id, tax.id
 
     def _set_line_type(self, line_vals, line_type):
         if line_vals["base_amount"] < 0.0:
             line_vals["line_type"] = "rectification_{}".format(line_type)
 
     def _check_exceptions(self, line_vals):
+        rp_model = self.env["res.partner"]
         if not line_vals["partner_id"]:
             line_vals["exception_text"] = _("Without Partner")
-        elif (
-            not line_vals["vat_number"]
-            and line_vals["partner_id"] not in self.get_pos_partner_ids()
-        ):
-            line_vals["exception_text"] = _("Without VAT")
+        elif not line_vals["vat_number"]:  # Doesn't have VAT
+            partner = rp_model.browse(line_vals["partner_id"])
+            country_code, identifier_type, vat_number = partner._parse_aeat_vat_info()
+            req_vat_identif_types = [
+                s_opt[0]
+                for s_opt in rp_model._fields["aeat_identification_type"].selection
+            ] + [""]  # "" is the identification type for Spain
+            # Partner type requires VAT
+            if (
+                identifier_type in req_vat_identif_types
+                and line_vals["partner_id"] not in self.get_pos_partner_ids()
+            ):
+                line_vals["exception_text"] = _("Without VAT")
 
     def create_vat_book_lines(self, move_lines, line_type, taxes):
         VatBookLine = self.env["l10n.es.vat.book.line"]
@@ -403,6 +406,26 @@ class L10nEsVatBook(models.Model):
         lines_values = []
         for line_vals in moves_dic.values():
             tax_lines = line_vals.pop("tax_lines")
+            # Match special taxes groups
+            sp_taxes_dic = self.get_special_taxes_dic()
+            sp_taxes = {}
+            # First loop for extracting special taxes
+            for tax_line in tax_lines.values():
+                if tax_line["tax_id"] in sp_taxes_dic:
+                    tax_group = sp_taxes_dic[tax_line["tax_id"]]["special_tax_group"]
+                    line_vals["special_tax_group"] = tax_group
+                    tax_line["special_tax_group"] = tax_group
+                    if "other_tax_ids" in tax_line:
+                        sp_taxes[tuple(tax_line["other_tax_ids"])] = tax_line
+                tax_line.pop("other_tax_ids", None)
+            # Second loop for putting the values in the other lines
+            if sp_taxes:
+                for tax_line in tax_lines.values():
+                    key = (tax_line["tax_id"],)
+                    if key in sp_taxes:
+                        sp_vals = sp_taxes[key]
+                        tax_line["special_tax_id"] = sp_vals["tax_id"]
+                        tax_line["special_tax_amount"] = sp_vals["tax_amount"]
             tax_line_list = []
             tax_amount = 0.0
             for tax_line_vals in tax_lines.values():
@@ -431,16 +454,19 @@ class L10nEsVatBook(models.Model):
             # Searches for all possible usable lines to report
             moves = rec._get_account_move_lines()
             for book_type in ["issued", "received"]:
-                map_lines = self.env["aeat.vat.book.map.line"].search(
-                    [("book_type", "=", book_type)]
-                )
+                domain = [("book_type", "=", book_type)]
+                if rec.tax_agency_ids:
+                    domain += [
+                        ("tax_agency_ids", "in", [False] + rec.tax_agency_ids.ids),
+                    ]
+                map_lines = self.env["aeat.vat.book.map.line"].search(domain)
                 taxes = self.env["account.tax"]
                 accounts = {}
                 for map_line in map_lines:
-                    line_taxes = map_line.get_taxes(rec)
+                    line_taxes = map_line.get_taxes_for_company(rec.company_id)
                     taxes |= line_taxes
-                    if map_line.tax_account_id:
-                        account = rec.get_account_from_template(map_line.tax_account_id)
+                    if map_line.account_xmlid_id:
+                        account = map_line.get_accounts_for_company(rec.company_id)
                         accounts.update({tax: account for tax in line_taxes})
                 # Filter in all possible data using sets for improving performance
                 if accounts:
@@ -456,7 +482,8 @@ class L10nEsVatBook(models.Model):
                     lines = moves.filtered(
                         lambda line: (line.tax_ids | line.tax_line_id) & taxes
                     )
-                rec.create_vat_book_lines(lines, map_line.book_type, taxes)
+                if map_lines:
+                    rec.create_vat_book_lines(lines, map_lines[:1].book_type, taxes)
             # Issued
             book_type = "issued"
             issued_tax_lines = rec.issued_line_ids.mapped("tax_line_ids")

odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_line.py

@@ -32,7 +32,6 @@ class L10nEsVatBookLine(models.Model):
     invoice_date = fields.Date()
 
     partner_id = fields.Many2one(comodel_name="res.partner", string="Empresa")
-
     vat_number = fields.Char(string="NIF")
 
     vat_book_id = fields.Many2one(comodel_name="l10n.es.vat.book", string="Vat Book id")

odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_line_tax.py

@@ -25,8 +25,16 @@ class L10nEsVatBookLineTax(models.Model):
 
     tax_amount = fields.Float(string="Tax fee")
 
-    total_amount = fields.Float(string="Total")
-
+    total_amount = fields.Float(
+        string="Total",
+        compute="_compute_total_amount",
+        store=True,
+    )
+    base_move_line_ids = fields.Many2many(
+        comodel_name="account.move.line",
+        string="Move Lines (Base)",
+        relation="account_move_line_l10n_es_vat_book_line_tax_base_rel",
+    )
     move_line_ids = fields.Many2many(
         comodel_name="account.move.line", string="Move Lines"
     )
@@ -44,9 +52,23 @@ class L10nEsVatBookLineTax(models.Model):
     )
     total_amount_special_include = fields.Float(
         string="Total w/Special",
+        compute="_compute_total_amount_special_include",
+        store=True,
     )
 
     @api.depends("tax_id")
     def _compute_tax_rate(self):
         for rec in self:
             rec.tax_rate = rec.tax_id.amount
+
+    @api.depends("base_amount", "tax_amount")
+    def _compute_total_amount(self):
+        for record in self:
+            record.total_amount = record.base_amount + record.tax_amount
+
+    @api.depends("total_amount", "special_tax_amount")
+    def _compute_total_amount_special_include(self):
+        for record in self:
+            record.total_amount_special_include = (
+                record.total_amount + record.special_tax_amount
+            )

odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_summary.py

@@ -23,11 +23,11 @@ class L10nEsVatBookIssuedSummary(models.Model):
         selection=[("issued", "Issued"), ("received", "Received")],
     )
 
-    base_amount = fields.Float(readonly="True")
+    base_amount = fields.Float(readonly=True)
 
-    tax_amount = fields.Float(readonly="True")
+    tax_amount = fields.Float(readonly=True)
 
-    total_amount = fields.Float(readonly="True")
+    total_amount = fields.Float(readonly=True)
     special_tax_group = fields.Selection(
         selection=_selection_special_tax_group,
         string="Special group",