diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-14 17:26:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-14 17:26:04 +0200 |
| commit | 8d95f6dcdf6e451f32c247bcabd5ce024a158ebe (patch) | |
| tree | 6e3d989c65a4c7090e313a474122fb426cf40896 /openerp/osv/fields.py | |
| parent | e4742f3d1f6b83993f87bbb5a82ff4e01c04bbb0 (diff) | |
| parent | 19b5ba2b08476ea2ede46ab7cf482526c47e62c8 (diff) | |
[MERGE] forward port of branch 8.0 up to 19b5ba2
Diffstat (limited to 'openerp/osv/fields.py')
| -rw-r--r-- | openerp/osv/fields.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index bcff5a2fadb..415f3272171 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -988,12 +988,11 @@ class many2many(_column): wquery = obj._where_calc(cr, user, domain, context=context) obj._apply_ir_rules(cr, user, wquery, 'read', context=context) + order_by = obj._generate_order_by(None, wquery) from_c, where_c, where_params = wquery.get_sql() if where_c: where_c = ' AND ' + where_c - order_by = ' ORDER BY "%s".%s' %(obj._table, obj._order.split(',')[0]) - limit_str = '' if self._limit is not None: limit_str = ' LIMIT %d' % self._limit |