From 21ffd7677b28fd0ae2ee6c47eeba18a4c7bd40d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 23 Aug 2008 01:35:25 +0200
Subject: [PATCH] Use dictionary to format order clause

---
 trytond/osv/orm.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/trytond/osv/orm.py b/trytond/osv/orm.py
index 50a2169211..7d80ec7cca 100644
--- a/trytond/osv/orm.py
+++ b/trytond/osv/orm.py
@@ -2519,8 +2519,11 @@ class ORM(object):
                     return order_by, tables, clause
 
             if field_name:
-                if '%s' in field_name:
-                    order_by.append(field_name % table_name + ' ' + otype)
+                if '%(table)s' in field_name or '%(order)s' in field_name:
+                    order_by.append(field_name % {
+                        'table': table_name,
+                        'order': otype,
+                        })
                 else:
                     order_by.append(table_name + '.' + field_name + ' ' + otype)
                 return order_by, tables, clause