From 2a86e9245c91d6564257aad4ed69673576f10918 Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Fri, 1 Dec 2017 11:35:03 +0100 Subject: [FIX][BACKPORT] Always round monetary values in database backport of afef71d6b92a2741ab56b4d039eba1624a45197f Original commit message: Let `create` and `write` round monetary field values before sending them to the database. Pass the values to be written to `field.convert_to_column`, so that the currency can be retrieved from the values, and the value be rounded. --- odoo/fields.py | 55 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) (limited to 'odoo/fields.py') diff --git a/odoo/fields.py b/odoo/fields.py index 60e3c83e6aa..349d74583c0 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -16,7 +16,7 @@ import xmlrpclib import psycopg2 from odoo.sql_db import LazyCursor -from odoo.tools import float_precision, float_repr, float_round, frozendict, \ +from odoo.tools import float_repr, float_round, frozendict, \ html_sanitize, human_size, pg_varchar, ustr, OrderedSet from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT @@ -811,7 +811,7 @@ class Field(object): """ Return the null value for this field in the record format. """ return False - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): """ Convert ``value`` from the ``write`` format to the SQL format. """ if value is None or value == False: return None @@ -1138,7 +1138,7 @@ class Boolean(Field): type = 'boolean' column_type = ('bool', 'bool') - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): return bool(value) def convert_to_cache(self, value, record, validate=True): @@ -1159,7 +1159,7 @@ class Integer(Field): _description_group_operator = property(attrgetter('group_operator')) - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): return int(value or 0) def convert_to_cache(self, value, record, validate=True): @@ -1222,7 +1222,7 @@ class Float(Field): _description_digits = property(attrgetter('digits')) _description_group_operator = property(attrgetter('group_operator')) - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): result = float(value or 0.0) digits = self.digits if digits: @@ -1275,25 +1275,34 @@ class Monetary(Field): assert self.currency_field in model._fields, \ "Field %s with unknown currency_field %r" % (self, self.currency_field) - def convert_to_column(self, value, record): - try: - return value.float_repr() # see float_precision.float_repr() - except Exception: - return float(value or 0.0) + def convert_to_column(self, value, record, values=None): + # retrieve currency from values or record + if values and self.currency_field in values: + field = record._fields[self.currency_field] + currency = field.convert_to_cache(values[self.currency_field], record) + currency = field.convert_to_record(currency, record) + else: + # Note: this is wrong if 'record' is several records with different + # currencies, which is functional nonsense and should not happen + currency = record[:1][self.currency_field] + + value = float(value or 0.0) + if currency: + return float_repr(currency.round(value), currency.decimal_places) + return value def convert_to_cache(self, value, record, validate=True): - if validate: - currency = record[self.currency_field] + # cache format: float + value = float(value or 0.0) + if validate and record[self.currency_field]: # FIXME @rco-odoo: currency may not be already initialized if it is # a function or related field! - if currency: - value = currency.round(float(value or 0.0)) - return float_precision(value, currency.decimal_places) - return float(value or 0.0) + value = record[self.currency_field].round(value) + return value def convert_to_read(self, value, record, use_name_get=True): # float_precision values are not supported in pure XMLRPC - return float(value) + return value def convert_to_write(self, value, record): return value @@ -1384,7 +1393,7 @@ class Char(_String): assert isinstance(self.size, (NoneType, int)), \ "Char field %s with non-integer size %r" % (self, self.size) - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): #TODO: # * we need to remove the "value==False" from the next line BUT # for now too many things rely on this broken behavior @@ -1452,7 +1461,7 @@ class Html(_String): _description_strip_style = property(attrgetter('strip_style')) _description_strip_classes = property(attrgetter('strip_classes')) - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): if value is None or value is False: return None if self.sanitize: @@ -1631,7 +1640,7 @@ class Binary(Field): _description_attachment = property(attrgetter('attachment')) - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): # Binary values may be byte strings (python 2.6 byte array), but # the legacy OpenERP convention is to transfer and store binaries # as base64-encoded strings. The base64 string may be provided as a @@ -1791,7 +1800,7 @@ class Selection(Field): return item[1] return False - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): """ Convert ``value`` from the ``write`` format to the SQL format. """ if value is None or value is False: return None @@ -1931,7 +1940,7 @@ class Many2one(_Relational): """ records._cache[self] = self.convert_to_cache(value, records, validate=False) - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): return value or None def convert_to_cache(self, value, record, validate=True): @@ -2453,7 +2462,7 @@ class Serialized(Field): } column_type = ('text', 'text') - def convert_to_column(self, value, record): + def convert_to_column(self, value, record, values=None): return json.dumps(value) def convert_to_cache(self, value, record, validate=True): -- cgit v1.2.3