[MERGE]

bzr revid: nel@tinyerp.com-20100409143606-3wnmf8zbujyh5188
2010-04-09 16:36:06 +02:00
parent fb3b0dd8f8 092ee13ea2
commit 06dd94c8a9
2 changed files with 3 additions and 1 deletions
@@ -165,6 +165,8 @@ class task_by_days(osv.osv):
                    pt.project_id
                from
                    project_task as pt
+                where
+                    (to_date(to_char(pt.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15))
                group by
                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
            )
@@ -126,7 +126,7 @@ class purchase_order_qty_amount(osv.osv):
                    min(id) as id,
                    to_char(create_date, 'MM') as month,
                    sum(product_qty) as total_qty,
-                    sum(price_unit) as total_amount
+                    sum(price_unit*product_qty) as total_amount
                from
                    purchase_order_line
                where