From 64db115f37123e1e299fc2cf13a0902c83e5feb0 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 16 Apr 2010 19:09:49 +0530
Subject: [PATCH] [IMP]: Improve project_issue report.

bzr revid: rch_open_erp-20100416133949-n0g7qvq2tx4smhxc
---
 addons/crm/report/crm_report_view.xml         |  2 +-
 .../report/project_issue_report.py            |  4 +-
 .../report/project_issue_report_view.xml      | 70 ++++++-------------
 3 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index b654ffe6f4f..c9bebce0fb4 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 expand="1" string="Group By..." colspan="4" col="8">
+                  <group  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 51374fa22ad..b6f225324a3 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -17,6 +17,7 @@ class project_issue_report(osv.osv):
         'type_id': fields.many2one('crm.case.resource.type', 'Bug 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')
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'project_issue_report')
@@ -37,6 +38,7 @@ class project_issue_report(osv.osv):
                     c.project_id as project_id,
                     c.type_id as type_id,
                     count(*) as nbr,
+                    c.assigned_to,
                     c.create_date as create_date,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
@@ -45,7 +47,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.create_date,c.assigned_to
             )""")
 
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index be7df20ceb2..a5672fcaf26 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -10,19 +10,19 @@
 				<tree string="Project Issue">
 	              	<field name="name" invisible="1"/>
 					<field name="month" invisible="1"/>
-					<field name="project_id" />
-					<field name="stage_id" />
-					<field name="type_id" string="Type"/>
-					<field name="priority" />
-					<field name="company_id" />
+					<field name="project_id" invisible="1"/>
+					<field name="stage_id" invisible="1"/>
+					<field name="type_id" string="Type" invisible="1"/>
+					<field name="priority" invisible="1"/>
+					<field name="company_id" invisible="1"/>
                 	<field name="nbr" string="#Project Issue"/>
-                    <field name="delay_close"/>
+                    <field name="delay_close" invisible="1"/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="stage_id" invisible="1" />
-                    <field name="categ_id" />
-                    <field name="date_closed" />
-                    <field name="state" />
+                    <field name="categ_id" invisible="1"/>
+                    <field name="date_closed" invisible="1"/>
+                    <field name="state" invisible="1"/>
                   </tree>
             </field>
         </record>
@@ -46,7 +46,7 @@
             <field name="arch" type="xml">
                <data>
                 <xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Year"]' position='replace'>
-                    	<filter string="This Year" icon="terp-sale" domain="[('name','=',time.strftime('%%Y'))]"/>
+                    	<filter string="This Year" icon="terp-sale" domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
            		</xpath>
             	<xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Month"]' position='replace'>
                     	<filter string="This Month" icon="terp-sale" name="This Month"
@@ -64,45 +64,20 @@
                	<xpath expr='//search[@string="Search"]/group[@string="Group By..."]' position='before'>
                	       <newline/>
                 		<group expand="1" string="Extended options..." colspan="10" col="12">
-                    		<filter icon="terp-sale"
-                    		string="Highest"
-                    		domain="[('priority','=','1')]"/>
-                    		<filter icon="terp-sale"
-                    		string="High"
-                    		domain="[('priority','=','2')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Normal"
-                    		domain="[('priority','=','3')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Low"
-                    		domain="[('priority','=','4')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Lowest"
-                    		domain="[('priority','=','5')]"/>
-                    		<separator orientation="vertical"/>
-                    		<field name="project_id" widget="selection"/>
-                    		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
-                    		<newline/>
-                           <filter icon="terp-sale"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Cancelled"
-                    		domain="[('state','=','cancel')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Closed"
-                    		domain="[('state','=','done')]"/>
-                    		<filter icon="terp-sale"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
-                    		<separator orientation="vertical"/>
+                  			<field name="project_id" widget="selection"/>
+                    		<field name="priority" />
                     		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    		<separator orientation="vertical"/>
+                    		<field name="assigned_to" widget="selection">
+                    			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
+ 						    	<filter icon="terp-crm"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
+                    		</field>
                     		<newline/>
-                        <field name="date_closed" string="Date Closed"/>
+                    		<field name="state" />
+                    		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
+                            <separator orientation="vertical"/>
+                            <field name="date_closed" string="Date Closed"/>
                 		</group>
                 		<newline/>
 				</xpath>
@@ -113,6 +88,7 @@
             		<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
             		<separator orientation="vertical"/>
             		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
+            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
             		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
             	</xpath>
                 </data>