[FIX] l10n_it_withholding_tax: pagando più fatture il rimane un amount_residual pari al valore delle ritenute

l10n_it_withholding_tax/models/account.py

@@ -54,10 +54,7 @@
         # If we are reconciling a vendor bill and its refund,
         # we do not need to generate Withholding Tax Moves
         # or change the reconciliation amount
-        in_refunding = len(invoices) == 2 and set(invoices.mapped("move_type")) == {
-            "in_invoice",
-            "in_refund",
-        }
+        in_refunding = invoices._wt_in_refunding()
         if not in_refunding:
             paying_invoice = first(invoices)
         else:
@@ -72,30 +69,50 @@
         debit_move_line, credit_move_line = self._wt_get_move_lines(vals)
         move_lines = debit_move_line | credit_move_line
         paying_invoice = self._wt_get_paying_invoice(move_lines)
+        reconcile_existing = False
         # Limit value of reconciliation
         if (
             paying_invoice
             and paying_invoice.withholding_tax
-            and paying_invoice.amount_net_pay
+            and paying_invoice.amount_net_pay_residual
         ):
             # We must consider amount in foreign currency, if present
             # Note that this is always executed, for every reconciliation.
             # Thus, we must not change amount when not in withholding tax case
             amount = vals.get("amount_currency") or vals.get("amount")
             digits_rounding_precision = paying_invoice.company_id.currency_id.rounding
+            if amount == 0.0:
+                # it's a reconciliation with an existing move line
+                if (
+                    float_compare(
+                        abs(debit_move_line.amount_residual),
+                        abs(credit_move_line.amount_residual),
+                        precision_rounding=digits_rounding_precision,
+                    )
+                    == 0
+                ):
+                    amount = abs(move_lines[0].amount_residual)
+                    vals.update(
+                        {
+                            "amount": amount,
+                            "credit_amount_currency": amount,
+                            "debit_amount_currency": amount,
+                        }
+                    )
+                    reconcile_existing = True
             if (
                 float_compare(
                     amount,
-                    paying_invoice.amount_net_pay,
+                    paying_invoice.amount_net_pay_residual,
                     precision_rounding=digits_rounding_precision,
                 )
                 == 1
             ):
                 vals.update(
                     {
-                        "amount": paying_invoice.amount_net_pay,
-                        "credit_amount_currency": paying_invoice.amount_net_pay,
-                        "debit_amount_currency": paying_invoice.amount_net_pay,
+                        "amount": paying_invoice.amount_net_pay_residual,
+                        "credit_amount_currency": paying_invoice.amount_net_pay_residual,
+                        "debit_amount_currency": paying_invoice.amount_net_pay_residual,
                     }
                 )
 
@@ -106,11 +123,26 @@
 
         moves = move_lines.move_id
         lines = self.env["account.move.line"].search(
-            [("withholding_tax_generated_by_move_id", "in", moves.ids)]
+            [
+                ("withholding_tax_generated_by_move_id", "in", moves.ids),
+                ("balance", "=", abs(vals.get("amount"))),
+            ]
         )
+        if not lines:
+            for move in moves.filtered(lambda x: x.withholding_tax_amount):
+                lines = self.env["account.move.line"].search(
+                    [
+                        ("withholding_tax_generated_by_move_id", "in", moves.ids),
+                        ("balance", "=", abs(move.withholding_tax_amount)),
+                        ("name", "=ilike", move.name),
+                    ]
+                )
+                if lines:
+                    reconcile_existing = True
         if lines:
             is_wt_move = True
-            reconcile.generate_wt_moves(is_wt_move, lines)
+            if not reconcile_existing:
+                reconcile.generate_wt_moves(is_wt_move, lines)
         else:
             is_wt_move = False
 
@@ -127,7 +159,8 @@
                 )
             ):
                 # and not wt_existing_moves\
-                reconcile.generate_wt_moves(is_wt_move)
+                if not reconcile_existing:
+                    reconcile.generate_wt_moves(is_wt_move)
 
         return reconcile
 
@@ -152,7 +185,7 @@
         wt_statements = wt_statement_obj.browse()
         rec_line_statement = rec_line_model.browse()
         for rec_line in rec_lines:
