From 3be6d4ef096daefff55d1143b0f0f58fb84aef5a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 29 May 2012 18:17:48 +0530
Subject: [PATCH 1/8] [IMP]hr: Improve employee view kanban and leaves
 management

bzr revid: mma@tinyerp.com-20120529124748-l4nqh230k9zat6yq
---
 addons/hr/hr.py                         |  1 +
 addons/hr/hr_view.xml                   | 34 +++++++++++++++++++++----
 addons/hr_holidays/hr_holidays.py       |  1 -
 addons/hr_holidays/hr_holidays_view.xml | 12 +++------
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9d1ba1c9f05..32c291044c0 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -209,6 +209,7 @@ class hr_employee(osv.osv):
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
+        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 32eb3a84c83..7a3b294d5be 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -41,8 +41,6 @@
                         <page string="Personal Information">
                             <group col="2" colspan="2" groups="base.group_hr_user">
                                 <separator colspan="2" string="Social IDs"/>
-                                <field name="ssnid"/>
-                                <field name="sinid"/>
                                 <field name="identification_id"/>
                                 <field name="passport_id"/>
                                 <field name="otherid"/>
@@ -65,12 +63,12 @@
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Job Information" colspan="2"/>
-                                <field name="job_id" domain="[('state','!=','old')]"/>
+                                <field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref':'hr.view_hr_job_employee_form'}"/>
                                 <field name="coach_id" />
                             </group>
                         </page>
                         <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids" nolabel="1"/>
+                            <field name="category_ids" colspan="4" nolabel="1" widget="many2many_tags"/>
                         </page>
                         <page string="Notes" groups="base.group_hr_user">
                             <field colspan="4" nolabel="1" name="notes"/>
@@ -130,6 +128,7 @@
         <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban>
+                <field name="last_login"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -139,6 +138,11 @@
                             <div class="oe_employee_details">
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
+                                    <li t-if="record.last_login.raw_value">
+                                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                              <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
+                                        </span>
+                                    </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                     <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
@@ -424,7 +428,27 @@
                 </search>
              </field>
          </record>
-
+        
+        <record id="view_hr_job_employee_form" model="ir.ui.view">
+            <field name="name">hr.job.employee.form</field>
+            <field name="model">hr.job</field>
+            <field name="type">form</field>
+           <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Job">
+                    <field name="name" />
+                    <field name="department_id" />
+                    <newline/>
+                    <notebook colspan="4">
+                        <page string="Description">
+                            <separator colspan="4" string="Job Description"/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 4e68cdfb2f9..d44bf71ef91 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -513,7 +513,6 @@ class hr_employee(osv.osv):
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
         'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),        
-        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
     }
 
 hr_employee()
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 32cdcb53011..35f0d0fa37c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -303,7 +303,7 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+        <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
             <field name="name">Requests Approve</field>
@@ -512,8 +512,8 @@
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
                     <field name="remaining_leaves"/>
-                    <field name="current_leave_id"/>
-                    <field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
+                    <field name="current_leave_id" invisible="1"/>
+                    <field name="current_leave_state" invisible="1"/>
                 </field>
             </field>
         </record>
@@ -525,20 +525,16 @@
             <field name="arch" type="xml">
                 <xpath expr="//templates" position="before">
                     <field name="current_leave_state"/>
-                    <field name="last_login"/>
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
                 <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
-                    <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
+                    <li t-if="record.current_leave_id.raw_value">
                         <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
                             <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
                                 <field name="current_leave_id"/>
                             </span>
                         </span>
-                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
-                            <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
-                        </span>
                     </li>
                 </xpath>
             </field>

From b68e86b89c3f1c8f2b1156da64475e3599a7546d Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 30 May 2012 17:59:12 +0530
Subject: [PATCH 2/8] [IMP] hr_holidays: small improvemnt in kanban or employee

bzr revid: psi@tinyerp.com-20120530122912-vqzv3q39yvdxj7qm
---
 addons/hr_holidays/hr_holidays_view.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b3fa870def0..faf6ec54511 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -528,14 +528,12 @@
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
-                    <li t-if="record.current_leave_id.raw_value">
-                        <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
-                                <field name="current_leave_id"/>
-                            </span>
+                <xpath expr="//div[@class='oe_employee_details']/ul/li/span" position="before">
+                    <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
+                        <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
+                            <field name="current_leave_id"/>
                         </span>
-                    </li>
+                    </span>
                 </xpath>
             </field>
         </record>

From 2bf24f9a0ae423d0cdb09effe6a2dc04ef23834b Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 30 May 2012 18:03:43 +0530
Subject: [PATCH 3/8] [IMP] hr: misc

bzr revid: psi@tinyerp.com-20120530123343-i3qe7u1a80xxfdmc
---
 addons/hr/hr_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7a3b294d5be..af3a64ad211 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -426,14 +426,14 @@
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
-             </field>
-         </record>
+            </field>
+        </record>
         
         <record id="view_hr_job_employee_form" model="ir.ui.view">
             <field name="name">hr.job.employee.form</field>
             <field name="model">hr.job</field>
             <field name="type">form</field>
-           <field name="priority">20</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Job">
                     <field name="name" />

From 762b602ecebb80519c9af67239d15f91d7fff31f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 14:25:58 +0200
Subject: [PATCH 4/8] [IMP] hr: improve employee form

bzr revid: rco@openerp.com-20120612122558-bzaqf1dd5z14975k
---
 addons/hr/hr_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index cf6ef3226e3..a69ab432d35 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -31,16 +31,17 @@
                     <div class="oe_form_title">
                         <label for="name" class="oe_form_readonly_hidden"/>
                         <h1><field name="name"/></h1>
