From 237360ecb5c05fad86f6bce74db7c8e9896b144b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 15 Nov 2017 00:18:10 +0100 Subject: [PATCH] Simplify language formatting issue6858 review44391002 --- statement.py | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/statement.py b/statement.py index 1883ba4563..4da900c1a4 100644 --- a/statement.py +++ b/statement.py @@ -382,12 +382,8 @@ class Statement(Workflow, ModelSQL, ModelView): end_balance = (self.start_balance + sum(l.amount for l in self.lines)) if end_balance != self.end_balance: - lang, = Lang.search([ - ('code', '=', Transaction().language), - ]) - amount = Lang.format(lang, - '%.' + str(self.journal.currency.digits) + 'f', - end_balance, True) + lang = Lang.get() + amount = lang.currency(end_balance, self.journal.currency) self.raise_user_error('wrong_end_balance', amount) def validate_amount(self): @@ -396,12 +392,8 @@ class Statement(Workflow, ModelSQL, ModelView): amount = sum(l.amount for l in self.lines) if amount != self.total_amount: - lang, = Lang.search([ - ('code', '=', Transaction().language), - ]) - amount = Lang.format(lang, - '%.' + str(self.journal.currency.digits) + 'f', - amount, True) + lang = Lang.get() + amount = lang.currency(amount, self.journal.currency) self.raise_user_error('wrong_total_amount', amount) def validate_number_of_lines(self): @@ -813,13 +805,8 @@ class Line( self.invoice.amount_to_pay, self.statement.journal.currency) if abs(amount_to_pay) < abs(self.amount): - lang, = Lang.search([ - ('code', '=', Transaction().language), - ]) - - amount = Lang.format(lang, - '%.' + str(self.statement.journal.currency.digits) + 'f', - self.amount, True) + amount = Lang.get().format( + self.amount, self.statement.journal.currency) self.raise_user_error('amount_greater_invoice_amount_to_pay', error_args=(amount,))