diff --git a/account_spread_cost_revenue/models/account_move_line.py b/account_spread_cost_revenue/models/account_move_line.py index e3618331..804136ae 100644 --- a/account_spread_cost_revenue/models/account_move_line.py +++ b/account_spread_cost_revenue/models/account_move_line.py @@ -103,12 +103,20 @@ class AccountMoveLine(models.Model): if reconciled_lines: msg = _("Cannot reconcile entries that are already reconciled:\n") for line in reconciled_lines: - msg += msg_line % (line.id, line.name, line.account_id.code) + msg += msg_line % { + "line_id": line.id, + "line_name": line.name, + "account_code": line.account_id.code, + } raise ValidationError(msg) if len(self.mapped("account_id").ids) > 1: msg = _("Some entries are not from the same account:\n") for line in self: - msg += msg_line % (line.id, line.name, line.account_id.code) + msg += msg_line % { + "line_id": line.id, + "line_name": line.name, + "account_code": line.account_id.code, + } raise ValidationError(msg) def create_auto_spread(self): @@ -148,9 +156,10 @@ class AccountMoveLine(models.Model): elif len(template) > 1: raise UserError( _( - "Too many auto spread templates ({}) matched with the " - "invoice line, {}" - ).format(len(template), line.display_name) + "Too many auto spread templates (%(len_template)s) matched with the " + "invoice line, %(line_name)s" + ) + % {"len_template": len(template), "line_name": line.display_name} ) # Found auto spread template for this invoice line, create it wizard = self.env["account.spread.invoice.line.link.wizard"].new( diff --git a/account_spread_cost_revenue/models/account_spread.py b/account_spread_cost_revenue/models/account_spread.py index f8c61e92..8f8b6ec7 100644 --- a/account_spread_cost_revenue/models/account_spread.py +++ b/account_spread_cost_revenue/models/account_spread.py @@ -520,19 +520,21 @@ class AccountSpread(models.Model): "%s" % (spread.invoice_id.id, _("Invoice")) ) - msg_body = _("Unlinked invoice line '{}' (view {}).").format( - spread.invoice_line_id.name, - inv_link, - ) + msg_body = _( + "Unlinked invoice line '%(spread_line_name)s' (view %(inv_link)s)." + ) % { + "spread_line_name": spread.invoice_line_id.name, + "inv_link": inv_link, + } spread.message_post(body=msg_body) spread_link = ( "%s" % (spread.id, _("Spread")) ) - msg_body = _("Unlinked '{}' (invoice line {}).").format( - spread_link, - spread.invoice_line_id.name, - ) + msg_body = _("Unlinked '%(spread_link)s' (invoice line %(inv_line)s).") % { + "spread_link": spread_link, + "inv_line": spread.invoice_line_id.name, + } spread.invoice_id.message_post(body=msg_body) def unlink(self): diff --git a/account_spread_cost_revenue/models/account_spread_template.py b/account_spread_cost_revenue/models/account_spread_template.py index be3d4bab..2fddd86c 100644 --- a/account_spread_cost_revenue/models/account_spread_template.py +++ b/account_spread_cost_revenue/models/account_spread_template.py @@ -169,9 +169,7 @@ class AccountSpreadTemplate(models.Model): ) if results: raise UserError( - _("Followings are duplicated combinations,\n\n{}").format( - "\n".join(results) - ) + _("Followings are duplicated combinations,\n\n%s") % "\n".join(results) )