diff --git a/purchase.fodt b/purchase.fodt index b6cc9e5052..6239611cd3 100644 --- a/purchase.fodt +++ b/purchase.fodt @@ -674,7 +674,7 @@ </if> - <(format_number(line.quantity, purchase.party.lang, digits=line.unit.digits if line.unit else None) + (line.unit and (' ' + line.unit.symbol) or '')) or ''> + <format_number_symbol(line.quantity, purchase.party.lang, line.unit, digits=line.unit.digits) if line.unit else format_number(line.quantity, purchase.party.lang)> <format_currency(line.unit_price, purchase.party.lang, purchase.currency, digits=line.__class__.unit_price.digits[1])> diff --git a/purchase.py b/purchase.py index fe10a91f56..eadd7e2761 100644 --- a/purchase.py +++ b/purchase.py @@ -1698,11 +1698,9 @@ class Line(sequence_ordered(), ModelSQL, ModelView): Lang = pool.get('ir.lang') if self.product: lang = Lang.get() - return (lang.format( - '%.*f', (self.unit.digits, self.quantity or 0)) - + '%s %s @ %s' % ( - self.unit.symbol, self.product.rec_name, - self.purchase.rec_name)) + return (lang.format_number_symbol( + self.quantity or 0, self.unit, digits=self.unit.digits) + + ' %s @ %s' % (self.product.rec_name, self.purchase.rec_name)) else: return self.purchase.rec_name