tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions 1 Packages Projects Releases Wiki Activity

Remove boolean expression in order

Browse Source 
issue4852
review15541002
This commit is contained in:
Cédric Krier
2015-07-13 23:57:30 +02:00
parent 62178bb9c8
commit 48cd9b0454
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
account.py
+3 -3
View File
@@ -8,7 +8,7 @@ from functools import wraps
from sql import Column, Literal, Null
from sql.aggregate import Sum
from sql.conditionals import Coalesce
from sql.conditionals import Coalesce, Case
from trytond.model import ModelView, ModelSQL, fields, Unique
from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
@@ -80,7 +80,7 @@ class TypeTemplate(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_balance_sheet():
@@ -223,7 +223,7 @@ class Type(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_balance_sheet():
journal.py
+2 -1
View File
@@ -1,6 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from sql import Null
from sql.conditionals import Case
from trytond.model import ModelView, ModelSQL, fields, Unique
from trytond.wizard import Wizard, StateTransition
@@ -81,7 +82,7 @@ class JournalViewColumn(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_required():
move_template.py
+2 -1
View File
@@ -5,6 +5,7 @@ from decimal import Decimal
from simpleeval import simple_eval
from sql import Null
from sql.conditionals import Case
from trytond.model import ModelSQL, ModelView, fields
from trytond.pyson import Eval
@@ -92,7 +93,7 @@ class MoveTemplateKeyword(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_required():
tax.py
+6 -5
View File
@@ -3,10 +3,11 @@
import datetime
from collections import namedtuple
from decimal import Decimal
from itertools import groupby
from sql import Null
from sql.aggregate import Sum
from itertools import groupby
from sql.conditionals import Case
from trytond.model import ModelView, ModelSQL, MatchMixin, fields
from trytond.wizard import Wizard, StateView, StateAction, Button
@@ -448,7 +449,7 @@ class TaxTemplate(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_type():
@@ -770,7 +771,7 @@ class Tax(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
@staticmethod
def default_active():
@@ -1409,7 +1410,7 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
def _get_tax_rule_line_value(self, rule_line=None):
'''
@@ -1523,7 +1524,7 @@ class TaxRuleLine(ModelSQL, ModelView, MatchMixin):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
return [Case((table.sequence == Null, 0), else_=1), table.sequence]
def match(self, pattern):
if 'group' in pattern and not self.group: