Change diff domain_field for 4.0 series

This commit is contained in:
Raimon Esteve 2016-05-30 13:44:10 +02:00
parent bcfe1d99fa
commit 4af07ee38c
1 changed files with 22 additions and 22 deletions

View File

@ -1,6 +1,6 @@
diff -r 1a22411f9264 trytond/trytond/model/fields/many2many.py
--- a/trytond/trytond/model/fields/many2many.py Thu Jul 16 01:13:45 2015 +0200
+++ b/trytond/trytond/model/fields/many2many.py Mon Jul 20 14:20:18 2015 +0200
diff -r 6c0d835dd918 trytond/trytond/model/fields/many2many.py
--- a/trytond/trytond/model/fields/many2many.py Wed May 11 10:40:32 2016 +0200
+++ b/trytond/trytond/model/fields/many2many.py Mon May 30 13:35:59 2016 +0200
@@ -287,6 +287,9 @@
table, _ = tables[None]
name, operator, value = domain[:3]
@ -8,14 +8,14 @@ diff -r 1a22411f9264 trytond/trytond/model/fields/many2many.py
+ method = getattr(Model, 'domain_%s' % name, None)
+ if method:
+ return method(domain, tables)
if Relation._history and transaction.context.get('_datetime'):
relation = Relation.__table_history__()
diff -r 1a22411f9264 trytond/trytond/model/fields/many2one.py
--- a/trytond/trytond/model/fields/many2one.py Thu Jul 16 01:13:45 2015 +0200
+++ b/trytond/trytond/model/fields/many2one.py Mon Jul 20 14:20:18 2015 +0200
diff -r 6c0d835dd918 trytond/trytond/model/fields/many2one.py
--- a/trytond/trytond/model/fields/many2one.py Wed May 11 10:40:32 2016 +0200
+++ b/trytond/trytond/model/fields/many2one.py Mon May 30 13:35:59 2016 +0200
@@ -159,6 +159,9 @@
table, _ = tables[None]
name, operator, value = domain[:3]
+ method = getattr(Model, 'domain_%s' % name, None)
@ -24,9 +24,9 @@ diff -r 1a22411f9264 trytond/trytond/model/fields/many2one.py
column = self.sql_column(table)
if '.' not in name:
if operator.endswith('child_of') or operator.endswith('parent_of'):
diff -r 1a22411f9264 trytond/trytond/model/fields/one2many.py
--- a/trytond/trytond/model/fields/one2many.py Thu Jul 16 01:13:45 2015 +0200
+++ b/trytond/trytond/model/fields/one2many.py Mon Jul 20 14:20:18 2015 +0200
diff -r 6c0d835dd918 trytond/trytond/model/fields/one2many.py
--- a/trytond/trytond/model/fields/one2many.py Wed May 11 10:40:32 2016 +0200
+++ b/trytond/trytond/model/fields/one2many.py Mon May 30 13:35:59 2016 +0200
@@ -232,6 +232,9 @@
table, _ = tables[None]
name, operator, value = domain[:3]
@ -34,25 +34,25 @@ diff -r 1a22411f9264 trytond/trytond/model/fields/one2many.py
+ method = getattr(Model, 'domain_%s' % name, None)
+ if method:
+ return method(domain, tables)
if Target._history and transaction.context.get('_datetime'):
target = Target.__table_history__()
diff -r 1a22411f9264 trytond/trytond/model/fields/property.py
--- a/trytond/trytond/model/fields/property.py Thu Jul 16 01:13:45 2015 +0200
+++ b/trytond/trytond/model/fields/property.py Mon Jul 20 14:20:18 2015 +0200
@@ -72,6 +72,9 @@
diff -r 6c0d835dd918 trytond/trytond/model/fields/property.py
--- a/trytond/trytond/model/fields/property.py Wed May 11 10:40:32 2016 +0200
+++ b/trytond/trytond/model/fields/property.py Mon May 30 13:35:59 2016 +0200
@@ -75,6 +75,9 @@
cursor = Transaction().connection.cursor()
name, operator, value = domain
+ method = getattr(Model, 'domain_%s' % name, None)
+ if method:
+ return method(domain, tables)
sql_type = self._field.sql_type().base
diff -r 1a22411f9264 trytond/trytond/model/fields/reference.py
--- a/trytond/trytond/model/fields/reference.py Thu Jul 16 01:13:45 2015 +0200
+++ b/trytond/trytond/model/fields/reference.py Mon Jul 20 14:20:18 2015 +0200
diff -r 6c0d835dd918 trytond/trytond/model/fields/reference.py
--- a/trytond/trytond/model/fields/reference.py Wed May 11 10:40:32 2016 +0200
+++ b/trytond/trytond/model/fields/reference.py Mon May 30 13:35:59 2016 +0200
@@ -124,6 +124,9 @@
return super(Reference, self).convert_domain(domain, tables, Model)
pool = Pool()