From ae9d09a0671b815b6fdda5e646beddd90f34d7df Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 12 Apr 2010 11:12:17 +0530
Subject: [PATCH] [IMP]:hr_recruitment:Improved SQL report(Recruitment).

bzr revid: apa@tinyerp.com-20100412054217-t89847tprlt65rr8
---
 .../report/hr_recruitment_report.py           | 14 +++++++++++--
 .../report/hr_recruitment_report_view.xml     | 21 +++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 7ba9abfe812..7c452b96044 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -31,6 +31,7 @@ class hr_recruitment_report(osv.osv):
     _rec_name = 'date'
     _columns = {
         'date': fields.datetime('Date', readonly=True),
+        'date_closed': fields.datetime('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
         'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
@@ -46,6 +47,7 @@ class hr_recruitment_report(osv.osv):
                  select
                      min(s.id) as id,
                      s.date as date,
+                     s.date_closed,
                      to_char(s.date, 'YYYY') as name,
                      to_char(s.date, 'MM') as month,
                      s.state,
@@ -59,8 +61,16 @@ class hr_recruitment_report(osv.osv):
                      count(*) as nbr
                  from hr_applicant s
                  group by
-                     s.date,s.state,s.company_id,s.user_id,s.stage_id,s.type_id,s.priority,
-                     s.job_id,s.department_id
+                     s.date,
+                     s.state,
+                     s.company_id,
+                     s.user_id,
+                     s.stage_id,
+                     s.type_id,
+                     s.priority,
+                     s.date_closed,
+                     s.job_id,
+                     s.department_id
             )
         """)
 hr_recruitment_report()
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index b6c7541e9ec..e9e4869b6e6 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -50,8 +50,6 @@
                     help="Recruitments of this month"/>
                 <separator orientation="vertical"/>
                 <filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
-				<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-				<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="company_id" widget="selection"/>
                 <field name="user_id" widget="selection">
@@ -63,6 +61,22 @@
                 </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"
+                    		domain="[('state','=','done')]"/>
+                    <filter icon="terp-hr"
+                    		string="Refused"
+                    		domain="[('state','=','cancel')]"/>
+                	<newline/>
                     <filter icon="terp-hr"
                     		string="Not Good"
                     		domain="[('priority','=','5')]"/>
@@ -78,6 +92,9 @@
                     <filter icon="terp-hr"
                     		string="Excellent"
                     		domain="[('priority','=','1')]"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_closed"/>
                 </group>
 
                 <newline/>