-            domain = [("move_id", "=", rec_line.move_id.id)]
+            domain = [("invoice_id", "=", rec_line.move_id.id)]
             wt_statements = wt_statement_obj.search(domain)
             if wt_statements:
                 rec_line_statement = rec_line
@@ -470,7 +503,6 @@
             val = {
                 "wt_type": "",
                 "date": self.date,
-                "move_id": self.id,
                 "invoice_id": self.id,
                 "partner_id": self.partner_id.id,
                 "withholding_tax_id": inv_wt.withholding_tax_id.id,
@@ -507,7 +539,7 @@
         if posted_moves:
             statements = self.env["withholding.tax.statement"].search(
                 [
-                    ("move_id", "in", posted_moves.ids),
+                    ("invoice_id", "in", posted_moves.ids),
                 ],
             )
             statements.unlink()
@@ -518,6 +550,12 @@
             self._wt_unlink_statements()
         return super().write(vals)
 
+    def _wt_in_refunding(self):
+        return len(self) == 2 and set(self.mapped("move_type")) == {
+            "in_invoice",
+            "in_refund",
+        }
+
 
 class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
@@ -558,6 +596,39 @@
 
         return super(AccountMoveLine, self).remove_move_reconcile()
 
+    def _prepare_reconciliation_partials(self):
+        wt_move_lines = self.filtered(lambda x: x.withholding_tax_amount != 0)
+        if not wt_move_lines:
+            return super()._prepare_reconciliation_partials()
+        credit_lines = self.filtered(lambda line: line.credit)
+        debit_line_ids = (self - credit_lines).ids
+        partials_vals_list = []
+        for credit_line in credit_lines:
+            next_debit_line_id = debit_line_ids.pop(0) if debit_line_ids else False
+            if next_debit_line_id:
+                debit_line = self.browse(next_debit_line_id)
+            total_amount_payment = debit_line.balance
+            invoices = (credit_line | debit_line).move_id.filtered(
+                lambda move: move.is_invoice()
+            )
+            in_refunding = invoices._wt_in_refunding()
+            residual_amount = credit_line.move_id.amount_net_pay_residual
+            if not in_refunding and total_amount_payment > residual_amount:
+                total_amount_payment -= residual_amount
+            else:
+                residual_amount = total_amount_payment
+            partials_vals_list.append(
+                {
+                    "amount": residual_amount,
+                    "debit_amount_currency": residual_amount,
+                    "credit_amount_currency": residual_amount,
+                    "debit_move_id": debit_line.id,
+                    "credit_move_id": credit_line.id,
+                }
+            )
+
+        return partials_vals_list
+
     @api.model
     def _default_withholding_tax(self):
         result = []

l10n_it_withholding_tax/models/withholding_tax.py

@@ -226,7 +226,6 @@ def _compute_total(self):
         store=True,
         compute="_compute_type",
     )
-    move_id = fields.Many2one("account.move", "Account move", ondelete="cascade")
     invoice_id = fields.Many2one("account.move", "Invoice", ondelete="cascade")
     partner_id = fields.Many2one("res.partner", "Partner")
     withholding_tax_id = fields.Many2one("withholding.tax", string="Withholding Tax")
@@ -243,12 +242,12 @@ def _compute_total(self):
     )
     move_ids = fields.One2many("withholding.tax.move", "statement_id", "Moves")
 
-    @api.depends("move_id.line_ids.account_id.user_type_id.type")
+    @api.depends("invoice_id.line_ids.account_id.user_type_id.type")
     def _compute_type(self):
         for st in self:
-            if st.move_id:
+            if st.invoice_id:
                 domain = [
-                    ("move_id", "=", st.move_id.id),
+                    ("move_id", "=", st.invoice_id.id),
                     ("account_id.user_type_id.type", "=", "payable"),
                 ]
                 lines = self.env["account.move.line"].search(domain)
@@ -279,7 +278,7 @@ def get_wt_competence(self, amount_reconcile):
                     )
                 if st.invoice_id.move_type in ["in_refund", "out_refund"]:
                     amount_wt = -1 * amount_wt
-            elif st.move_id:
+            elif st.invoice_id:
                 tax_data = st.withholding_tax_id.compute_tax(amount_reconcile)
                 amount_wt = tax_data["tax"]
             return amount_wt