diff --git a/setup.py b/setup.py index 75b9d76f42..a01c83e446 100644 --- a/setup.py +++ b/setup.py @@ -41,12 +41,11 @@ if minor_version % 2: 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % ( name[8:], name, version)) -requires = [] +requires = ['python-sql >= 0.4'] for dep in info.get('depends', []): if not re.match(r'(ir|res|webdav)(\W|$)', dep): requires.append(get_require_version('trytond_%s' % dep)) requires.append(get_require_version('trytond')) -requires.append('python-sql') tests_require = [get_require_version('proteus')] diff --git a/statement.py b/statement.py index 9c1426ac16..2e2757bd04 100644 --- a/statement.py +++ b/statement.py @@ -4,6 +4,7 @@ from decimal import Decimal from collections import namedtuple from itertools import groupby +from sql import Null from sql.aggregate import Sum from trytond.model import Workflow, ModelView, ModelSQL, fields @@ -177,7 +178,7 @@ class Statement(Workflow, ModelSQL, ModelView): # Migration from 3.2: add required name cursor.execute(*sql_table.update([sql_table.name], [sql_table.id.cast(cls.name.sql_type().base)], - where=sql_table.name == None)) + where=sql_table.name == Null)) @staticmethod def default_company(): @@ -468,7 +469,7 @@ class Line(ModelSQL, ModelView): @staticmethod def order_sequence(tables): table, _ = tables[None] - return [table.sequence == None, table.sequence] + return [table.sequence == Null, table.sequence] @staticmethod def default_amount():