From dd75c419d4bd8025ace06c8722e55f867a6ef615 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Mon, 19 Apr 2010 18:47:05 +0530
Subject: [PATCH] [IMP]: Improve project issue report.

bzr revid: rch_open_erp-20100419131705-877i7i908i6ztmm2
---
 addons/crm/report/crm_report_view.xml                 |  2 +-
 addons/project_issue/report/project_issue_report.py   | 10 +++++-----
 .../report/project_issue_report_view.xml              | 11 +++++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index c9bebce0fb4..83a7187dbba 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -103,7 +103,7 @@
                			</field>
                    </group>
                    <newline/>
-                  <group  string="Group By..." colspan="4" col="8">
+                  <group  expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" name="User" icon="terp-sale"
                         	domain="[]" context="{'group_by':'user_id'}" />
 
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 1d4b2af4aa4..6ab01ec6a0e 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -13,14 +13,14 @@ class project_issue_report(osv.osv):
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'project_id':fields.many2one('project.project', 'Project'),
+        'project_id':fields.many2one('project.project', 'Project',readonly=True),
         'type_id': fields.many2one('crm.case.resource.type', 'Type', domain="[('object_id.model', '=', 'project.issue')]"),
         'date_closed': fields.datetime('Close Date', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to',),
+        'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
-        'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ),
+        'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" )
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'project_issue_report')
@@ -45,7 +45,7 @@ class project_issue_report(osv.osv):
                     c.partner_id,
                     c.canal_id,
                     c.task_id,
-                    c.create_date,
+                    date_trunc('day',c.create_date) as create_date,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     project_issue c
@@ -53,7 +53,7 @@ class project_issue_report(osv.osv):
                     res_users u on (c.id = u.id)
                 group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id
                 ,c.date_closed,u.company_id,c.priority,c.project_id,c.type_id
-                ,c.create_date,c.assigned_to,c.partner_id,c.canal_id,c.task_id
+                ,date_trunc('day',c.create_date),c.assigned_to,c.partner_id,c.canal_id,c.task_id
             )""")
 
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 7a70a2b934d..0b2f0299dc1 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -76,7 +76,14 @@
             	</xpath>
                	<xpath expr='//search[@string="Search"]/group[@string="Group By..."]' position='before'>
                	       <newline/>
-                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                		<group  string="Extended options..." colspan="10" col="12">
+                		<filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                    		<separator orientation="vertical"/>
                   			<field name="project_id" widget="selection" />
                     		<field name="priority" />
                     		<separator orientation="vertical"/>
@@ -123,7 +130,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">graph,tree</field>
-  			<field name="context">{"search_default_This Month":1}</field>
+  			<field name="context">{"search_default_This Month":1,"search_default_User":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
         </record>