44
55from collections import defaultdict
66
7- from odoo import _ , api , exceptions , fields , models
7+ from odoo import api , exceptions , fields , models
88
99from 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
0 commit comments