From 55e01bb269d70c676edbb4a764207c06853c9f25 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 18 May 2010 11:49:27 +0530
Subject: [PATCH] [IMP] hr_recruitment: Improve the views(form, search)

bzr revid: psi@tinyerp.co.in-20100518061927-h430m9354e2wkvuy
---
 addons/hr_recruitment/hr_recruitment_view.xml | 25 +++++------
 .../report/hr_recruitment_report_view.xml     | 42 +++++++++----------
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4ad4dd214c1..0a50d6e250f 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -69,26 +69,21 @@
         <field name="arch" type="xml">
             <form string="Jobs - Recruitment Form">
                 <group colspan="4" col="8">
-                     <group colspan="3" col="6">
                         <field name="name" string="Subject"/>
+                        <field name="partner_name"/>
+	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
+	                   	<button string="Schedule a Phone Call" name="223" icon="gtk-redo" type="action"/>
+                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
+                    	<newline/>
+                    	<group colspan="2" col="4">
                         <field name="stage_id"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                    </group>
-                    <newline/>
-                    <group colspan="3" col="6">
-	                  	<field name="partner_name"/>
-	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
-	                   	<button string="Schedule a Phone Call" name="223" icon="gtk-redo" type="action"/>
-                     </group>
-                    <newline/>
-                    <group colspan="3" col="6">
+						</group>
                         <field name="user_id"/>
                         <field name="department_id" widget="selection"/>
-                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
-                    </group>
-                    <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+	                    <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+	                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
             	</group>
                 <notebook colspan="4">
                     <page string="Job Info">
@@ -233,7 +228,7 @@
                        help="My Department"/>
                </field>
                <newline/>
-                <group expand="0" string="Group By..." colspan="11" col="20">
+                <group expand="1" string="Group By..." colspan="11" col="20">
                     <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8e0c3f0845a..6bbd83a87e8 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -84,10 +84,6 @@
                 <separator orientation="vertical"/>
                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-hr"
-                        string="My Recruitments"
-                        help="My Recruitments"
-                        domain="[('user_id','=',uid)]"/>
                     <filter icon="terp-hr"
                         string="Recruitments non assigned"
                         help="Recruitments non assigned"
@@ -95,24 +91,6 @@
                 </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-hr"
-                    		string="Hired"
-                        name="done"
-                    		domain="[('state','=','done')]"/>
-                    <filter icon="terp-hr"
-                    		string="Refused"
-                    		domain="[('state','=','cancel')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="priority"/>
-                    <field name="stage_id" widget="selection"/>
-                  	<field name="job_id" widget="selection"/>
-                  	<newline/>
-                  	<field name="type_id" widget="selection"/>
-                    <field name="date"/>
-                    <field name="date_closed"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By ..." colspan="10" col="12">
                    <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -127,6 +105,24 @@
             	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <filter icon="terp-hr"
+                    		string="Hired"
+                        name="done"
+                    		domain="[('state','=','done')]"/>
+                    <filter icon="terp-hr"
+                    		string="Refused"
+                    		domain="[('state','=','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="priority"/>
+                    <field name="stage_id" widget="selection"/>
+                  	<field name="job_id" widget="selection"/>
+                  	<newline/>
+                  	<field name="type_id" widget="selection"/>
+                    <field name="date"/>
+                    <field name="date_closed"/>
+                </group>
             </search>
         </field>
     </record>
@@ -136,7 +132,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_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid, 'group_by_no_leaf':1,'group_by':[]}</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" sequence="10"/>