diff options
| author | Martin Trigaux <mart-e@users.noreply.github.com> | 2014-06-19 16:01:23 +0200 |
|---|---|---|
| committer | Martin Trigaux <mart-e@users.noreply.github.com> | 2014-06-19 16:01:23 +0200 |
| commit | f855f1c1622716d68d2d64aec34f97f59d6ea47e (patch) | |
| tree | cf3063fb5329a4be5227e21f98319580552535d3 | |
| parent | bf53aeda9436310f493a77fc24f8cc35f362ec5b (diff) | |
| parent | 271885716f7303551d74e0989183e5f27d35da54 (diff) | |
Merge pull request #325 from odoo-dev/saas-3-opw-608186-acl
[FIX] sale: cannot filter on paid = False (opw 608186)
| -rw-r--r-- | addons/sale/sale.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8e895190295..1a26d51a164 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -128,13 +128,12 @@ class sale_order(osv.osv): sale_clause = '' no_invoiced = False for arg in args: - if arg[1] == '=': - if arg[2]: - clause += 'AND inv.state = \'paid\'' - else: - clause += 'AND inv.state != \'cancel\' AND sale.state != \'cancel\' AND inv.state <> \'paid\' AND rel.order_id = sale.id ' - sale_clause = ', sale_order AS sale ' - no_invoiced = True + if (arg[1] == '=' and arg[2]) or (arg[1] == '!=' and not arg[2]): + clause += 'AND inv.state = \'paid\'' + else: + clause += 'AND inv.state != \'cancel\' AND sale.state != \'cancel\' AND inv.state <> \'paid\' AND rel.order_id = sale.id ' + sale_clause = ', sale_order AS sale ' + no_invoiced = True cursor.execute('SELECT rel.order_id ' \ 'FROM sale_order_invoice_rel AS rel, account_invoice AS inv '+ sale_clause + \ |