Merge PR OCA#3477 into 12.0

Signed-off-by pedrobaeza
aurestic · Mar 17, 2024 · e2192ab · e2192ab
2 parents 1b9f111 + 1233a4f
commit e2192ab
Show file tree

Hide file tree

Showing 7 changed files with 375 additions and 6 deletions.
diff --git a/l10n_es_aeat_mod216/__manifest__.py b/l10n_es_aeat_mod216/__manifest__.py
@@ -1,11 +1,12 @@
 # Copyright 2015 AvanzOSC - Ainara Galdona
 # Copyright 2016 Tecnativa - Antonio Espinosa
 # Copyright 2015-2019 Tecnativa - Pedro M. Baeza
+# Copyright 2024 Trey - Roberto Lizana
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'AEAT modelo 216',
-    'version': '12.0.2.4.0',
+    'version': '12.0.2.5.0',
     'category': "Localisation/Accounting",
     'author': "AvanzOSC,"
               "Tecnativa,"

diff --git a/l10n_es_aeat_mod216/data/tax_code_map_mod216_data.xml b/l10n_es_aeat_mod216/data/tax_code_map_mod216_data.xml
@@ -14,7 +14,7 @@
         <field name="field_type">base</field>
         <field name="sum_type">both</field>
         <field name="inverse" eval="True"/>
-        <field name="tax_ids" eval="[(6, False, [ref('l10n_es_irnr.account_tax_template_p_irpfnrnue24p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue19p')])]"/>
+        <field name="tax_ids" eval="[(6, False, [ref('l10n_es_irnr.account_tax_template_p_irpfnrnue24p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue19p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrnue0p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue0p')])]"/>
     </record>
 
     <record id="aeat_mod216_map_line_03" model="l10n.es.aeat.map.tax.line">
@@ -24,7 +24,7 @@
         <field name="field_type">amount</field>
         <field name="sum_type">both</field>
         <field name="inverse" eval="False"/>
-        <field name="tax_ids" eval="[(6, False, [ref('l10n_es_irnr.account_tax_template_p_irpfnrnue24p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue19p')])]"/>
+        <field name="tax_ids" eval="[(6, False, [ref('l10n_es_irnr.account_tax_template_p_irpfnrnue24p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue19p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrnue0p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue0p')])]"/>
     </record>
 
 </odoo>
diff --git a/l10n_es_aeat_mod216/tests/test_l10n_es_aeat_mod216.py b/l10n_es_aeat_mod216/tests/test_l10n_es_aeat_mod216.py
@@ -17,12 +17,13 @@ class TestL10nEsAeatMod216Base(TestL10nEsAeatModBase):
         # tax code: (base, tax_amount)
         'l10n_es_irnr.account_tax_template_p_irpfnrnue24p': (1000, 240),
         'l10n_es_irnr.account_tax_template_p_irpfnrue19p': (2000, 380),
+        'l10n_es_irnr.account_tax_template_p_irpfnrnue0p': (3000, 0),
     }
     taxes_result = {
         # Rendimientos del trabajo (dinerarios) - Base
-        '2': 6000,
+        '2': 12000,
         # Rendimientos del trabajo (dinerarios) - Retenciones
-        '3': 1240,  # (2 * 240) + (2 * 380)
+        '3': 1240,  # (2 * 240) + (2 * 380) + (2 * 0)
     }
 
     def test_model_216(self):

diff --git a/l10n_es_irnr/__manifest__.py b/l10n_es_irnr/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Retenciones IRNR (No residentes)",
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.3.0',
     'category': 'Localization',
     'depends': [
         'l10n_es',

diff --git a/l10n_es_irnr/data/fiscal_position_taxes_irnr.xml b/l10n_es_irnr/data/fiscal_position_taxes_irnr.xml
diff --git a/l10n_es_irnr/data/fiscal_positions_irnr.xml b/l10n_es_irnr/data/fiscal_positions_irnr.xml
@@ -13,4 +13,14 @@
     <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
 </record>
 
+<record id="fp_irpfnrue0" model="account.fiscal.position.template">
+    <field name="name">Retención IRPF No residentes UE exento por convenio</field>
+    <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+</record>
+
+<record id="fp_irpfnrnue0" model="account.fiscal.position.template">
+    <field name="name">Retención IRPF No residentes no-UE exento por convenio</field>
+    <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+</record>
+
 </odoo>
diff --git a/l10n_es_irnr/data/taxes_irnr.xml b/l10n_es_irnr/data/taxes_irnr.xml
@@ -34,6 +34,32 @@
     <field name="tax_group_id" ref="tax_group_irnr_no_ue"/>
 </record>
 
+<!-- Retenciones IRPF No residentes no-UE Exento -->
+
+<record id="account_tax_template_s_irpfnrnue0" model="account.tax.template">
+    <field name="description">IRPF no-UE exento</field>
+    <field name="type_tax_use">sale</field>
+    <field name="account_id" ref="l10n_es.account_common_473"/>
+    <field name="name">Retenciones a cuenta IRPF No residentes no-UE exento por convenio</field>
+    <field name="refund_account_id" ref="l10n_es.account_common_473"/>
+    <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+    <field name="amount" eval="0"/>
+    <field name="tax_group_id" ref="tax_group_irnr_no_ue"/>
+    <field name="amount_type">percent</field>
+</record>
+
+<record id="account_tax_template_p_irpfnrnue0p" model="account.tax.template">
+    <field name="description">IRPF no-UE exento</field>
+    <field name="type_tax_use">purchase</field>
+    <field name="account_id" ref="l10n_es.account_common_4751"/>
+    <field name="name">Retenciones IRPF No residentes no-UE exento por convenio</field>
+    <field name="refund_account_id" ref="l10n_es.account_common_4751"/>
+    <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+    <field name="amount" eval="0"/>
+    <field name="amount_type">percent</field>
+    <field name="tax_group_id" ref="tax_group_irnr_no_ue"/>
+</record>
+
 <!-- Retenciones IRPF No residentes UE 19% -->
 
 
@@ -65,4 +91,29 @@
     <field name="amount_type">percent</field>
 </record>
 
+<!-- Retenciones IRPF No residentes no-UE Exento -->
+<record id="account_tax_template_s_irpfnrue0" model="account.tax.template">
+    <field name="description">IRPF UE exento</field>
+    <field name="type_tax_use">sale</field>
+    <field name="account_id" ref="l10n_es.account_common_473"/>
+    <field name="name">Retenciones a cuenta IRPF No residentes UE exento por convenio</field>
+    <field name="refund_account_id" ref="l10n_es.account_common_473"/>
+    <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+    <field name="amount" eval="0"/>
+    <field name="tax_group_id" ref="tax_group_irnr_ue"/>
+    <field name="amount_type">percent</field>
+</record>
+
+<record id="account_tax_template_p_irpfnrue0p" model="account.tax.template">
+    <field name="description">IRPF UE exento</field>
+    <field name="type_tax_use">purchase</field>
+    <field name="account_id" ref="l10n_es.account_common_4751"/>
+    <field name="name">Retenciones IRPF No residentes UE exento por convenio</field>
+    <field name="refund_account_id" ref="l10n_es.account_common_4751"/>
+    <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+    <field name="amount" eval="0"/>
+    <field name="tax_group_id" ref="tax_group_irnr_ue"/>
+    <field name="amount_type">percent</field>
+</record>
+
 </odoo>