+
+                        <label for="company_id" class="oe_form_readonly_hidden" groups="base.group_multi_company"/>
+                        <h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
+
                         <label for="department_id" class="oe_form_readonly_hidden"/>
-                        <h2>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>,
-                            <field name="department_id" on_change="onchange_department_id(department_id)" />
-                        </h2>
+                        <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
                     </div>
                     <notebook>
                         <page string="Personal Information">
                             <group>
-                                <group>
+                                <group string="General">
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                     <field name="active"/>
                                     <field name="parent_id" />
@@ -71,7 +72,7 @@
                             </group>
                         </page>
                         <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids" colspan="4" nolabel="1" widget="many2many_tags"/>
+                            <field name="category_ids" widget="many2many_tags"/>
                         </page>
                         <page string="Notes" groups="base.group_hr_user">
                             <field name="notes"/>

From 4746506598cb29475e346dc267bb5e2ea68796eb Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 15:34:52 +0200
Subject: [PATCH 5/8] [FIX] hr: improve the simplified form view of hr.job, and
 use it in the employee form

bzr revid: rco@openerp.com-20120612133452-23s6ta98tybd2371
---
 addons/hr/hr_view.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a69ab432d35..5775e672021 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -66,7 +66,8 @@
                                     <field name="work_location"/>
                                 </group>
                                 <group string="Job Information">
-                                    <field name="job_id" domain="[('state','!=','old')]"/>
+                                    <field name="job_id" domain="[('state','!=','old')]"
+                                        context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                     <field name="coach_id" />
                                 </group>
                             </group>
@@ -435,16 +436,13 @@
             <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <form string="Job">
-                    <field name="name" />
-                    <field name="department_id" />
-                    <newline/>
-                    <notebook colspan="4">
-                        <page string="Description">
-                            <separator colspan="4" string="Job Description"/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                <form string="Job" version="7.0">
+                    <group col="4">
+                        <field name="name" />
+                        <field name="department_id" />
+                    </group>
+                    <label for="description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>

From f9b3e87ddf7f307e167f7d78a24250a639511784 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 16:10:26 +0200
Subject: [PATCH 6/8] [FIX] hr_holiday: fix current leave element in kanban
 view of employee

bzr revid: rco@openerp.com-20120612141026-ygrcbfy6yfy19iw9
---
 addons/hr/hr_view.xml                   |  2 +-
 addons/hr_holidays/hr_holidays_view.xml | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5775e672021..ca25007968c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -145,7 +145,7 @@
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
                                     <li t-if="record.last_login.raw_value">
-                                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                        <span t-if="record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
                                               <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
                                         </span>
                                     </li>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e9d4274a2df..76b9ac992ab 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -505,16 +505,19 @@
             <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
             <field name="arch" type="xml">
                 <xpath expr="//templates" position="before">
+                    <field name="current_leave_id"/>
                     <field name="current_leave_state"/>
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li/span" position="before">
-                    <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                        <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
+                <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
+                    <li t-if="record.current_leave_id.raw_value">
+                        <span style="font-size: 100%%"
+                                t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_button oe_kanban_color_3':'oe_kanban_button oe_kanban_color_2'"
+                                t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')">
                             <field name="current_leave_id"/>
                         </span>
-                    </span>
+                    </li>
                 </xpath>
             </field>
         </record>

From 357db69ff878ff706005c0cef1b62a62f94a253c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 16:17:36 +0200
Subject: [PATCH 7/8] [IMP] hr_holiday: remove hidden fields from form view

bzr revid: rco@openerp.com-20120612141736-wh9bjxjzs2ep6obr
---
 addons/hr_holidays/hr_holidays_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 76b9ac992ab..3cb0d90bf5e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -493,8 +493,6 @@
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
                     <field name="remaining_leaves"/>
-                    <field name="current_leave_id" invisible="1"/>
-                    <field name="current_leave_state" invisible="1"/>
                 </field>
             </field>
         </record>

From 15e2795879915cd5c9a0b01d86f0739bd449f1ee Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 16:28:08 +0200
Subject: [PATCH 8/8] [IMP] hr, hr_holiday: put last_login and leave_type
 together in employee kanban

bzr revid: rco@openerp.com-20120612142808-bkm8hbgnw44cwh15
---
 addons/hr/hr_view.xml                   |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ca25007968c..8117ec92965 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -144,8 +144,8 @@
                             <div class="oe_employee_details">
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
-                                    <li t-if="record.last_login.raw_value">
-                                        <span t-if="record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                    <li id="last_login">
+                                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
                                               <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
                                         </span>
                                     </li>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3cb0d90bf5e..62223922163 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -508,14 +508,12 @@
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
-                    <li t-if="record.current_leave_id.raw_value">
-                        <span style="font-size: 100%%"
-                                t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_button oe_kanban_color_3':'oe_kanban_button oe_kanban_color_2'"
-                                t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')">
-                            <field name="current_leave_id"/>
-                        </span>
-                    </li>
+                <xpath expr="//div[@class='oe_employee_details']/ul/li[@id='last_login']" position="inside">
+                    <span t-if="record.current_leave_id.raw_value" style="font-size: 100%%"
+                            t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_button oe_kanban_color_3':'oe_kanban_button oe_kanban_color_2'"
+                            t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')">
+                        <field name="current_leave_id"/>
+                    </span>
                 </xpath>
             </field>
         </record>