From 9f69a19dd61793a70f9e5ffc063bb76cee397df3 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Mon, 19 Apr 2010 13:23:35 +0200
Subject: [PATCH] [IMP] views

bzr revid: nel@tinyerp.com-20100419112335-zaoruyqh2i2phha6
---
 .../report/hr_recruitment_report.py           | 16 ++++----
 .../report/hr_recruitment_report_view.xml     | 16 +++++---
 addons/project/report/project_report.py       | 10 +++--
 addons/project/report/project_report_view.xml | 37 +++++++++++++------
 .../report/project_issue_report_view.xml      | 18 ++++-----
 5 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index c23029747f3..047aa4244a7 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -42,7 +42,8 @@ class hr_recruitment_report(osv.osv):
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed"),
-        'salary_exp' : fields.float("Salary Expected")
+        'salary_exp' : fields.float("Salary Expected"),
+        'available' : fields.float("Availability")
 
     }
     _order = 'date desc'
@@ -52,15 +53,16 @@ class hr_recruitment_report(osv.osv):
             create or replace view hr_recruitment_report as (
                  select
                      min(s.id) as id,
-                     date_trunc('day',s.date) as date,
+                     date_trunc('day',s.create_date) as date,
                      date_trunc('day',s.date_closed) as date_closed,
-                     to_char(s.date, 'YYYY') as year,
-                     to_char(s.date, 'MM') as month,
+                     to_char(s.create_date, 'YYYY') as year,
+                     to_char(s.create_date, 'MM') as month,
                      s.state,
                      s.company_id,
                      s.user_id,
                      s.job_id,
                      s.type_id,
+                     sum(s.availability) as available,
                      s.department_id,
                      s.priority,
                      s.stage_id,
@@ -69,9 +71,9 @@ class hr_recruitment_report(osv.osv):
                      count(*) as nbr
                  from hr_applicant s
                  group by
-                     to_char(s.date, 'YYYY'),
-                     to_char(s.date, 'MM'),
-                     date_trunc('day',s.date),
+                     to_char(s.create_date, 'YYYY'),
+                     to_char(s.create_date, 'MM'),
+                     date_trunc('day',s.create_date),
                      date_trunc('day',s.date_closed),
                      s.state,
                      s.company_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index df7e90aa4aa..e9a9074ee4b 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -10,16 +10,17 @@
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="job_id" invisible="1"/>
-                <field name="stage_id" invisible="1"/>
+                <field name="stage_id" invisible="1"  widget="selection"/>
                 <field name="department_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="nbr"/>
-                <field name="salary_prop"/>
-                <field name="salary_exp"/>
+                <field name="nbr" sum="# Cases"/>
+                <field name="salary_prop" sum="Salary Proposed" />
+                <field name="salary_exp" sum="Salary Expected"/>
+                <field name="available" sum="Available"/>
             </tree>
         </field>
     </record>
@@ -93,9 +94,12 @@
                     <filter icon="terp-hr"
                     		string="Refused"
                     		domain="[('state','=','cancel')]"/>
-                	<newline/>
                     <field name="priority"/>
+                	<newline/>
                     <field name="date"/>
+                  <field name="stage_id" widget="selection"/>
+                  <field name="job_id" widget="selection"/>
+                  <field name="type_id" widget="selection"/>
                     <field name="date_closed"/>
                 </group>
                 <newline/>
@@ -122,7 +126,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_inprogress': 1 }</field>
+        <field name="context">{'search_default_inprogress': 1, 'search_default_user_id': uid }</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 051195582e0..44f1dbd229a 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -28,6 +28,7 @@ class report_project_task_user(osv.osv):
     _auto = False
     _columns = {
         'name': fields.char('Task Summary', size=128, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'date_start': fields.datetime('Starting Date',readonly=True),
@@ -57,11 +58,10 @@ class report_project_task_user(osv.osv):
                ('done', 'Done')],
             'State', readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'sprint_id': fields.many2one('scrum.sprint', 'Sprint',readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'type': fields.many2one('project.task.type', 'Stage',readonly=True),
 
-
-
     }
     _order = 'name desc, project_id'
     def init(self, cr):
@@ -72,6 +72,7 @@ class report_project_task_user(osv.osv):
                     min(t.id) as id,
                     to_char(date_start, 'YYYY') as year,
                     to_char(date_start, 'MM') as month,
+                    to_char(date_start, 'YYYY-MM-DD') as day,
                     count(distinct t.id) as nbr,
                     date_trunc('day',t.date_start) as date_start,
                     date_trunc('day',t.date_end) as date_end,
@@ -79,6 +80,7 @@ class report_project_task_user(osv.osv):
                     sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
                     t.user_id,
                     t.project_id,
+                    t.sprint_id as sprint_id,
                     t.state,
                     t.priority,
                     t.name,
@@ -104,7 +106,9 @@ class report_project_task_user(osv.osv):
                     t.partner_id,
                     t.type,
                     t.name,
-                    t.project_id
+                    t.sprint_id,
+                    t.project_id,
+                    t.date_start
             )
         """)
 report_project_task_user()
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index f643c06e313..b1125850962 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -19,8 +19,9 @@
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="type" invisible="1"/>
-                    <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
+                    <field name="year" invisible="1"/>
                     <field name="nbr" sum='#Number of tasks'/>
                     <field name="no_of_days" sum="#Days"/>
                     <field name="hours_planned" sum='Planned Hours'/>
@@ -77,16 +78,6 @@
 	                   			domain="[('state','=','pending')]"
 	                   			help = "Pending tasks"/>
 	  					<separator orientation="vertical"/>
-	                    <field name="project_id">
-	                        <filter icon="terp-project"
-	                        		string="My Task"
-	                        		help="My Tasks"
-	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
-	                        <filter icon="terp-project"
-	                        		string="Non assigned Tasks"
-	                        		help ="Non assigned Tasks"
-	                        		domain="[('project_id','=',False"/>
-	                    </field>
 	                    <field name="user_id" widget="selection">
 	                        <filter icon="terp-project"
 	                        		string="My Task"
@@ -97,11 +88,31 @@
 	                        		help="Non Assigned Tasks"
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
+	                    <field name="project_id">
+	                        <filter icon="terp-project"
+	                        		string="My Task"
+	                        		help="My Tasks"
+	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
+	                        <filter icon="terp-project"
+	                        		string="Non assigned Tasks"
+	                        		help ="Non assigned Tasks"
+	                        		domain="[('project_id','=',False"/>
+	                    </field>
                     </group>
                     <newline/>
 	                <group expand="1" string="Extended options..." colspan="10" col="12">
+                      <filter string="Done"
+                    			icon="terp-project"
+                    			name="done"
+                    			domain="[('state','=','done')]"/>
+                    	<filter string="Cancelled"
+                    			icon="terp-project"
+                    			domain="[('state','=','cancelled')]"/>
+	                    <field name="type" widget="selection"/>
 	                    <field name="priority"/>
 	                    <field name="date_deadline"/>
+	                    <field name="partner_id"/>
+	                    <field name="sprint_id" widget="selection"/>
 	                    <newline/>
 	                    <field name="date_start"/>
 	                    <field name="date_end"/>
@@ -112,10 +123,12 @@
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
                         <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
+                        <filter string="Sprint" icon="terp-project" context="{'group_by':'sprint_id'}"/>
                         <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
                         <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
                     </group>
@@ -129,7 +142,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_month':1,'search_default_user_id':uid, 'search_default_project_id':context.get('project_id', False)}</field>
+            <field name="context">{'search_default_month':1,'search_default_user_id':uid}</field>
 
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index a5672fcaf26..bdcbf86e10e 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -7,15 +7,14 @@
             <field name="model">project.issue.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-				<tree string="Project Issue">
-	              	<field name="name" invisible="1"/>
-					<field name="month" invisible="1"/>
-					<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"/>
+                <tree string="Project Issue">
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <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" groups="base.group_multi_company"/>
                     <field name="delay_close" invisible="1"/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
@@ -23,6 +22,7 @@
                     <field name="categ_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
+                    <field name="nbr" string="#Project Issue"/>
                   </tree>
             </field>
         </record>