From 3a13731d0777a25260f3628f3647d2c1122e6dfa Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Wed, 7 Apr 2010 11:29:42 +0530
Subject: [PATCH] [MOD] Small changes in project issue and purchase dashboard

bzr revid: vir@tinyerp.com-20100407055942-6v8u0ocm8a1lpv9f
---
 addons/board_purchase/board_purchase_view.xml   | 4 ++--
 addons/project/report/project_report.py         | 6 ++++--
 addons/project/report/project_report_view.xml   | 3 +++
 addons/purchase/report/purchase_report_view.xml | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml
index 4838c845cf1..d1ac01b9e7f 100644
--- a/addons/board_purchase/board_purchase_view.xml
+++ b/addons/board_purchase/board_purchase_view.xml
@@ -30,8 +30,8 @@
                             <action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order in Waiting"  width="510"/>
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(purchase.action_purchase_order_qty_amount_all)d" string="Total Qty and Amount by month"  width="510"/>
-                            <action colspan="4" height="220" name="%(purchase.action_purchase_order_by_user_all)d" string="Total Orders by User per month"  width="510"/>
+                            <action colspan="4" height="220" name="%(purchase.action_purchase_order_qty_amount_all)d" string="Total Qty and Amount by month"  />
+                            <action colspan="4" height="220" name="%(purchase.action_purchase_order_by_user_all)d" string="Total Orders by User per month"  />
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index a8d2f0a550a..af3eae3365a 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -119,6 +119,7 @@ class task_by_days(osv.osv):
     _auto = False
     _columns = {
         'day': fields.char('Day', size=128, required=True),
+        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True),
         'total_task': fields.float('Total tasks', readonly=True)
      }
     _order = 'day desc'
@@ -129,11 +130,12 @@ class task_by_days(osv.osv):
                 select
                     min(pt.id) as id,
                     to_char(pt.create_date, 'YYYY-MM-DD') as day,
-                    count(*) as total_task
+                    count(*) as total_task,
+                    pt.state as state
                 from
                     project_task as pt
                 group by
-                    to_char(pt.create_date, 'YYYY-MM-DD')
+                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.state
             )
         """)
 task_by_days()
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 11419be662e..a318df67832 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -88,6 +88,7 @@
          <field name="arch" type="xml">
              <graph string="Project vs remaining hours" type="bar">
                  <field name="project"/>
+                 <field name="state" group="True"/>
                  <field name="remaining_hours" operator="+"/>
              </graph>
          </field>
@@ -109,6 +110,7 @@
             <tree string="Task By Days" >
                 <field name="day"/>
                 <field name="total_task"/>
+                <field name="state"/>
             </tree>
         </field>
     </record>
@@ -120,6 +122,7 @@
          <field name="arch" type="xml">
              <graph string="Task By Days" type="bar">
                  <field name="day"/>
+                 <field name="state" group="True"/>
                  <field name="total_task" operator="+"/>
              </graph>
          </field>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 9482cef716d..19f13755083 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -139,8 +139,8 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Total Orders by User per month" type="bar">
-                    <field name="name"/>
-                    <field name="month" group="True"/>
+                    <field name="name" />
+                    <field name="month" group="True" />
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>