Skip to content

Commit 84edfb7

Browse files
committed
[MIG] l10n_es_aeat_mod190: Migration to 19.0
1 parent 50c89ca commit 84edfb7

7 files changed

Lines changed: 43 additions & 38 deletions

File tree

l10n_es_aeat_mod190/README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ AEAT modelo 190
2121
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
2222
:alt: License: AGPL-3
2323
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github
24-
:target: https://github.com/OCA/l10n-spain/tree/18.0/l10n_es_aeat_mod190
24+
:target: https://github.com/OCA/l10n-spain/tree/19.0/l10n_es_aeat_mod190
2525
:alt: OCA/l10n-spain
2626
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
27-
:target: https://translation.odoo-community.org/projects/l10n-spain-18-0/l10n-spain-18-0-l10n_es_aeat_mod190
27+
:target: https://translation.odoo-community.org/projects/l10n-spain-19-0/l10n-spain-19-0-l10n_es_aeat_mod190
2828
:alt: Translate me on Weblate
2929
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
30-
:target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&target_branch=18.0
30+
:target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-spain&target_branch=19.0
3131
:alt: Try me on Runboat
3232

3333
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -125,7 +125,7 @@ Bug Tracker
125125
Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-spain/issues>`_.
126126
In case of trouble, please check there if your issue has already been reported.
127127
If you spotted it first, help us to smash it by providing a detailed and welcomed
128-
`feedback <https://github.com/OCA/l10n-spain/issues/new?body=module:%20l10n_es_aeat_mod190%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
128+
`feedback <https://github.com/OCA/l10n-spain/issues/new?body=module:%20l10n_es_aeat_mod190%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
129129

130130
Do not contact contributors directly about support or help with technical issues.
131131

@@ -182,6 +182,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
182182
mission is to support the collaborative development of Odoo features and
183183
promote its widespread use.
184184

185-
This module is part of the `OCA/l10n-spain <https://github.com/OCA/l10n-spain/tree/18.0/l10n_es_aeat_mod190>`_ project on GitHub.
185+
This module is part of the `OCA/l10n-spain <https://github.com/OCA/l10n-spain/tree/19.0/l10n_es_aeat_mod190>`_ project on GitHub.
186186

187187
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

