odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20110917113229-ijef4nzbcq3hm135
This commit is contained in:
Fabien Pinckaers 2011-09-17 13:32:29 +02:00
parent 889d83abcf acc57dfb30
commit 280e652335
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/point_of_sale/point_of_sale.py
View File

@ -114,10 +114,18 @@ class pos_order(osv.osv):
if date_p:
res[order.id] = date_p
return res
cr.execute(" SELECT MAX(l.date) "
" FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o "
" WHERE i.move_id = m.id AND l.move_id = m.id AND l.reconcile_id = r.id AND o.id = %s AND o.invoice_id = i.id",
(order.id,))
if order.invoice_id:
cr.execute(" SELECT MAX(l.date) "
" FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o "
" WHERE i.move_id = m.id AND l.move_id = m.id AND l.reconcile_id = r.id AND o.id = %s AND o.invoice_id = i.id",
(order.id,))
else:
cr.execute("SELECT MAX(l.date) from account_move_line l "
"left join account_bank_statement abs on (l.statement_id=abs.id)"
"left join account_bank_statement_line absl on (absl.statement_id=abs.id) "
"left join pos_order p on (p.id=absl.pos_statement_id) "
"left join account_account a on (a.id=absl.account_id) "
"where p.id=%s and l.reconcile_id is not NULL and a.reconcile=True", (order.id,))
val = cr.fetchone()
val = val and val[0] or None
if val: