From 45a4f91da4cefd57b3680b734d62453a9782ce8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 7 Apr 2014 18:12:14 +0200 Subject: [PATCH] Validate field on simplified domain issue3823 review4871003 --- tryton/common/__init__.py | 2 +- tryton/gui/window/view_form/model/field.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tryton/common/__init__.py b/tryton/common/__init__.py index b7650d20b2..dda9261d29 100644 --- a/tryton/common/__init__.py +++ b/tryton/common/__init__.py @@ -3,5 +3,5 @@ from common import * from datetime_strftime import * from domain_inversion import domain_inversion, eval_domain, localize_domain, \ - merge, inverse_leaf, concat + merge, inverse_leaf, concat, simplify from environment import EvalEnvironment diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py index 06e20ad14a..0c1259634f 100644 --- a/tryton/gui/window/view_form/model/field.py +++ b/tryton/gui/window/view_form/model/field.py @@ -6,7 +6,7 @@ import tempfile import locale from tryton.common import datetime_strftime, \ domain_inversion, eval_domain, localize_domain, \ - merge, inverse_leaf, concat, EvalEnvironment + merge, inverse_leaf, concat, simplify, EvalEnvironment import tryton.common as common import time import datetime @@ -79,7 +79,7 @@ class Field(object): return True res = True self.get_state_attrs(record)['domain_readonly'] = False - domain = self.validation_domains(record) + domain = simplify(self.validation_domains(record)) if not softvalidation: res = res and self.check_required(record) if isinstance(domain, bool):