From b71f96fb7f253610c92e0d6de9c73e71f04bd5df Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Thu, 22 Nov 2012 18:36:56 +0530
Subject: [PATCH 1/2] [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 2/2] [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