parent
f2c807d99d
commit
6af7c636c2
|
@ -151,13 +151,12 @@ class sale_order(osv.osv):
|
||||||
sale_clause = ''
|
sale_clause = ''
|
||||||
no_invoiced = False
|
no_invoiced = False
|
||||||
for arg in args:
|
for arg in args:
|
||||||
if arg[1] == '=':
|
if (arg[1] == '=' and arg[2]) or (arg[1] == '!=' and not arg[2]):
|
||||||
if arg[2]:
|
clause += 'AND inv.state = \'paid\''
|
||||||
clause += 'AND inv.state = \'paid\''
|
else:
|
||||||
else:
|
clause += 'AND inv.state != \'cancel\' AND sale.state != \'cancel\' AND inv.state <> \'paid\' AND rel.order_id = sale.id '
|
||||||
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 '
|
||||||
sale_clause = ', sale_order AS sale '
|
no_invoiced = True
|
||||||
no_invoiced = True
|
|
||||||
|
|
||||||
cursor.execute('SELECT rel.order_id ' \
|
cursor.execute('SELECT rel.order_id ' \
|
||||||
'FROM sale_order_invoice_rel AS rel, account_invoice AS inv '+ sale_clause + \
|
'FROM sale_order_invoice_rel AS rel, account_invoice AS inv '+ sale_clause + \
|
||||||
|
|
Loading…
Reference in New Issue