From df88a14aa9cc65227c0be513371af75396324422 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 16 Mar 2012 16:14:06 +0530
Subject: [PATCH 01/10] [IMP]state fields are added in aplicant kanban view.

bzr revid: kbh@tinyerp.com-20120316104406-taz2wokz7urbyeyi
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 69a7c104073..c188365b416 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -339,7 +339,9 @@
                                         <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" />
                                     </div>
                                     <div class="oe_kanban_right">
+                                        <a name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                                         <a name="case_open" string="In Progress" states="draft,pending" type="object" icon="kanban-apply"/>
+                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
                                         <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause"/>
                                     </div>
                                     <br class="oe_kanban_clear"/>

From dc7371ad56bfad0823ef6967718889ae935cb074 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 16 Mar 2012 17:07:33 +0530
Subject: [PATCH 02/10] [IMP]states changed.

bzr revid: kbh@tinyerp.com-20120316113733-r8qgjwh27ffjdf87
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c188365b416..15155a318cc 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -339,9 +339,9 @@
                                         <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" />
                                     </div>
                                     <div class="oe_kanban_right">
-                                        <a name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                                        <a name="case_cancel" string="Refuse" states="open" type="object" icon="gtk-cancel"/>
                                         <a name="case_open" string="In Progress" states="draft,pending" type="object" icon="kanban-apply"/>
-                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open" type="action" icon="terp-partner"/>
                                         <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause"/>
                                     </div>
                                     <br class="oe_kanban_clear"/>

From 01bfed053b4a0d204eee9b8ef9b26e7337a54e73 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 16 Mar 2012 17:45:25 +0530
Subject: [PATCH 03/10] [IMP]:hr_recruitment:improved state in Refuse and Hire
 buttons

bzr revid: apa@tinyerp.com-20120316121525-o2rt3i5gd9u5h6z9
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 026a94c2ec9..2515045a7d3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -341,8 +341,8 @@
                                     <div class="oe_kanban_right">
                                         <a name="case_cancel" string="Refuse" states="open,pending" type="object" icon="gtk-cancel"/>
                                         <a name="case_open" string="In Progress" states="draft,pending" type="object" icon="kanban-apply"/>
-                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
                                         <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause"/>
+                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
                                     </div>
                                     <br class="oe_kanban_clear"/>
                                 </div>

From 583c11eba017f208d097712319daa4ccd6aae4ac Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 16 Mar 2012 18:21:23 +0530
Subject: [PATCH 04/10] [FIX]Can Constitute an  Expense ? set as a true when
 creating from hr_expense

bzr revid: sgo@tinyerp.com-20120316125123-28u9weolcszgexms
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 23883b79838..0103e13628d 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -81,7 +81,7 @@
                             <field colspan="4" name="line_ids" nolabel="1" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines">
                                     <group col="6" colspan="4">
-                                        <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)"/>
+                                        <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
                                         <field name="name" colspan="4"/>
                                         <newline/>
                                         <field name="unit_amount"/>

From 0b2d045f91c56751d517bd8fb5dda377ac0b6111 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 16 Mar 2012 18:41:11 +0530
Subject: [PATCH 05/10] [IMP]hr_holidays: improve in hr holidays form view and
 list view as per suggestion and reform warning

bzr revid: sgo@tinyerp.com-20120316131111-agud3dotpourl7uy
---
 addons/hr_holidays/hr_holidays.py       |  2 +-
 addons/hr_holidays/hr_holidays_view.xml | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3bb7a8e4982..b4127d83773 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -341,7 +341,7 @@ class hr_holidays(osv.osv):
                 if record.employee_id and not record.holiday_status_id.limit:
                     leaves_rest = holi_status_obj.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                     if leaves_rest < record.number_of_days_temp:
-                        raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for employee %s: too few remaining days (%s).') % (record.employee_id.name, leaves_rest))
+                        raise osv.except_osv(_('Warning!'),_('There  are no %s allocated  for employee %s, Please create allocation request for this leave type.') % (record.holiday_status_id.name,record.employee_id.name))
         return True
 hr_holidays()
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 22d4d6e567d..e52124bf4c5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,18 +65,18 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_manager"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
+                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
@@ -150,8 +150,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
-                    <field name="holiday_type"/>
                     <field name="employee_id"/>
