From 7a8a15ddceb9192bec901929cb8ef9abc7abdd22 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 20 Nov 2012 16:50:09 +0530
Subject: [PATCH 01/12] [IMP]add function for open timesheets from employee
 form view

bzr revid: sgo@tinyerp.com-20121120112009-3a5k48dr1otlgs1v
---
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 27 ++++++++++++++++++-
 .../hr_timesheet_sheet_view.xml               | 10 +------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index bf6790c6be3..af2f5f07179 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -220,9 +220,34 @@ class hr_timesheet_sheet(osv.osv):
         if employee_id:
             department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
         return {'value': {'department_id': department_id}}
-
+    
 hr_timesheet_sheet()
 
+class hr_employee(osv.osv):
+    _inherit = "hr.employee"
+    
+    def open_timesheet(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        employee = self.browse(cr, uid, ids[0], context)
+        view_context = {
+            'search_default_employee_id' : [employee.id],
+            'default_employee_id' : employee.id,
+            'default_user_id': employee.user_id.id,
+        }
+        value = {
+            'name': _('Timesheets'),
+            'context': view_context,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'hr_timesheet_sheet.sheet',
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+        return value
+    
+hr_employee()
+
 class account_analytic_line(osv.osv):
     _inherit = "account.analytic.line"
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6de6be6c08d..06779e73472 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -351,21 +351,13 @@
 
   <!-- Timesheet Button on Employee Form -->
            
-    <record id="act_hr_employee_2_hr_timesheet" model="ir.actions.act_window">
-        <field name="res_model">hr_timesheet_sheet.sheet</field>
-        <field name="view_type">form</field>
-        <field name="name">Timesheets</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
-    </record>
-         
       <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_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action" groups="base.group_hr_manager"/>
+                    <button name="open_timesheet" string="Timesheets" type="object" groups="base.group_hr_manager"/>
                 </xpath>
             </field>
         </record>

From 06a9cf6e1c69c2438190b8ba1e010d4c03fa0f32 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 20 Nov 2012 17:03:08 +0530
Subject: [PATCH 02/12] [IMP]remove unnecessary tooltip

bzr revid: sgo@tinyerp.com-20121120113308-i3ibj30m17ginea4
---
 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 92b1d57ce15..7612552facb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -143,7 +143,7 @@ class hr_holidays(osv.osv):
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
-        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),

From 2091dae491228361868e55bb694e7436c040233e Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 20 Nov 2012 18:11:56 +0530
Subject: [PATCH 03/12] [IMP]remove print survey button

bzr revid: sgo@tinyerp.com-20121120124156-sii5zvwbue0vlfvo
---
 addons/hr_evaluation/hr_evaluation_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e0978847acb..de0a9714763 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -305,11 +305,9 @@
                                             'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
-                            <group col="3" colspan="1">
+                            <group>
                                 <field name="survey_id"/>
-                                <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
                                 <field name="user_to_review_id"/>
-                                <label string=""/>
                                 <field name="user_id" string="Interviewer"/>
                             </group>
                             <group>

From 277fbe16ae87b0df8c72d3691b572ae57c1f2d1a Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 21 Nov 2012 10:01:26 +0530
Subject: [PATCH 04/12] [FIX]: Fix issue in sale module

bzr revid: aja@tinyerp.com-20121121043126-0ej6ij6f0dr7ysn8
---
 .../account_analytic_analysis_view.xml                     | 7 +++----
 .../analytic_contract_hr_expense_view.xml                  | 1 +
 .../wizard/hr_timesheet_invoice_create.py                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index fd32edba0a1..a2431b7ccc9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -60,14 +60,13 @@
                                     or view
                                 </span>
 
-                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                <span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
                                     No order to invoice, create
-                                </span>
-                                <button name="%(action_sales_order)d" string="Sale Orders"
+                                <button name="%(action_sales_order)d" string="Sale Orders" 
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
-                                    />
+                                    /></span>
                             </td>
                         </tr><tr>
                             <td class="oe_timesheet_grey">
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 5628846a6a0..585aaa118bf 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -36,6 +36,7 @@
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
+                                context="{'active_id': active_id}"
                                 string="expenses" type="object"/>
                         </td>
                     </tr>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 695d589ee2e..5c75e27253a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -71,7 +71,7 @@ class account_analytic_line(osv.osv):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
                 raise osv.except_osv(_('Analytic Account incomplete !'),
-                        _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
+                        _('Contract form incomplete. Please fill in the Customer and Pricelist fields the contract form'))
 
 
 

From 1ba8ba7ba861fc36d2a1c1f9f100de10182a900f Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 21 Nov 2012 10:27:42 +0530
Subject: [PATCH 05/12] [IMP]: Replace empty messages exclamation mark

bzr revid: aja@tinyerp.com-20121121045742-pshwk91y27vw29ws
---
 addons/mail/mail_thread_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 3a37218c813..d833b991ac1 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -67,7 +67,7 @@
                 'read_action': 'read', }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    <b>No todo!</b>
+                    <b>No todo.</b>
                 </p><p>
                     When you process messages in your inbox, you can mark some
                     as <i>todo</i>. From this menu, you can process all your todo.

From 5165d8b240ac799454c155a66262933ad1a86c88 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 21 Nov 2012 10:45:55 +0530
Subject: [PATCH 06/12] [IMP]: Put the menu Journal Voucher in
 base.group_no_one

bzr revid: aja@tinyerp.com-20121121051555-qb9hfomrnsvp21bv
---
 addons/account_voucher/account_voucher_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 2cb393f4008..853b85d8a26 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -173,7 +173,7 @@
             <field name="view_id" ref="view_voucher_form"/>
             <field name="act_window_id" ref="action_voucher_list"/>
         </record>
-        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
+        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6" groups="base.group_no_one"/>
 
         <act_window
             id="act_journal_voucher_open"

From a9d217fc7967dbe064dd7348d87b536610e05eaf Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 21 Nov 2012 11:55:56 +0530
Subject: [PATCH 07/12] [IMP]in contract opne expense set default analytic
 account in lines and open correct view for expense link

bzr revid: sgo@tinyerp.com-20121121062556-znkdc82emi892uu0
---
 .../analytic_contract_hr_expense.py                   | 11 ++++++++++-
 addons/hr_expense/hr_expense_view.xml                 |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 8f24f12808b..d7ce51394fc 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -131,12 +131,21 @@ class account_analytic_account(osv.osv):
         domain = [('line_ids', 'in', line_ids)]
         names = [record.name for record in self.browse(cr, uid, ids, context=context)]
         name = _('Expenses of %s') % ','.join(names)
+        view_context = {
+                        'analytic_account_id' : ids[0]
+                        } 
+        form_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_expense', 'view_expenses_form')
+        tree_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_expense', 'view_expenses_tree')
+        
         return {
             'type': 'ir.actions.act_window',
             'name': name,
-            'view_type': 'form',
+            'context' : view_context,
             'view_mode': 'tree,form',
             'domain' : domain,
+            'views': [(tree_view and tree_view[1] or False, 'tree'),
+                      (form_view and form_view[1] or False, 'form'),
+                          (False, 'calendar'), (False, 'graph')],
             'res_model': 'hr.expense.expense',
             'nodestroy': True,
         }
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index d4b7cbae1ce..f432e1b3775 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -85,7 +85,7 @@
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="line_ids" context="{'currency_id': currency_id}">
+                            <field name="line_ids" context="{'currency_id': currency_id,'default_analytic_account': context.get('analytic_account_id')}">
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>

From 0e438f26714ca140dd038222299f5df220f0cc3a Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 21 Nov 2012 12:43:04 +0530
Subject: [PATCH 08/12] [IMP]:Improve code in lunch module

bzr revid: aja@tinyerp.com-20121121071304-i1ce7134f6jlximn
---
 addons/lunch/lunch.py       | 7 ++++---
 addons/lunch/lunch_view.xml | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 0d224ef3a8e..49e23129c83 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -174,9 +174,10 @@ class lunch_order(osv.Model):
             if len(pref_ids)==0:
                 #create Elements
                 xml_no_pref_1 = etree.Element("div")
-                xml_no_pref_1.set('class','oe_inline oe_lunch_intro')
-                xml_no_pref_2 = etree.Element("h3")
-                xml_no_pref_2.text = _("This is the first time you order a meal")
+                xml_no_pref_1.set('class','oe_view_nocontent')
+                xml_no_pref_2 = etree.Element("p")
+                xml_no_pref_2.set('class','oe_view_nocontent_create')
+                xml_no_pref_2.text = _("Click to record your lunch order.")
                 xml_no_pref_3 = etree.Element("p")
                 xml_no_pref_3.set('class','oe_grey')
                 xml_no_pref_3.text = _("Select a product and put your order comments on the note.")
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index ea9356bddc5..81e5cb787fc 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -327,8 +327,6 @@
                             </group>
                         </group>
                         <field name='alerts' attrs="{'invisible': ['|',('state','!=','new'),('alerts','=','')]}" class="oe_inline oe_lunch_alert"/> 
