[FIX] l10n_es_aeat_mod349: refund intermediate periods

Use case:
* Invoice January 2023: 1.000€
* Credit note February 2023: -200€
* credit note March 2023: -200€

Without the fix:
* 349 January total amount 1000€ (correct)
* 349 February total rectified amount 800€ (correct) and original amount 1000€ (correct)
* 349 March total rectified amount 800€ (incorrect) and original amount 1000€ (incorrect)

With the fix:
* 349 January total amount 1000€ (correct)
* 349 February total rectified amount 800€ (correct) and original amount 1000€ (correct)
* 349 March total rectified amount 600€ (correct) and original amount 800€ (correct)

l10n_es_aeat_mod349/models/mod349.py

@@ -250,26 +250,17 @@ def _create_349_refund_records(self):
                 # happens in this way because the right original_amount
                 # will be the value of the total_operation_amount
                 # corresponding to the last period found in between the periods
-                other_invoice_period = (
-                    all_details_period.mapped("move_id") - origin_invoice
-                )
-                refund_invoice_ids = self.env["account.move"].search(
-                    [("reversed_entry_id", "in", other_invoice_period.ids)]
+                last_refund_detail = refund_detail_obj.search(
+                    [
+                        ("report_id.date_start", ">", report.date_end),
+                        ("report_id.date_end", "<", self.date_start),
+                        ("move_id", "in", origin_invoice.reversal_move_id.ids),
+                    ],
+                    order="date desc",
+                    limit=1,
                 )
-                if refund_invoice_ids:
-                    last_refund_detail = refund_detail_obj.search(
-                        [
-                            ("report_id.date_start", ">", report.date_end),
-                            ("report_id.date_end", "<", self.date_start),
-                            ("move_id", "in", refund_invoice_ids.ids),
-                        ],
-                        order="date desc",
-                        limit=1,
-                    )
-                    if last_refund_detail:
-                        origin_amount = (
-                            last_refund_detail.refund_id.total_operation_amount
-                        )
+                if last_refund_detail:
+                    origin_amount = last_refund_detail.refund_id.total_operation_amount
 
             else:
                 # There's no previous 349 declaration report in Odoo

l10n_es_aeat_mod349/readme/CONTRIBUTORS.rst

@@ -25,3 +25,7 @@
   * Manuel Regidor
 
 * Jairo Llopis (Moduon)
+
+* `Factor Libre <https://factorlibre.com>`_:
+
+    * Luis J. Salvatierra <[email protected]>

l10n_es_aeat_mod349/tests/test_l10n_es_aeat_mod349.py

@@ -4,13 +4,16 @@
 
 import logging
 
+from odoo.tests.common import tagged
+
 from odoo.addons.l10n_es_aeat.tests.test_l10n_es_aeat_mod_base import (
     TestL10nEsAeatModBase,
 )
 
 _logger = logging.getLogger("aeat.349")
 
 
+@tagged("post_install", "-at_install")
 class TestL10nEsAeatMod349Base(TestL10nEsAeatModBase):
     # Set 'debug' attribute to True to easy debug this test
     # Do not forget to include '--log-handler aeat:DEBUG' in Odoo command line
@@ -23,6 +26,25 @@ class TestL10nEsAeatMod349Base(TestL10nEsAeatModBase):
         "P_IVA21_IC_BC//2": (150, 0),
     }
 
+    @classmethod
+    def _invoice_refund(cls, invoice, dt, price_unit=None):
+        _logger.debug(
+            "Refund {} invoice: date = {}: price_unit = {}".format(
+                invoice.move_type, dt, price_unit or 150.0
+            )
+        )
+        default_values_list = [
+            {"date": dt, "invoice_date": dt, "invoice_payment_term_id": None}
+        ]
+        inv = invoice.with_user(cls.billing_user)._reverse_moves(default_values_list)
+        if price_unit is not None:
+            for line in inv.invoice_line_ids:
+                line.price_unit = price_unit
+        inv.action_post()
+        if cls.debug:
+            cls._print_move_lines(inv.line_ids)
+        return inv
+
     def test_model_349(self):
         # Add some test data
         self.customer.write(
@@ -210,3 +232,79 @@ def test_model_349(self):
         self.env.ref("l10n_es_aeat_mod349.act_report_aeat_mod349_pdf")._render(
             "l10n_es_aeat_mod349.report_l10n_es_mod349_pdf", model349.ids, {}
         )
+
+    def test_model_349_with_intermediate_periods(self):
+        # Create vendor bill and 2 refunds in different periods
+        inv = self._invoice_purchase_create("2017-01-01")
+        self._invoice_refund(inv, "2017-02-01", price_unit=50.0)
+        self._invoice_refund(inv, "2017-03-01", price_unit=50.0)
+        # Create model
+        model349_model = self.env["l10n.es.aeat.mod349.report"].with_user(
+            self.account_manager
+        )
+        model349_1 = model349_model.create(
+            {
+                "name": "3490000000001",
+                "company_id": self.company.id,
+                "company_vat": "1234567890",
+                "contact_name": "Test owner",
+                "statement_type": "N",
+                "support_type": "T",
+                "contact_phone": "911234455",
+                "year": 2017,
+                "period_type": "01",
+                "date_start": "2017-01-01",
+                "date_end": "2017-01-31",
+            }
+        )
+        # Calculate
+        _logger.debug("Calculate AEAT 349 January 2017")
+        model349_1.button_calculate()
+        self.assertEqual(model349_1.total_partner_records, 1)
+        self.assertEqual(model349_1.partner_record_ids.total_operation_amount, 300)
+
+        model349_2 = model349_model.create(
+            {
+                "name": "3490000000002",
+                "company_id": self.company.id,
+                "company_vat": "1234567890",
+                "contact_name": "Test owner",
+                "statement_type": "N",
+                "support_type": "T",
+                "contact_phone": "911234455",
+                "year": 2017,
+                "period_type": "02",
+                "date_start": "2017-02-01",
+                "date_end": "2017-02-28",
+            }
+        )
+        # Calculate
+        _logger.debug("Calculate AEAT 349 February 2017")
+        model349_2.button_calculate()
+        self.assertEqual(model349_2.total_partner_records, 0)
+        self.assertEqual(model349_2.total_partner_refunds, 1)
+        self.assertEqual(model349_2.partner_refund_ids.total_origin_amount, 300)
+        self.assertEqual(model349_2.partner_refund_ids.total_operation_amount, 200)
+
+        model349_3 = model349_model.create(
+            {
+                "name": "3490000000003",
+                "company_id": self.company.id,
+                "company_vat": "1234567890",
+                "contact_name": "Test owner",
+                "statement_type": "N",
+                "support_type": "T",
+                "contact_phone": "911234455",
+                "year": 2017,
+                "period_type": "03",
+                "date_start": "2017-03-01",
+                "date_end": "2017-03-31",
+            }
+        )
+        # Calculate
+        _logger.debug("Calculate AEAT 349 March 2017")
+        model349_3.button_calculate()
+        self.assertEqual(model349_3.total_partner_records, 0)
+        self.assertEqual(model349_3.total_partner_refunds, 1)
+        self.assertEqual(model349_3.partner_refund_ids.total_origin_amount, 200)
+        self.assertEqual(model349_3.partner_refund_ids.total_operation_amount, 100)