[16.0][IMP] l10n_es_irnr[sii] - update references as l10n_es_irnr data has been included in l10n_es

l10n_es_aeat_mod216/__manifest__.py

@@ -10,7 +10,7 @@
  "author": "AvanzOSC, Tecnativa, Odoo Community Association (OCA)",
  "website": "https://github.com/OCA/l10n-spain",
  "license": "AGPL-3",
- "depends": ["l10n_es_aeat", "l10n_es_irnr"],
+ "depends": ["l10n_es_aeat"],
  "data": [
  "security/ir.model.access.csv",
  "security/ir_rule.xml",

l10n_es_aeat_mod216/data/tax_code_map_mod216_data.xml

@@ -15,7 +15,7 @@
  <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'),ref('l10n_es_irnr.account_tax_template_p_irpfnrnue0p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue0p')])]"
+ eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpfnrnue24p'),ref('l10n_es.account_tax_template_p_irpfnrue19p'),ref('l10n_es.account_tax_template_p_irpfnrnue0p'),ref('l10n_es.account_tax_template_p_irpfnrue0p')])]"
  />
  </record>
  <record id="aeat_mod216_map_line_03" model="l10n.es.aeat.map.tax.line">
@@ -27,7 +27,7 @@
  <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'),ref('l10n_es_irnr.account_tax_template_p_irpfnrnue0p'),ref('l10n_es_irnr.account_tax_template_p_irpfnrue0p')])]"
+ eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpfnrnue24p'),ref('l10n_es.account_tax_template_p_irpfnrue19p'),ref('l10n_es.account_tax_template_p_irpfnrnue0p'),ref('l10n_es.account_tax_template_p_irpfnrue0p')])]"
  />
  </record>
 </odoo>

l10n_es_aeat_mod216/tests/test_l10n_es_aeat_mod216.py

@@ -17,9 +17,9 @@ class TestL10nEsAeatMod216Base(TestL10nEsAeatModBase):
  debug = False
  taxes_purchase = {
  # 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),
+ "l10n_es.account_tax_template_p_irpfnrnue24p": (1000, 240),
+ "l10n_es.account_tax_template_p_irpfnrue19p": (2000, 380),
+ "l10n_es.account_tax_template_p_irpfnrnue0p": (3000, 0),
  }
  taxes_result = {
  # Rendimientos del trabajo (dinerarios) - Base

l10n_es_aeat_mod296/data/tax_code_map_mod296_data.xml

@@ -17,7 +17,7 @@
  <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')])]"
+ eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpfnrnue24p'),ref('l10n_es.account_tax_template_p_irpfnrue19p')])]"
  />
  </record>
  <record id="aeat_mod296_map_line_03" model="l10n.es.aeat.map.tax.line">
@@ -29,7 +29,7 @@
  <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')])]"
+ eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpfnrnue24p'),ref('l10n_es.account_tax_template_p_irpfnrue19p')])]"
  />
  </record>
 </odoo>

l10n_es_aeat_mod296/tests/test_l10n_es_aeat_mod296.py

@@ -19,8 +19,8 @@ class TestL10nEsAeatMod296Base(TestL10nEsAeatModBase):
  debug = False
  taxes_purchase = {
  # 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.account_tax_template_p_irpfnrnue24p": (1000, 240),
+ "l10n_es.account_tax_template_p_irpfnrue19p": (2000, 380),
  }
  taxes_result = {
  # Rendimientos del trabajo (dinerarios) - Base

l10n_es_aeat_sii_oca/data/aeat_sii_map_data.xml

@@ -304,6 +304,10 @@
  ref('l10n_es.account_tax_template_p_irpf21te'),
  ref('l10n_es.account_tax_template_s_irpf24'),
  ref('l10n_es.account_tax_template_p_irpf24'),
+ ref('l10n_es.account_tax_template_s_irpfnrnue24'),
+ ref('l10n_es.account_tax_template_p_irpfnrnue24p'),
+ ref('l10n_es.account_tax_template_s_irpfnrue19'),
+ ref('l10n_es.account_tax_template_p_irpfnrue19p'),
  ])]"
  />
  <field name="sii_map_id" ref="aeat_sii_map" />

l10n_es_irnr/README.rst

@@ -93,9 +93,11 @@ las líneas de la factura.
 Known issues / Roadmap
 ======================
 
-* El apartado *II. Rentas no sometidas a retención / ingreso a cuenta*, no
- se rellena por el momento con ninguna base procedente de las ventas intra o
- extra comunitarias.
+This module is obsolete as Odoo core added the functionality here:
+https://github.com/odoo/odoo/commit/a652896cb53717ad0a6a3abafb123bbe99110eb0
+
+This module can be uninstalled and is no longer needed to be migrated to
+further versions.
 
 Bug Tracker
 ===========

l10n_es_irnr/__manifest__.py

@@ -9,12 +9,7 @@
  "category": "Localization",
  "depends": ["l10n_es"],
  "development_status": "Mature",
- "data": [
- "data/account_data.xml",
- "data/taxes_irnr.xml",
- "data/fiscal_positions_irnr.xml",
- "data/fiscal_position_taxes_irnr.xml",
- ],
+ "data": [],
  "author": "Tecnativa, Odoo Community Association (OCA)",
  "website": "https://github.com/OCA/l10n-spain",
  "license": "AGPL-3",