l10n_es_aeat_mod190/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{
44
"name": "AEAT modelo 190",
5-
"version": "18.0.1.3.0",
5+
"version": "19.0.1.0.0",
66
"category": "Localization/Accounting",
77
"author": "Punt Sistemes SLU,"
88
"Odoo Community Association (OCA),"

l10n_es_aeat_mod190/models/l10n_es_aeat_mod190_report.py

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from collections import defaultdict
66

7-
from odoo import _, api, exceptions, fields, models
7+
from odoo import api, exceptions, fields, models
88

99
from odoo.addons.l10n_es_aeat.models.spanish_states_mapping import SPANISH_STATES
1010

@@ -108,7 +108,9 @@ def _check_report_lines(self):
108108
(partner records) are filled"""
109109
if any(not item.partner_record_ok for item in self.partner_record_ids):
110110
raise exceptions.UserError(
111-
_("All partner records fields (country, VAT number) " "must be filled.")
111+
self.env._(
112+
"All partner records fields (country, VAT number) must be filled."
113+
)
112114
)
113115

114116
def button_confirm(self):
@@ -142,11 +144,11 @@ def calculate(self):
142144
tax_line_vals[rp.id][key_id.id][subkey_id.id] = {}
143145
if not rp.aeat_perception_key_id:
144146
raise exceptions.UserError(
145-
_(
147+
self.env._(
146148
"The perception key of the partner, %(partner)s. "
147-
"Must be filled."
149+
"Must be filled.",
150+
partner=rp.name,
148151
)
149-
% ({"partner": rp.name})
150152
)
151153
values = report._get_line_mod190_vals(rp, key_id, subkey_id)
152154
partner_vals.append(values)
@@ -159,7 +161,10 @@ def _get_line_mod190_vals(self, rp, key_id, subkey_id):
159161
codigo_provincia = SPANISH_STATES.get(rp.state_id.code)
160162
if not codigo_provincia:
161163
raise exceptions.UserError(
162-
_("The state is not defined in the partner, %s") % rp.name
164+
self.env._(
165+
"The state is not defined in the partner, %(partner)s",
166+
partner=rp.name,
167+
)
163168
)
164169
return {
165170
"partner_id": rp.id,
@@ -170,12 +175,11 @@ def _get_line_mod190_vals(self, rp, key_id, subkey_id):
170175
def _get_grouped_data(self, field_number, domain):
171176
return {
172177
(
173-
item["partner_id"][0],
174-
item["aeat_perception_key_id"] and item["aeat_perception_key_id"][0],
175-
item["aeat_perception_subkey_id"]
176-
and item["aeat_perception_subkey_id"][0],
177-
): item["credit"] - item["debit"]
178-
for item in self.env["account.move.line"].read_group(
178+
item[0].id if item[0].id else False, # partner_id
179+
item[1].id if item[1] else False, # aeat_perception_key_id
180+
item[2].id if item[2].id else False, # aeat_perception_subkey_id
181+
): item[3] - item[4] # credit - debit
182+
for item in self.env["account.move.line"]._read_group(
179183
self._get_move_line_domain(
180184
self.date_start,
181185
self.date_end,
@@ -184,9 +188,8 @@ def _get_grouped_data(self, field_number, domain):
184188
).map_line_id,
185189
)
186190
+ domain,
187-
["credit", "debit"],
188191
["partner_id", "aeat_perception_key_id", "aeat_perception_subkey_id"],
189-
lazy=False,
192+
["credit:sum", "debit:sum"],
190193
)
191194
}
192195

@@ -267,7 +270,7 @@ class L10nEsAeatMod190ReportLine(models.Model):
267270
store=True,
268271
)
269272
ingresos_a_cuenta_efectuados_incap = fields.Float(
270-
string="Income on account in kind made as a result of incapacity " "for work",
273+
string="Income on account in kind made as a result of incapacity for work",
271274
compute="_compute_percepciones",
272275
store=True,
273276
)
@@ -334,8 +337,7 @@ class L10nEsAeatMod190ReportLine(models.Model):
334337
("2", "2 - Contract or ratio less than a year"),
335338
(
336339
"3",
337-
"3 - Contract or special employment relationship of a dependent "
338-
"nature",
340+
"3 - Contract or special employment relationship of a dependent nature",
339341
),
340342
("4", "4 - Sporadic relationship of manual workers"),
341343
],
@@ -404,8 +406,7 @@ class L10nEsAeatMod190ReportLine(models.Model):
404406
store=True,
405407
)
406408
hijos_y_desc_discapacidad_entero_33 = fields.Integer(
407-
string="Hijos y descendientes con discapacidad del 33%"
408-
", computados por entero",
409+
string="Hijos y descendientes con discapacidad del 33%, computados por entero",
409410
compute="_compute_partner_id_ad_required",
410411
store=True,
411412
)
@@ -415,8 +416,7 @@ class L10nEsAeatMod190ReportLine(models.Model):
415416
store=True,
416417
)
417418
hijos_y_desc_discapacidad_entero_66 = fields.Integer(
418-
string="Hijos y descendientes con discapacidad del 66%"
419-
", computados por entero",
419+
string="Hijos y descendientes con discapacidad del 66%, computados por entero",
420420
compute="_compute_partner_id_ad_required",
421421
store=True,
422422
)
@@ -456,7 +456,7 @@ class L10nEsAeatMod190ReportLine(models.Model):
456456
store=True,
457457
)
458458
ascendientes_discapacidad_entero_mr = fields.Integer(
459-
string="Ascendientes con discapacidad de más del 33%" ", computados por entero",
459+
string="Ascendientes con discapacidad de más del 33%, computados por entero",
460460
compute="_compute_partner_id_ad_required",
461461
store=True,
462462
)
@@ -466,7 +466,7 @@ class L10nEsAeatMod190ReportLine(models.Model):
466466
store=True,
467467
)
468468
ascendientes_discapacidad_entero_66 = fields.Integer(
469-
string="Ascendientes con discapacidad de más del 66%" ", computados por entero",
469+
string="Ascendientes con discapacidad de más del 66%, computados por entero",
470470
compute="_compute_partner_id_ad_required",
471471
store=True,
472472
)
@@ -691,7 +691,9 @@ def _compute_visible_key_b01(self):
691691
def onchange_partner_id(self):
692692
if self.partner_id:
693693
if not self.partner_id.state_id:
694-
raise exceptions.UserError(_("Provincia no definida en el cliente"))
694+
raise exceptions.UserError(
695+
self.env._("Provincia no definida en el cliente")
696+
)
695697
# Cargamos valores establecidos en el tercero.
696698
self.aeat_perception_key_id = self.partner_id.aeat_perception_key_id
697699
self.aeat_perception_subkey_id = self.partner_id.aeat_perception_subkey_id

l10n_es_aeat_mod190/security/l10n_es_aeat_mod190_security.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<odoo>
33
<record id="group_aeat_mod190" model="res.groups">
44
<field name="name">AEAT Model 190 (with access to sensitive data)</field>
5-
<field name="category_id" ref="base.module_category_hidden" />
5+
<field name="privilege_id" ref="l10n_es_aeat.res_groups_privilege_aeat" />
66
<field
7-
name="users"
8-
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
7+
name="user_ids"
8+
eval="[Command.link(ref('base.user_root')), Command.link(ref('base.user_admin'))]"
99
/>
1010
<field
1111
name="implied_ids"
12-
eval="[(4, ref('l10n_es_aeat.group_account_aeat'))]"
12+
eval="[Command.link(ref('l10n_es_aeat.group_account_aeat'))]"
1313
/>
1414
</record>
1515
<record id="aeat_190_company_rule" model="ir.rule">

l10n_es_aeat_mod190/static/description/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ <h1>AEAT modelo 190</h1>
374374
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
375375
!! source digest: sha256:0eee8daa1e80496b0a075eac913a46232427ee03b1c0a2fc1519df3334d854f5
376376
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
377-
<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-spain/tree/18.0/l10n_es_aeat_mod190"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-18-0/l10n-spain-18-0-l10n_es_aeat_mod190"><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-spain&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
377+
<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-spain/tree/19.0/l10n_es_aeat_mod190"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-19-0/l10n-spain-19-0-l10n_es_aeat_mod190"><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-spain&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
378378
<p>Modelo 190 de la AEAT. Retenciones e ingresos a cuenta. Rendimientos del
379379
trabajo y de actividades económicas, premios y determinadas ganancias
380380
patrimoniales e imputaciones de Renta. Resumen anual.</p>
@@ -474,7 +474,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
474474
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-spain/issues">GitHub Issues</a>.
475475
In case of trouble, please check there if your issue has already been reported.
476476
If you spotted it first, help us to smash it by providing a detailed and welcomed
477-
<a class="reference external" href="https://github.com/OCA/l10n-spain/issues/new?body=module:%20l10n_es_aeat_mod190%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
477+
<a class="reference external" href="https://github.com/OCA/l10n-spain/issues/new?body=module:%20l10n_es_aeat_mod190%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
478478
<p>Do not contact contributors directly about support or help with technical issues.</p>
479479
</div>
480480
<div class="section" id="credits">
@@ -528,7 +528,7 @@ <h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
528528
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
529529
mission is to support the collaborative development of Odoo features and
530530
promote its widespread use.</p>
531-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-spain/tree/18.0/l10n_es_aeat_mod190">OCA/l10n-spain</a> project on GitHub.</p>
531+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-spain/tree/19.0/l10n_es_aeat_mod190">OCA/l10n-spain</a> project on GitHub.</p>
532532
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
533533
</div>
534534
</div>

l10n_es_aeat_mod190/tests/test_mod190.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TestL10nEsAeatMod190Base(TestL10nEsAeatModBase):
3131
@classmethod
3232
def setUpClass(cls):
3333
super().setUpClass()
34-
cls.account_manager.groups_id |= cls.env.ref(
34+
cls.account_manager.group_ids |= cls.env.ref(
3535
"l10n_es_aeat_mod190.group_aeat_mod190"
3636
) | cls.env.ref("base.group_partner_manager")
3737
cls.env = cls.env(

l10n_es_aeat_mod190/uv.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)