fixup! [FIX] l10n_it_withholding_tax: porting fixes

TheMule71 · May 5, 2021 · 406ba0a · 406ba0a
1 parent caee196
commit 406ba0a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/l10n_it_withholding_tax/models/account.py b/l10n_it_withholding_tax/models/account.py
@@ -183,7 +183,9 @@ def default_get(self, fields):
         Compute amount to pay proportionally to amount total - wt
         """
         rec = super(AccountAbstractPayment, self).default_get(fields)
-        invoice_defaults = self.new({"reconciled_invoice_ids": rec.get("reconciled_invoice_ids")}).reconciled_invoice_ids
+        invoice_defaults = self.new(
+            {"reconciled_invoice_ids": rec.get("reconciled_invoice_ids")}
+        ).reconciled_invoice_ids
 
         if invoice_defaults and len(invoice_defaults) == 1:
             invoice = invoice_defaults[0]
@@ -312,14 +314,20 @@ def _compute_amount_withholding_tax(self):
             amount_net_pay_residual = invoice.amount_net_pay
             invoice.withholding_tax_amount = withholding_tax_amount
 
-            reconciled_lines = invoice.line_ids.filtered(lambda line: line.account_id.user_type_id.type in ('receivable', 'payable'))
-            reconciled_amls = reconciled_lines.mapped('matched_debit_ids.debit_move_id') + \
-                              reconciled_lines.mapped('matched_credit_ids.credit_move_id')
+            reconciled_lines = invoice.line_ids.filtered(
+                lambda line: line.account_id.user_type_id.type
+                in ("receivable", "payable")
+            )
+            reconciled_amls = reconciled_lines.mapped(
+                "matched_debit_ids.debit_move_id"
+            ) + reconciled_lines.mapped("matched_credit_ids.credit_move_id")
 
             for line in reconciled_amls:
                 if not line.withholding_tax_generated_by_move_id:
                     amount_net_pay_residual -= line.debit or line.credit
-            invoice.amount_net_pay_residual = float_round(amount_net_pay_residual, dp_obj.precision_get("Account"))
+            invoice.amount_net_pay_residual = float_round(
+                amount_net_pay_residual, dp_obj.precision_get("Account")
+            )
 
     withholding_tax = fields.Boolean("Withholding Tax")
     withholding_tax_line_ids = fields.One2many(

diff --git a/l10n_it_withholding_tax/models/withholding_tax.py b/l10n_it_withholding_tax/models/withholding_tax.py
@@ -167,9 +167,13 @@ def _check_date(self):
                         ]
                     )
 
-                overlapping_rate = rate.env["withholding.tax.rate"].search(domain, limit=1)
+                overlapping_rate = rate.env["withholding.tax.rate"].search(
+                    domain, limit=1
+                )
                 if overlapping_rate:
-                    raise ValidationError(_("Error! You cannot have 2 rates that overlap!"))
+                    raise ValidationError(
+                        _("Error! You cannot have 2 rates that overlap!")
+                    )
 
     withholding_tax_id = fields.Many2one(
         "withholding.tax", string="Withholding Tax", ondelete="cascade", readonly=True

diff --git a/l10n_it_withholding_tax/tests/test_withholding_tax.py b/l10n_it_withholding_tax/tests/test_withholding_tax.py
@@ -200,10 +200,10 @@ def test_partial_payment(self):
         register_payments.action_post()
 
         # WT amount in payment move lines
-        payment_line_ids = self.invoice.line_ids.filtered(lambda l: l.account_id.internal_type in ['receivable', 'payable'])
-        self.assertTrue(
-            set(payment_line_ids.mapped("debit")) == {600, 150}
+        payment_line_ids = self.invoice.line_ids.filtered(
+            lambda l: l.account_id.internal_type in ["receivable", "payable"]
         )
+        self.assertTrue(set(payment_line_ids.mapped("debit")) == {600, 150})
 
         # WT aomunt applied in statement
         domain = [