From 08dab16b67f0fe6d41706a7f9491bab0f37bf046 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Fri, 16 Apr 2010 11:31:36 +0200
Subject: [PATCH] [IMP] view recruitments

bzr revid: nel@tinyerp.com-20100416093136-66y0y3v91zfshzrq
---
 .../report/hr_recruitment_report.py           |  4 +
 .../report/hr_recruitment_report_view.xml     | 83 ++++++++++---------
 addons/project/report/project_report_view.xml | 12 +--
 3 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 822e391650d..c23029747f3 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -41,6 +41,8 @@ class hr_recruitment_report(osv.osv):
         'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
         '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")
 
     }
     _order = 'date desc'
@@ -62,6 +64,8 @@ class hr_recruitment_report(osv.osv):
                      s.department_id,
                      s.priority,
                      s.stage_id,
+                     sum(salary_proposed) as salary_prop,
+                     sum(salary_expected) as salary_exp,
                      count(*) as nbr
                  from hr_applicant s
                  group by
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 3ed947468ee..df7e90aa4aa 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -7,17 +7,19 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Recruitments Statistics">
-                <field name="date"/>
-                <field name="user_id"/>
-                <field name="job_id"/>
-                <field name="stage_id"/>
-                <field name="department_id"/>
-                <field name="nbr"/>
-                <field name="type_id"/>
-                <field name="company_id"/>
-                <field name="state"/>
+                <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="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"/>
             </tree>
         </field>
     </record>
@@ -49,58 +51,57 @@
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Recruitments of this month"/>
+                	<filter icon="terp-hr"
+                    		string="Current"
+                    		help="Draft and in progress recruitments"
+                        domain="[('state','in',('open','draft'))]"
+                        name="inprogress"
+                        />
+                    <filter icon="terp-hr"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+                    <field name="department_id" widget="selection">
+                      <filter icon="terp-sale"
+                        string="My Recruitments "
+                        help="My Department Recruitments"
+                        domain="[('user_id','=',uid)]"/>
+                      <filter icon="terp-sale"
+                        string="Recruitments non assigned to departments"
+                        help="Recruitments non assigned to departments"
+                        domain="[('user_id','=',False)]"/>
+                    </field>
+
                 <separator orientation="vertical"/>
-                <filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
-                <separator orientation="vertical"/>
-                <field name="company_id" widget="selection"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-sale"
                         string="My Recruitments"
-                        default="1"
+                        help="My Recruitments"
                         domain="[('user_id','=',uid)]"/>
+                    <filter icon="terp-sale"
+                        string="Recruitments non assigned"
+                        help="Recruitments non assigned"
+                        domain="[('user_id','=',False)]"/>
                 </field>
                 </group>
                 <newline/>
                 <group expand="1" string="Extended options..." colspan="10" col="12">
-                	<filter icon="terp-hr"
-                    		string="New"
-                    		domain="[('state','=','draft')]"/>
-                    <filter icon="terp-hr"
-                    		string="In Progress"
-                    		domain="[('state','=','open')]"/>
-                    <filter icon="terp-hr"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
                     <filter icon="terp-hr"
                     		string="Hired"
+                        name="done"
                     		domain="[('state','=','done')]"/>
                     <filter icon="terp-hr"
                     		string="Refused"
                     		domain="[('state','=','cancel')]"/>
                 	<newline/>
-                    <filter icon="terp-hr"
-                    		string="Not Good"
-                    		domain="[('priority','=','5')]"/>
-                    <filter icon="terp-hr"
-                    		string="On Average"
-                    		domain="[('priority','=','4')]"/>
-                    <filter icon="terp-hr"
-                    		string="Good"
-                    		domain="[('priority','=','3')]"/>
-                    <filter icon="terp-hr"
-                    		string="Very Good"
-                    		domain="[('priority','=','2')]"/>
-                    <filter icon="terp-hr"
-                    		string="Excellent"
-                    		domain="[('priority','=','1')]"/>
-                    <newline/>
+                    <field name="priority"/>
                     <field name="date"/>
                     <field name="date_closed"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By ..." colspan="10" col="12">
+                <group string="Group By ..." colspan="10" col="12">
                    <filter string="User" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}"/>
+                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Stage" name="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
                    <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
@@ -121,7 +122,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_Stage': 1 }</field>
+        <field name="context">{'search_default_inprogress': 1 }</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_view.xml b/addons/project/report/project_report_view.xml
index 9faf7670fba..3dcc193b5e2 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -13,12 +13,6 @@
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
-                    <field name="nbr" sum='#Number of tasks'/>
-                    <field name="no_of_days"/>
-                    <field name="hours_planned" sum='Planned Hours'/>
-                    <field name="hours_effective" sum='Effective Hours'/>
-                    <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
-                    <field name="closing_days" sum='Avg Closing Delay'/>
                     <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
@@ -27,6 +21,12 @@
                     <field name="type" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="month" invisible="1"/>
+                    <field name="nbr" sum='#Number of tasks'/>
+                    <field name="no_of_days"/>
+                    <field name="hours_planned" sum='Planned Hours'/>
+                    <field name="hours_effective" sum='Effective Hours'/>
+                    <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
+                    <field name="closing_days" sum='Avg Closing Delay'/>
                 </tree>
             </field>
         </record>