From 5af5a4c834d0a8effbf8af561f97fbe08d4ddeaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 13 Jul 2015 23:57:43 +0200
Subject: [PATCH] Remove boolean expression in order

issue4852
review15541002
---
 account.py      | 3 ++-
 invoice.py      | 4 ++--
 payment_term.py | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/account.py b/account.py
index 45205cff98..954fe53deb 100644
--- a/account.py
+++ b/account.py
@@ -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 ModelSQL, ModelView, MatchMixin, fields
 from trytond.pyson import Eval
@@ -59,7 +60,7 @@ class ConfigurationTaxRounding(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]
 
     @staticmethod
     def default_method():
diff --git a/invoice.py b/invoice.py
index 1b22260d32..a706fb1f64 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1565,7 +1565,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
     @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_currency():
@@ -2085,7 +2085,7 @@ class InvoiceTax(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_base():
diff --git a/payment_term.py b/payment_term.py
index 55a9c0cf55..cc09f9ddd1 100644
--- a/payment_term.py
+++ b/payment_term.py
@@ -4,6 +4,7 @@ from decimal import Decimal
 from dateutil.relativedelta import relativedelta
 
 from sql import Null, Column
+from sql.conditionals import Case
 
 from trytond.model import ModelView, ModelSQL, fields
 from trytond import backend
@@ -175,7 +176,7 @@ class PaymentTermLine(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_currency_digits():
@@ -358,7 +359,7 @@ class PaymentTermLineRelativeDelta(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_months():