+                    <field name="holiday_type"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
@@ -231,21 +231,21 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
-                    <field name="holiday_type"/>
                     <field name="employee_id"/>
-                    <field name="category_id"/>
-                    <field name="department_id" invisible="not context.get('set_visible',False)"/>
-                    <field name="holiday_status_id"/>
+                    <field name="holiday_type" groups="base.group_hr_user"/>
                     <field name="name"/>
-                    <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
+                    <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
+                    <field name="state"/>
+                    <field name="category_id" invisible="1"/>
+                    <field name="department_id" invisible="not context.get('set_visible',False)"/>
+                    <field name="holiday_status_id" invisible="1"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
-                    <field name="state"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager" invisible="1"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager" invisible="1"/>
                 </tree>
             </field>
         </record>

From 62c49d4013fac9fb5abd2ab847390b9e05fdffa2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 20 Mar 2012 14:51:20 +0530
Subject: [PATCH 06/10] [IMP]:Move fields First Approval, Second  Approval to 
 Usability / Technical Features group

bzr revid: sgo@tinyerp.com-20120320092120-7mcbqv73xp1r3gqz
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e52124bf4c5..77f261ee37f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -82,8 +82,8 @@
                             <field name="number_of_days_temp"/>
                             <field name="double_validation" invisible="1"/>
                             <newline/>
-                            <field name="manager_id"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                            <field name="manager_id" groups="base.group_no_one"/>
+                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>

From 4272841c90c85a09a0eeaedc1ea4d65ac9990e29 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 12:31:05 +0530
Subject: [PATCH 07/10] [IMP]

bzr revid: apa@tinyerp.com-20120321070105-0jxbqpzf0sx7nmr5
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2515045a7d3..1c11bf7375d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -339,9 +339,9 @@
                                         <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" />
                                     </div>
                                     <div class="oe_kanban_right">
-                                        <a name="case_cancel" string="Refuse" states="open,pending" type="object" icon="gtk-cancel"/>
+                                        <a name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                                         <a name="case_open" string="In Progress" states="draft,pending" type="object" icon="kanban-apply"/>
-                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause"/>
+                                        <a name="case_pending" string="Pending" states="open" type="object" icon="kanban-pause"/>
                                         <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
                                     </div>
                                     <br class="oe_kanban_clear"/>

From ea681106ae41e78061293df450f4c9264384a194 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 21 Mar 2012 13:18:58 +0530
Subject: [PATCH 08/10] [IMP]

bzr revid: apa@tinyerp.com-20120321074858-77qwluqj9b23arga
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1c11bf7375d..73c2c184ba8 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -63,7 +63,7 @@
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
             </tree>
         </field>
     </record>

From d75f80e0e92d2ca7150786909fae4ebd0ce75ec2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 27 Apr 2012 09:29:13 +0200
Subject: [PATCH 09/10] [IMP] hr_holidays: improve English in error message

bzr revid: rco@openerp.com-20120427072913-fzjimxmt54poax6v
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e7d968bf5ed..43d7202547c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -351,7 +351,7 @@ class hr_holidays(osv.osv):
                 if record.employee_id and not record.holiday_status_id.limit:
                     leaves_rest = holi_status_obj.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                     if leaves_rest < record.number_of_days_temp:
-                        raise osv.except_osv(_('Warning!'),_('There  are no %s allocated  for employee %s, Please create allocation request for this leave type.') % (record.holiday_status_id.name,record.employee_id.name))
+                        raise osv.except_osv(_('Warning!'), _('There are not enough %s allocated for employee %s; please create an allocation request for this leave type.') % (record.holiday_status_id.name, record.employee_id.name))
         return True
     
     # -----------------------------

From f80cbc8dd96ace24cbfd068de067e3bacc2e1fee Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 27 Apr 2012 11:31:22 +0200
Subject: [PATCH 10/10] [IMP] hr_holidays: remove invisible tag on approval
 button

bzr revid: rco@openerp.com-20120427093122-6uq0g5x80ss2740p
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index a120206078e..9f8f998cbd9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -248,8 +248,8 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager" invisible="1"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager" invisible="1"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                 </tree>
             </field>
         </record>