From 4f72ea02f9147c58d7dd521599d2306ba8aaa909 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:00:53 +0530
Subject: [PATCH] [IMP]change view in hr_timesheet and hr_payroll

bzr revid: sgo@tinyerp.com-20120621083053-ojvyk5t2qm4m42ey
---
 addons/hr_recruitment/hr_recruitment.py       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 20 +++++++++----------
 .../hr_timesheet_sheet_view.xml               | 12 +++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c893755c7c0..48649f8aa96 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -200,7 +200,7 @@ class hr_applicant(base_stage, osv.Model):
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+        'user_id': fields.many2one('res.users', 'HR Manager'),
         # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True, select=True),
         'date_open': fields.datetime('Opened', readonly=True, select=True),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 63263d78c9d..24682f7be37 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -111,25 +111,29 @@
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
+                    <h1><field name="name" string="Subject"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2><field name="partner_name"/></h2>
+                    <h2><field name="partner_name"/>
                     <field name="type_id" placeholder="Degree"/>
+                    apply for<field name="job_id" on_change="onchange_job(job_id)"/>
+                    </h2>
                 </div>
 
                 <group>
                     <group>
                         <field name="user_id"/>
-                        <field name="title_action"/>
-                        <field name="date_action"/>
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action" nolabel="1"/> -
+                            <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
+                        </div>
                     </group>
                     <group>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
                         <field name="priority" string="Appreciation"/>
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" groups="base.group_no_one"/>
+                        <field name="state" nolabel="1" groups="base.group_no_one"/>
                     </group>
                 </group>
                 <notebook>
@@ -140,10 +144,6 @@
                                 <div>
                                     <field name="partner_id" class="oe_inline"
                                         on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button class="oe_inline"
-                                        string="Create" help="Create a new contact for this applicant" icon="gtk-index"
-                                        name="%(action_hr_recruitment_partner_create)d" type="action"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </div>
                                 <field name="email_from" widget="email"/>
                                 <field name="partner_phone"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bfe98177734..1eb0bffd5d3 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -367,7 +367,12 @@
             </field>
         </record>
         
-        <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
+  <!-- Timesheet Button on Employee Form -->
+  <act_window
+           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+           
+      <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
@@ -378,10 +383,5 @@
             </field>
         </record>
 
-  <!-- Timesheet Button on Employee Form -->
-  <act_window
-           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
-
     </data>
 </openerp>