odoo-addon-l10n-es-vat-book 16.0.1.3.0.6__py3-none-any.whl → 16.0.1.3.1.1__py3-none-any.whl

odoo/addons/l10n_es_vat_book/README.rst

@@ -7,7 +7,7 @@ Libro de IVA
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ba3ba7dc420c4927b8e7f7000a7bb91382ae099ef5d37df5c48f9f5eb34756ce
+   !! source digest: sha256:6a4596fd61c2a85ea53e7fdd6d90a0636e8cc89c0b3c63ff267652e2fbf49676
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/l10n_es_vat_book/__manifest__.py

@@ -10,7 +10,7 @@
 
 {
     "name": "Libro de IVA",
-    "version": "16.0.1.3.0",
+    "version": "16.0.1.3.1",
     "author": "PRAXYA, ForgeFlow, Tecnativa, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/l10n-spain",
     "license": "AGPL-3",

odoo/addons/l10n_es_vat_book/i18n/es.po

@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-28 23:52+0100\n"
-"PO-Revision-Date: 2023-05-18 11:21+0000\n"
-"Last-Translator: Fernando <fernandolachica@gmail.com>\n"
+"PO-Revision-Date: 2023-09-20 18:13+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: l10n_es_vat_book
 #: model_terms:ir.ui.view,arch_db:l10n_es_vat_book.vat_book_summary
@@ -273,7 +273,7 @@ msgstr "Seguidores"
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,field_description:l10n_es_vat_book.field_l10n_es_vat_book__message_partner_ids
 msgid "Followers (Partners)"
-msgstr "Seguidores (Empresas)"
+msgstr "Seguidores (Socios)"
 
 #. module: l10n_es_vat_book
 #: model:ir.model.fields,help:l10n_es_vat_book.field_l10n_es_vat_book__activity_type_icon

odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book.py

@@ -253,7 +253,6 @@ class L10nEsVatBook(models.Model):
             "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)],
             "special_tax_group": False,
         }
@@ -261,16 +260,14 @@ class L10nEsVatBook(models.Model):
     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 +279,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"],
