From 13b36ac677ff2b38d269e1ffd6428e9f0d765ec1 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 11 Feb 2015 12:02:21 +0100 Subject: [PATCH] [IMP] fields: in selection fields, 'selection_add' only adds options not in selection yet --- openerp/fields.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openerp/fields.py b/openerp/fields.py index 00ffb293c3e..7a58bef7641 100644 --- a/openerp/fields.py +++ b/openerp/fields.py @@ -21,6 +21,7 @@ """ High-level objects for fields. """ +from collections import OrderedDict from datetime import date, datetime from functools import partial from operator import attrgetter @@ -1269,7 +1270,9 @@ class Selection(Field): if 'selection' in field._attrs: selection = field._attrs['selection'] if 'selection_add' in field._attrs: - selection = selection + field._attrs['selection_add'] + # use an OrderedDict to update existing values + selection_add = field._attrs['selection_add'] + selection = OrderedDict(selection + selection_add).items() else: selection = None self.selection = selection