From 8d99fd9448c53746a17d2be1b81e76a0539a9534 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 13 May 2020 14:06:28 +0000 Subject: [FIX] core: selection override with str or callable If the original field is defined with a selection list, overrides with method or methods names fall back on the list. closes odoo/odoo#51232 X-original-commit: 272ba8d2238d1d1b87f47b114b55e6eed25314a8 Signed-off-by: Raphael Collet (rco) --- odoo/fields.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'odoo/fields.py') diff --git a/odoo/fields.py b/odoo/fields.py index 89064379bcb..23d9a8c4a58 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -2174,9 +2174,11 @@ class Selection(Field): if values is not None and values != [kv[0] for kv in selection]: _logger.warning("%s: selection=%r overrides existing selection; use selection_add instead", self, selection) values = [kv[0] for kv in selection] - labels.update(selection) + labels = dict(selection) self.ondelete = {} else: + values = None + labels = {} self.selection = selection self.ondelete = None -- cgit v1.2.3