From 4bc20cd5288b791fa406f76dc382a94fd60fab0c Mon Sep 17 00:00:00 2001 From: saz-OpenERP Date: Thu, 14 Oct 2010 18:43:54 +0530 Subject: [PATCH] [IMP]:point_of_sale:Improves the pos_details report bzr revid: azaz.201186@gmail.com-20101014131354-iduvsmlcwlnob7ay --- addons/point_of_sale/report/pos_details.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py index a4b5b8f4c1e..a45e1736e62 100644 --- a/addons/point_of_sale/report/pos_details.py +++ b/addons/point_of_sale/report/pos_details.py @@ -75,13 +75,14 @@ class pos_details(report_sxw.rml_parse): def _get_sum_invoice_2(self,form,user): res2=[] self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \ - "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \ - "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state IN ('invoiced') " \ + "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc,account_invoice as ai " \ + "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and ai.id=po.invoice_id " \ "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date <= %s " \ "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \ ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid))) res2=self.cr.fetchone() self.total_invoiced=res2[0] + print "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",res2[0] return res2[0] or False def _paid_total_2(self,form,user):