-                    }
-                )
+            # For later matching special taxes
+            tax_lines[key]["other_tax_ids"] = (move_line.tax_ids - tax).ids
 
     def _clear_old_data(self):
         """
@@ -375,10 +350,10 @@ 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:
@@ -415,6 +390,25 @@ 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
+                    sp_taxes[tuple(tax_line["other_tax_ids"])] = tax_line
+                tax_line.pop("other_tax_ids")
+            # 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():

odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_line_tax.py

@@ -25,7 +25,11 @@ 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,
+    )
 
     move_line_ids = fields.Many2many(
         comodel_name="account.move.line", string="Move Lines"
@@ -44,9 +48,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/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ba3ba7dc420c4927b8e7f7000a7bb91382ae099ef5d37df5c48f9f5eb34756ce
+!! source digest: sha256:6a4596fd61c2a85ea53e7fdd6d90a0636e8cc89c0b3c63ff267652e2fbf49676
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-spain/tree/16.0/l10n_es_vat_book"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-16-0/l10n-spain-16-0-l10n_es_vat_book"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Módulo que calcula el libro de IVA español.</p>

{odoo_addon_l10n_es_vat_book-16.0.1.3.0.6.dist-info → odoo_addon_l10n_es_vat_book-16.0.1.3.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-l10n-es-vat-book
-Version: 16.0.1.3.0.6
+Version: 16.0.1.3.1.1
 Summary: Libro de IVA
 Home-page: https://github.com/OCA/l10n-spain
 Author: PRAXYA, ForgeFlow, Tecnativa, Odoo Community Association (OCA)
@@ -25,7 +25,7 @@ Libro de IVA
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ba3ba7dc420c4927b8e7f7000a7bb91382ae099ef5d37df5c48f9f5eb34756ce
+   !! source digest: sha256:6a4596fd61c2a85ea53e7fdd6d90a0636e8cc89c0b3c63ff267652e2fbf49676
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_l10n_es_vat_book-16.0.1.3.0.6.dist-info → odoo_addon_l10n_es_vat_book-16.0.1.3.1.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-odoo/addons/l10n_es_vat_book/README.rst,sha256=tnbbNBJZJbpG9TFUU9ZtQXi1c2ghekvt1n3b4qTBx4s,5071
+odoo/addons/l10n_es_vat_book/README.rst,sha256=zFWG22Ej8iKSmWjH7FvTAgv2cBk18yszIkx9QGxFblk,5071
 odoo/addons/l10n_es_vat_book/__init__.py,sha256=RYGen4VvN9c8GXvMfZMuO7ERiyRCUJfuAbgo0aC3DEU,42
-odoo/addons/l10n_es_vat_book/__manifest__.py,sha256=SeQzxn5h9c0uJE5yBag0e_5Gfdo_a03bJgGHZFoTjtg,1275
+odoo/addons/l10n_es_vat_book/__manifest__.py,sha256=cCbU_vnpIA_o9uF4qGP4-L4HHOLr3xAkhs2v5dZFilw,1275
 odoo/addons/l10n_es_vat_book/data/aeat_vat_book_map_data.xml,sha256=6pjTKJDBM08XhzTm-n0ODY5ZF_vj9XBXrKSfRoF6DX4,7434
 odoo/addons/l10n_es_vat_book/i18n/bg.po,sha256=D4gjbXit6KPha1z8FS5atyXN8wENVQvyhy5ynF3fG38,34934
 odoo/addons/l10n_es_vat_book/i18n/ca.po,sha256=nkHoprf3NhEvYnkDkETd5F9PxSp_KhtpwAqOykip_ww,40392
 odoo/addons/l10n_es_vat_book/i18n/cs.po,sha256=9UbWawvQqqbeHWO1WZXdCWfdKWoiLYjvNLwGAMbodJQ,34852
 odoo/addons/l10n_es_vat_book/i18n/de.po,sha256=tdGvSwY5dIJm-P6_g9mBcKUzDZoZqdgdMCxkl9gppKE,34661
-odoo/addons/l10n_es_vat_book/i18n/es.po,sha256=Fr70GsxPLaZl5L44hMF8w6_r036lSW9YMuoNxoazHN0,40856
+odoo/addons/l10n_es_vat_book/i18n/es.po,sha256=-ctLGLqFc89fcDJBjt2P24BJEp298qXnZqUbNKk94u4,40853
 odoo/addons/l10n_es_vat_book/i18n/es_CO.po,sha256=Y20MTzLIs3u4CahVArX_NZbe1SqSIve8fCERDx5vhuk,34796
 odoo/addons/l10n_es_vat_book/i18n/es_CR.po,sha256=wsP-d8TLV261n74m_PL_ro3YSxt6oND21lBZaZNExR4,34825
 odoo/addons/l10n_es_vat_book/i18n/eu.po,sha256=RZXr1GqTnXHYJMpN1oKUz4eDFZFcZiCPiY7lU9FnEac,34808
@@ -25,9 +25,9 @@ odoo/addons/l10n_es_vat_book/i18n/tr.po,sha256=fblSZUHbC2v4FMcrtGPC2CTx1TxocGxxQ
 odoo/addons/l10n_es_vat_book/i18n/vi.po,sha256=TbSO1kIj2jymb7psc7YvVnUwxe7FxtZsH2Vxn6WU3zM,34815
 odoo/addons/l10n_es_vat_book/models/__init__.py,sha256=V0ONDc9wKn8JF0Soh2NCORHEAQ7EcOn16SNkxjA50WU,226
 odoo/addons/l10n_es_vat_book/models/aeat_vat_book_map_line.py,sha256=j3sI23I3RXW-pPTM-0VzQOTnVZs9blCzFzXXzf0JpcY,1285
-odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book.py,sha256=JW0y0EZm5z9BLe_glMn_pyBMewxLUNzuylDEhGCit0w,21850
+odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book.py,sha256=pVdIslUMCekXBCkQJxijXrpcc-69J23AVbICnjIXSlI,21661
 odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_line.py,sha256=9LqiNYUGomYBVIyvdT1qTnNwHKTM3df6jJxWvnoIsLk,2146
-odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_line_tax.py,sha256=XE-5CpMciaLvTS9Q6bT5y4Tq7FY-VLvGNbQuqnbjHJ4,1601
+odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_line_tax.py,sha256=NtLZnB8M1px_nKlBZh4F7HjobDniEKd7IR6siQn5J08,2206
 odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_summary.py,sha256=jKvai8td7NQwT2suuY-dA1AfQxRvM6VBIVuHZnfwSrY,1208
 odoo/addons/l10n_es_vat_book/models/l10n_es_vat_book_tax_summary.py,sha256=Cpziwm_1t_wfuLR-TQrMlB45KhP1O0KZCUtUgOQzQl0,699
 odoo/addons/l10n_es_vat_book/readme/CONFIGURE.rst,sha256=p0gkMvzeKo8w5Gjz4rVE5iuQx2gd-sd9nChaeUs45fI,348
@@ -46,7 +46,7 @@ odoo/addons/l10n_es_vat_book/report/vat_book_xlsx.xml,sha256=sZd6sU-mnZUN-odM8R5
 odoo/addons/l10n_es_vat_book/security/ir.model.access.csv,sha256=D-VRSm4gZ7A0LOlIH9JL-EXkH7EzbubObuFL634GuUs,871
 odoo/addons/l10n_es_vat_book/security/ir_rule.xml,sha256=4HkdO_WPIAK6hXcVUIFTLmzl0af-tVplhO-o2Xsic1M,521
 odoo/addons/l10n_es_vat_book/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/l10n_es_vat_book/static/description/index.html,sha256=PGo5F6jeWYBB2Km26uUt1a5rZPwUhfCGh517wPEeJKA,16164
+odoo/addons/l10n_es_vat_book/static/description/index.html,sha256=eTDwKNZzNJaVmX53kO2f1ebCGYe3X3U_gKI9E1i_nQ8,16164
 odoo/addons/l10n_es_vat_book/tests/__init__.py,sha256=4dynCSzE14Nz6hAqV9vEmx8lEt3Byn-gqNKA0-wj7uc,41
 odoo/addons/l10n_es_vat_book/tests/test_l10n_es_aeat_vat_book.py,sha256=xwZ_lQxDCqgNxVuOsZoNW_kfTjEL5c1FX9Xxsr6SjXI,4126
 odoo/addons/l10n_es_vat_book/views/aeat_vat_book_map_view.xml,sha256=686ze0LDPaUBP0_KSVKJYBqLrc9pkHKjwOWn6G_Yt3E,1197
@@ -54,7 +54,7 @@ odoo/addons/l10n_es_vat_book/views/l10n_es_vat_book.xml,sha256=UzY_5TVUR4uzxPkTX
 odoo/addons/l10n_es_vat_book/views/l10n_es_vat_book_line.xml,sha256=0M2D2H77sZVnjxzZpb6zDqNRGSK3xbmbi_gVbQnoh0E,4689
 odoo/addons/l10n_es_vat_book/views/l10n_es_vat_book_summary.xml,sha256=PTX2BDmnE6bIZjlMlRH6R479DdZgDPzG0WO_e-iC2gU,1333
 odoo/addons/l10n_es_vat_book/views/l10n_es_vat_book_tax_summary.xml,sha256=eKW-YU07Y2b9Z3OeGWWory9pU65vk4N9sHT0q5j4Qek,1355
-odoo_addon_l10n_es_vat_book-16.0.1.3.0.6.dist-info/METADATA,sha256=BbuvBp8mRuwZ4pPwwMRioh5QJBLsqqVKyID4WmwdlJo,5728
-odoo_addon_l10n_es_vat_book-16.0.1.3.0.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-odoo_addon_l10n_es_vat_book-16.0.1.3.0.6.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_l10n_es_vat_book-16.0.1.3.0.6.dist-info/RECORD,,
+odoo_addon_l10n_es_vat_book-16.0.1.3.1.1.dist-info/METADATA,sha256=4wrkPvPTD2j7B8qCW9we69cL_EaPRRAnhLhboY9hE1g,5728
+odoo_addon_l10n_es_vat_book-16.0.1.3.1.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+odoo_addon_l10n_es_vat_book-16.0.1.3.1.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_l10n_es_vat_book-16.0.1.3.1.1.dist-info/RECORD,,