From a86f08c2a6c088dca72c2b9654bc0c90297488e3 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 26 Sep 2012 15:50:34 +0530
Subject: [PATCH 1/7] [IMP] hr_holidays: add menu to see allocation requests to
 approve

bzr revid: cha@tinyerp.com-20120926102034-cit2yvaaits6nnfy
---
 addons/hr_holidays/hr_holidays_view.xml | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 347e2b17ca5..3f147bab770 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -353,6 +353,32 @@
 
         <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
 
+        <record model="ir.actions.act_window" id="request_approve_allocation">
+            <field name="name">Allocation Requests Approve</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday_allocation_tree"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <menuitem name="Allocation Req. to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
+
         <record model="ir.actions.act_window" id="open_company_allocation">
             <field name="name">Leaves Summary</field>
             <field name="res_model">hr.holidays</field>

From 77d4347f4ab4bece16d29893dd2aecb58fa65511 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 26 Sep 2012 18:23:25 +0530
Subject: [PATCH 2/7] [IMP] hr_expense: made access_rule to create expense as a
 employee

bzr revid: cha@tinyerp.com-20120926125325-xshc34cau22qnc40
---
 addons/hr_expense/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 0455302319e..3da3cf0e59f 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -9,6 +9,7 @@ access_product_template_hr_expense_user,product.template.hr.expense.user,product
 access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
 access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
 access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,1,1,1
 access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
 access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
 access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1

From 3636c648c16049ae79d58131011690db105f3f51 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 27 Sep 2012 17:19:18 +0530
Subject: [PATCH 3/7] [IMP] hr,hr_recruitment: made changes in form view

bzr revid: cha@tinyerp.com-20120927114918-e7hm58o91idp2unw
---
 addons/hr/hr_view.xml                         | 5 ++++-
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5d4c2ae9d45..fef57af44d9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -360,10 +360,13 @@
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" class="oe_inline"/>
+                        </h1>
+                        <label for="department_id" class="oe_edit_only"/>
+                        <h2>
                             <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
                             <field name="department_id" class="oe_inline"/>
                             <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                        </h1>
+                        </h2>
                         <group>
                             <group>
                                 <field name="no_of_employee" groups="base.group_user"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 08e5f31a2d2..6462c7360ae 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -342,7 +342,7 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="/form/sheet/h1" version="7.0" position="after">
+            <xpath expr="/form/sheet/h2" version="7.0" position="after">
                 <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                     <field name="alias_id" invisible="1" required="0"/>
                     <label for="alias_name" class="oe_edit_only"/>

From b478be2675a4709b17d94cbb7663fc754fc5e31a Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 27 Sep 2012 17:49:48 +0530
Subject: [PATCH 4/7] [IMP] hr_timesheet_sheet, hr_timesheet_invoice : made
 changes for warning message

bzr revid: cha@tinyerp.com-20120927121948-iqrtxdijiknwggh6
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py      | 2 ++
 addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index a1562d53a61..9baaf5b1b7f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -135,6 +135,8 @@ class account_analytic_line(osv.osv):
     def _default_general_account(self, cr, uid, context=None):
         proxy = self.pool.get('hr.employee')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if not len(record_ids):
+            raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
         employee = proxy.browse(cr, uid, record_ids[0], context=context)
         if employee.product_id and employee.product_id.property_account_income:
             return employee.product_id.property_account_income.id
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index fdab774a250..ef145f64ad8 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -35,7 +35,7 @@ class hr_timesheet_current_open(osv.osv_memory):
 
         user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
         if not len(user_ids):
-            raise osv.except_osv(_('Error!'), _('Please define employee for your user!'))
+            raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
         ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
 
         if len(ids) > 1:

From 425d285e2eb9eceb076711bc17875bfa6ea975e6 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 28 Sep 2012 11:14:45 +0530
Subject: [PATCH 5/7] [IMP] hr_timesheet_invoice: made little change in
 condition

bzr revid: cha@tinyerp.com-20120928054445-ayg474ppng31318r
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 9baaf5b1b7f..22f21776c0d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -135,7 +135,7 @@ class account_analytic_line(osv.osv):
     def _default_general_account(self, cr, uid, context=None):
         proxy = self.pool.get('hr.employee')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        if not len(record_ids):
+        if not record_ids:
             raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
         employee = proxy.browse(cr, uid, record_ids[0], context=context)
         if employee.product_id and employee.product_id.property_account_income:

From 5e5c5b198b16baeca0809b23b59d1b2683a911b8 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 1 Oct 2012 14:11:34 +0530
Subject: [PATCH 6/7] [IMP] hr_holidays: set full name for menu

bzr revid: cha@tinyerp.com-20121001084134-pl57w4fmqmxbwydq
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3f147bab770..067036681c2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -377,7 +377,7 @@
             <field name="act_window_id" ref="request_approve_allocation"/>
         </record>
 
-        <menuitem name="Allocation Req. to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
+        <menuitem name="Allocation Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
             <field name="name">Leaves Summary</field>

From 2251497d094d9139bb3bea380a5976f5d2afc8b2 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 1 Oct 2012 18:54:07 +0530
Subject: [PATCH 7/7] [IMP] hr, hr_recruitment: made changes in form view

bzr revid: cha@tinyerp.com-20121001132407-hi87aeal3yk0la8p
---
 addons/hr/hr_view.xml                         | 22 ++++++++++---------
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ec4718e8cd0..37ce39ec4b1 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -336,16 +336,18 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                        </h1>
-                        <label for="department_id" class="oe_edit_only"/>
-                        <h2>
-                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                            <field name="department_id" class="oe_inline"/>
-                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                        </h2>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name" class="oe_inline"/></h1>
+                        </div>
+                        <div name="Department">
+                            <label for="department_id" class="oe_edit_only"/>
+                            <h1>
+                                <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                                <field name="department_id" class="oe_inline"/>
+                                <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
                                 <field name="no_of_employee" groups="base.group_user"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2971e61c351..879334250a0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -343,7 +343,7 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="/form/sheet/h2" version="7.0" position="after">
+            <xpath expr="//div[@name='Department']" version="7.0" position="after">
                 <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                     <field name="alias_id" invisible="1" required="0"/>
                     <label for="alias_name" class="oe_edit_only"/>