diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-10-11 19:07:42 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-10-11 19:07:42 +0200 |
| commit | f3532a6da6b2f02f100ebf2ae557048a8cfada73 (patch) | |
| tree | 6d4ae6ef87305fa37f951bfdd213ab4d02783960 /odoo/fields.py | |
| parent | 341bea8f88e3c66c438cb44ca03f47a6e9270d32 (diff) | |
| parent | 54ebe31f51c2e2e751df6335762511200aa06209 (diff) | |
[MERGE] forward port branch saas-12 up to 54ebe31
Diffstat (limited to 'odoo/fields.py')
| -rw-r--r-- | odoo/fields.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/odoo/fields.py b/odoo/fields.py index 610839ba517..ee732b5b62f 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -1099,6 +1099,8 @@ class Integer(Field): 'group_operator': 'sum', } + _description_group_operator = property(attrgetter('group_operator')) + def convert_to_column(self, value, record): return int(value or 0) @@ -1160,6 +1162,7 @@ class Float(Field): _related__digits = property(attrgetter('_digits')) _description_digits = property(attrgetter('digits')) + _description_group_operator = property(attrgetter('group_operator')) def convert_to_column(self, value, record): result = float(value or 0.0) @@ -1201,6 +1204,7 @@ class Monetary(Field): _related_currency_field = property(attrgetter('currency_field')) _description_currency_field = property(attrgetter('currency_field')) + _description_group_operator = property(attrgetter('group_operator')) def _setup_regular_base(self, model): super(Monetary, self)._setup_regular_base(model) @@ -1283,7 +1287,7 @@ class _String(Field): return self.translate(callback, value) else: return value - + class Char(_String): """ Basic string field, can be length-limited, usually displayed as a |
