diff options
| author | Raphael Collet <rco@odoo.com> | 2017-05-18 14:15:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 14:15:07 +0200 |
| commit | afef71d6b92a2741ab56b4d039eba1624a45197f (patch) | |
| tree | d59b23578e69a6fda4bdb0d47ee4c07673c2051b /odoo/models.py | |
| parent | 440177f2faa0e575ce613b6445d8299bceb355ab (diff) | |
[FIX] Always round monetary values in database (#17010)
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.
Diffstat (limited to 'odoo/models.py')
| -rw-r--r-- | odoo/models.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/odoo/models.py b/odoo/models.py index 3a633d9826d..7e2f65c9312 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -3066,7 +3066,7 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): if field.column_type: if single_lang or not (has_trans and field.translate is True): # val is not a translation: update the table - val = field.convert_to_column(val, self) + val = field.convert_to_column(val, self, vals) updates.append((name, field.column_format, val)) direct.append(name) else: @@ -3106,7 +3106,7 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): # Insert value to DB src_trans = vals[name] self.with_context(lang=None).write({name: src_trans}) - val = field.convert_to_column(vals[name], self) + val = field.convert_to_column(vals[name], self, vals) tname = "%s,%s" % (self._name, name) self.env['ir.translation']._set_ids( tname, 'model', self.env.lang, self.ids, val, src_trans) @@ -3330,7 +3330,7 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): parent_id = self.env[parent_model].create(parent_vals).id else: self.env[parent_model].browse(parent_id).write(parent_vals) - updates.append((self._inherits[parent_model], '%s', parent_id)) + vals[self._inherits[parent_model]] = parent_id # set boolean fields to False by default (to make search more powerful) for name, field in pycompat.items(self._fields): @@ -3338,10 +3338,12 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): vals[name] = False # determine SQL values + self = self.browse() for name, val in pycompat.items(vals): field = self._fields[name] if field.store and field.column_type: - updates.append((name, field.column_format, field.convert_to_column(val, self))) + column_val = field.convert_to_column(val, self, vals) + updates.append((name, field.column_format, column_val)) else: upd_todo.append(name) |
