pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge from trunk-dev-addons-3

Browse Source 
bzr revid: vth@tinyerp.com-20101103114434-2ghb5pg9fmtxccw6
This commit is contained in:
vth
2010-11-03 17:14:34 +05:30
parent 620250ee09
commit 28b0d9cc48
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/sale.py
+3 -4
View File
@@ -180,12 +180,11 @@ class sale_order(osv.osv):
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 '
# clause += 'AND inv.state <> \'paid\''
clause += 'AND inv.state <> \'paid\''
no_invoiced = True
cursor.execute('SELECT rel.order_id ' \
'FROM sale_order_invoice_rel AS rel, account_invoice AS inv, sale_order AS sale ' \
'FROM sale_order_invoice_rel AS rel, account_invoice AS inv ' \
'WHERE rel.invoice_id = inv.id ' + clause)
res = cursor.fetchall()
@@ -194,7 +193,7 @@ class sale_order(osv.osv):
'FROM sale_order AS sale ' \
'WHERE sale.id NOT IN ' \
'(SELECT rel.order_id ' \
'FROM sale_order_invoice_rel AS rel) and sale.state != \'cancel\'')
'FROM sale_order_invoice_rel AS rel) ')
res.extend(cursor.fetchall())
if not res:
return [('id', '=', 0)]