diff --git a/purchase.py b/purchase.py index 060a4e290e..c967071580 100644 --- a/purchase.py +++ b/purchase.py @@ -272,9 +272,7 @@ class QuotationLine(ModelSQL, ModelView): 'required': ~Eval('product') }, depends=['product']) - quantity = fields.Float( - 'Quantity', digits=(16, Eval('unit_digits', 2)), required=True, - depends=['unit_digits']) + quantity = fields.Float("Quantity", digits='unit', required=True) unit = fields.Many2One( 'product.uom', 'Unit', ondelete='RESTRICT', states={ @@ -286,8 +284,6 @@ class QuotationLine(ModelSQL, ModelView): ('category', '!=', -1)), ], depends=['product', 'product_uom_category']) - unit_digits = fields.Function( - fields.Integer('Unit Digits'), 'on_change_with_unit_digits') product_uom_category = fields.Function( fields.Many2One('product.uom.category', 'Product Uom Category'), 'on_change_with_product_uom_category') @@ -354,12 +350,6 @@ class QuotationLine(ModelSQL, ModelView): self.currency = self.request.company.currency self.supply_date = self.request.supply_date or datetime.date.max - @fields.depends('unit') - def on_change_with_unit_digits(self, name=None): - if self.unit: - return self.unit.digits - return None - @fields.depends('product') def on_change_with_product_uom_category(self, name=None): if self.product: diff --git a/quotation.fodt b/quotation.fodt index 7d4a41b646..be6c622ce1 100644 --- a/quotation.fodt +++ b/quotation.fodt @@ -689,7 +689,7 @@ </for> - <(format_number(quotation_line.quantity, quotation.supplier.lang, digits=quotation_line.unit_digits) + (quotation_line.unit and (' ' + quotation_line.unit.symbol) or '')) or ''> + <(format_number(quotation_line.quantity, quotation.supplier.lang, digits=quotation_line.unit.digits if quotation_line.unit else None) + (quotation_line.unit and (' ' + quotation_line.unit.symbol) or '')) or ''> <format_currency(quotation_line.unit_price, quotation.supplier.lang, quotation_line.currency, digits=quotation_line.__class__.unit_price.digits[1]) if quotation_line.unit_price else "">