88
99import jwt
1010
11- from odoo import _ , fields , models
11+ from odoo import fields , models
1212from odoo .exceptions import UserError
1313
1414from odoo .addons .queue_job .delay import chain
@@ -86,18 +86,17 @@ def action_regenerate_secret_key(self):
8686 self .secret_key = self ._generate_default_secret_key ()
8787
8888 def _compute_count_partner (self ):
89- data = self .env ["auth.partner" ].read_group (
89+ data = self .env ["auth.partner" ]._read_group (
9090 [
9191 ("directory_id" , "in" , self .ids ),
9292 ],
9393 ["directory_id" ],
94- groupby = ["directory_id" ],
95- lazy = False ,
94+ aggregates = ["__count" ],
9695 )
97- res = {item [ "directory_id" ][ 0 ]: item [ "__count" ] for item in data }
96+ mapped_data = {auth_partner . id : count for auth_partner , count in data }
9897
9998 for record in self :
100- record .count_partner = res .get (record .id , 0 )
99+ record .count_partner = mapped_data .get (record .id , 0 )
101100
102101 def _get_template (self , type_or_template ):
103102 if isinstance (type_or_template , str ):
@@ -127,7 +126,8 @@ def _send_mail_background(
127126 return job .delay ()
128127
129128 def _send_mail (self , type_or_template , auth_partner , ** context ):
130- """Send an email to the auth_partner using the template defined in the directory"""
129+ """Send an email to the auth_partner using the template defined
130+ in the directory"""
131131 self .ensure_one ()
132132 auth_partner .ensure_one ()
133133 context = self ._prepare_mail_context (context )
@@ -138,7 +138,9 @@ def _send_mail_impl(self, type_or_template, auth_partner, **context):
138138 template = self .sudo ()._get_template (type_or_template )
139139 if not template :
140140 raise UserError (
141- _ ("No email template defined for %(template)s in %(directory)s" )
141+ self .env ._ (
142+ "No email template defined for %(template)s in %(directory)s"
143+ )
142144 % {"template" : type_or_template , "directory" : self .name }
143145 )
144146 template .sudo ().with_context (** context ).send_mail (
@@ -176,10 +178,10 @@ def _decode_token(
176178 token , algorithms = ["HS256" ], options = {"verify_signature" : False }
177179 )
178180 except jwt .PyJWTError as e :
179- raise UserError (_ ("Invalid Token" )) from e
181+ raise UserError (self . env . _ ("Invalid Token" )) from e
180182 probable_auth_partner = self .env ["auth.partner" ].browse (obj ["ap" ])
181183 if not probable_auth_partner :
182- raise UserError (_ ("Invalid Token" ))
184+ raise UserError (self . env . _ ("Invalid Token" ))
183185 key += key_salt (probable_auth_partner )
184186
185187 try :
@@ -191,7 +193,7 @@ def _decode_token(
191193 algorithms = ["HS256" ],
192194 )
193195 except jwt .PyJWTError as e :
194- raise UserError (_ ("Invalid Token" )) from e
196+ raise UserError (self . env . _ ("Invalid Token" )) from e
195197
196198 auth_partner = self .env ["auth.partner" ].browse (obj ["ap" ])
197199
@@ -200,7 +202,7 @@ def _decode_token(
200202 or not auth_partner
201203 or auth_partner .directory_id != self
202204 ):
203- raise UserError (_ ("Invalid token" ))
205+ raise UserError (self . env . _ ("Invalid token" ))
204206
205207 return auth_partner
206208
0 commit comments