-                        <div name="preferences">
-                        </div>
                         <separator string='Select your order'/>
                         <field name='order_line_ids' nolabel='1' on_change='onchange_price(order_line_ids)'>
                             <tree string='List' editable='bottom'>
@@ -342,6 +340,8 @@
                         <group class='oe_subtotal_footer oe_right'>
                             <field name='total'/> 
                         </group>
+                        <div name="preferences">
+                        </div>
                         <br/><br/>
                     </sheet>
                 </form>
@@ -389,7 +389,7 @@
             <field name="name">cashmove tree</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
-                <tree string="cashmove tree">
+                <tree string="cashmove tree" create="false">
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="description"/>

From 049b2310170b2531a06ebbb020da78481e75dfed Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 21 Nov 2012 12:50:14 +0530
Subject: [PATCH 09/12] [REM]: Remove unwanted code

bzr revid: aja@tinyerp.com-20121121072014-yt1otcr3xn5gakfy
---
 addons/lunch/lunch.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 49e23129c83..a69098e10e7 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -180,19 +180,15 @@ class lunch_order(osv.Model):
                 xml_no_pref_2.text = _("Click to record your lunch order.")
                 xml_no_pref_3 = etree.Element("p")
                 xml_no_pref_3.set('class','oe_grey')
-                xml_no_pref_3.text = _("Select a product and put your order comments on the note.")
+                xml_no_pref_3.text = _("Your favorite meals will be created based on your last orders.")
                 xml_no_pref_4 = etree.Element("p")
                 xml_no_pref_4.set('class','oe_grey')
-                xml_no_pref_4.text = _("Your favorite meals will be created based on your last orders.")
-                xml_no_pref_5 = etree.Element("p")
-                xml_no_pref_5.set('class','oe_grey')
-                xml_no_pref_5.text = _("Don't forget the alerts displayed in the reddish area")
+                xml_no_pref_4.text = _("Don't forget the alerts displayed in the reddish area")
                 #structure Elements
                 xml_start.append(xml_no_pref_1)
                 xml_no_pref_1.append(xml_no_pref_2)
                 xml_no_pref_1.append(xml_no_pref_3)
                 xml_no_pref_1.append(xml_no_pref_4)
-                xml_no_pref_1.append(xml_no_pref_5)
             #Else: the user already have preferences so we display them
             else:
                 preferences = line_ref.browse(cr, uid, pref_ids, context=context)

From c17e3edb958532f88eb0075274b61605c4fc3775 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 21 Nov 2012 14:31:36 +0530
Subject: [PATCH 10/12] [FIX] in Project => Issues => Worklogs tab: analytic
 account field should not appear if 'Analytic Accounting' isn't checked

bzr revid: jam@tinyerp.com-20121121090136-zl9936xlwecai0nu
---
 addons/project_issue_sheet/project_issue_sheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 4fc12ab0747..fb245a0510a 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -23,7 +23,7 @@
                             <tree editable="top" string="Timesheets">
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)" groups="analytic.group_analytic_accounting"/>
                                 <field name="date"/>
                                 <field name="user_id"/>
                                 <field invisible="1" name="journal_id"/>

From b71f96fb7f253610c92e0d6de9c73e71f04bd5df Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Thu, 22 Nov 2012 18:36:56 +0530
Subject: [PATCH 11/12] [FIX] stop multiple rpc call of default_get on loading

bzr revid: rgaopenerp-20121122130656-up43bbo5jfzd00t4
---
 addons/hr_timesheet_sheet/static/src/js/timesheet.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index efff48d93b8..b5ba7f74101 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -14,6 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
                 date_to: false,
                 date_from: false,
             });
+            this.updating = true;
             this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
             this.field_manager.on("field_changed:date_from", this, function() {
                 this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});

From 065cc008d4654fd79dc22f9bcb31eff89937b855 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Fri, 23 Nov 2012 14:34:53 +0530
Subject: [PATCH 12/12] [IMP] In Subordinate Hierarchy: there should be some
 indentation to differentiate parents and children

bzr revid: hip@tinyerp.com-20121123090453-xax82qi402qdlyga
---
 addons/hr/hr_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4464dce30ed..285a508b198 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -228,6 +228,7 @@
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="coach_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -236,7 +237,7 @@
             <field name="name">Subordinate Hierarchy</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.employee</field>
-            <field name="domain">[('id','in',active_ids)]</field>
+            <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_partner_tree2"/>
         </record>
@@ -443,4 +444,4 @@
         <menuitem parent="hr.menu_hr_configuration" id="menu_hr_job" action="action_hr_job" sequence="6"/>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file