Merge branch '14.0-fix-account_vat_period_end_statement-vp9' of git+s…

…sh://github.com/efatto/l10n-italy into 14.0
efatto · Sep 20, 2024 · 9003bba · 9003bba
2 parents ef5c3e0 + 777aca5
commit 9003bba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/account_vat_period_end_statement/models/account.py b/account_vat_period_end_statement/models/account.py
@@ -821,6 +821,7 @@ class StatementGenericAccountLine(models.Model):
     statement_id = fields.Many2one("account.vat.period.end.statement", "VAT statement")
     amount = fields.Float("Amount", required=True, digits="Account")
     name = fields.Char("Description")
+    previous_year_credit = fields.Boolean("Previous year credits")
 
 
 class AccountTax(models.Model):

diff --git a/account_vat_period_end_statement/views/account_view.xml b/account_vat_period_end_statement/views/account_view.xml
@@ -181,12 +181,16 @@
                                 <tree editable="bottom">
                                     <field name="account_id" />
                                     <field name="name" />
+                                    <field name="previous_year_credit" />
                                     <field name="amount" />
-                               </tree>
+                                </tree>
                                 <form>
-                                    <field name="account_id" />
-                                    <field name="name" />
-                                    <field name="amount" />
+                                    <group>
+                                        <field name="account_id" />
+                                        <field name="name" />
+                                        <field name="previous_year_credit" />
+                                        <field name="amount" />
+                                    </group>
                                </form>
                             </field>
                         </group>

diff --git a/l10n_it_vat_statement_communication/models/comunicazione_liquidazione.py b/l10n_it_vat_statement_communication/models/comunicazione_liquidazione.py
@@ -687,6 +687,12 @@ def compute_from_liquidazioni(self):
                 # 2 - Decremento iva detratta con righe negative
                 for line in liq.generic_vat_account_line_ids:
                     if line.amount > 0:
-                        quadro.iva_esigibile -= line.amount
+                        if line.previous_year_credit:
+                            quadro.credito_anno_precedente -= line.amount
+                        else:
+                            quadro.iva_esigibile -= line.amount
                     else:
-                        quadro.iva_detratta += line.amount
+                        if line.previous_year_credit:
+                            quadro.credito_anno_precedente += line.amount
+                        else:
+                            quadro.iva_detratta += line.amount