Fix domain composition between screen and attribute domains

domains can not be summed because they can be of 'OR' type

review985002
(transplanted from ba60f315fc3e9346c438edd10cdcc2470abd1317)

tryton/gui/window/view_form/model/field.py

@@ -56,13 +56,13 @@ class CharField(object):
 
     def domain_get(self, record):
         screen_domain, attr_domain = self.domains_get(record)
-        return localize_domain(screen_domain) + attr_domain
+        return [localize_domain(screen_domain), attr_domain]
 
     def validation_domains(self, record):
         screen_domain, attr_domain = self.domains_get(record)
         if attr_domain:
-            return (screen_domain, screen_domain +
-                unlocalize_domain(attr_domain, self.name))
+            return (screen_domain, [screen_domain,
+                    unlocalize_domain(attr_domain, self.name)])
         else:
             return screen_domain, screen_domain
 
@@ -433,8 +433,8 @@ class M2OField(CharField):
 
     def domain_get(self, record):
         screen_domain, attr_domain = self.domains_get(record)
-        return (localize_domain(inverse_leaf(screen_domain), self.name)
-            + attr_domain)
+        return [localize_domain(inverse_leaf(screen_domain), self.name),
+            attr_domain]
 
     def get_state_attrs(self, record):
         result = super(M2OField, self).get_state_attrs(record)
@@ -725,7 +725,7 @@ class O2MField(CharField):
 
     def domain_get(self, record):
         screen_domain, attr_domain = self.domains_get(record)
-        return localize_domain(inverse_leaf(screen_domain)) + attr_domain
+        return [localize_domain(inverse_leaf(screen_domain)), attr_domain]
 
 
 class M2MField(O2MField):
@@ -896,7 +896,7 @@ class DictField(CharField):
 
     def domain_get(self, record):
         screen_domain, attr_domain = self.domains_get(record)
-        return localize_domain(inverse_leaf(screen_domain)) + attr_domain
+        return [localize_domain(inverse_leaf(screen_domain)), attr_domain]
 
 TYPES = {
     'char': CharField,