diff --git a/addons/crm_hr/crm_hr_view.xml b/addons/crm_hr/crm_hr_view.xml
index f8fba45c2f3..7abcef23866 100644
--- a/addons/crm_hr/crm_hr_view.xml
+++ b/addons/crm_hr/crm_hr_view.xml
@@ -80,11 +80,12 @@
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">
+                    	<separator colspan="4" string="Communications"/>
+                    	<field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
+                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                        <newline/>
                         <field name="partner_mobile"/>
                         <field name="email_from" string="Candidate Email" widget="email"/>
-                        <newline/>
-                        <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
-                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
 						<button string="Convert to Partner"
                               icon="terp-partner" name="%(wizard_crm_job_partner_create)d"
                               type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 270524ef28c..e34c96ec762 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -49,8 +49,8 @@
 	        <field name="type">search</field>
 	        <field name="arch" type="xml">
 	            <search string="Departments">
-	            	<group col='4' colspan='4'>
-	            		<field name="name"/>
+	            	<group col='4' colspan='2'>
+	            		<field name="name" />
 	            		<field name="manager_id" widget="selection"/>
 	            	</group>
 	            </search>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b705193c243..21300fbde38 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -98,10 +98,11 @@
 	        <field name="type">search</field>
 	        <field name="arch" type="xml">
 	            <search string="Employees">
-	            	<group col='5' colspan='4'>
-	            		<filter icon="terp-sale" string="My" domain="[('user_id','=',uid)]"/>
+	            	<group col='6' colspan='2'>
 	            		<field name="name"/>
-	            		<field name="parent_id" widget="selection"/>
+	            		<field name="parent_id" widget="selection">
+                               <filter icon="terp-partner" domain="[('user_id','=',uid)]"  help="My"/>
+                         </field>
 	            	</group>
 	            </search>
 	         </field>
@@ -363,8 +364,6 @@
 	        parent="base.menu_hr"/>
 
         <menuitem name="Job" parent="base.menu_crm_case_job_req_main" id="menu_crm_job" action="action_crm_job" sequence="2"/>
-		<act_window context="{'id': active_id}"
-		domain="[('id', '=', active_id)]"
-		id="act_hr_employee_job" name="Job" res_model="crm.job" src_model="hr.employee"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 56b23316c94..305b516cdfb 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -153,6 +153,11 @@
                             domain="[('user_id','=',uid)]"/>
                       </field>
                       <field name="state" select="1"/>
+                      <field name="department_id" widget="selection">
+                      	<filter icon="terp-crm"
+								domain="[('user_id', '=', uid)]"
+								help="My"/>
+						</field>
                  </group>
                  </search>
             </field>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 7d62ca9f777..72e4e6ba2e6 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -16,14 +16,16 @@
                 <search string="Search Leave">
                        <group col='6' colspan='4'>
                            <filter icon="gtk-execute" string="My Leaves" domain="[('user_id','=',uid)]" separator="1" help="Leaves Related to Current User"/>
-                        <filter icon="gtk-execute" string="My Departments Leaves" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
                           <field name="state" select="1">
                               <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Holidays"/>
                               <filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
                               <filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
                           </field>
                           <field name="name" select='1'/>
-                          <field name="user_id" select="1" widget="selection"/>
+                          <field name="department_id" select="1" widget="selection"/>
+                          <field name="user_id" select="1" widget="selection">
+                          		<filter icon="gtk-execute" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
+                          </field>
                       </group>
                  </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index ba2924f68e8..5ffa95401b6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -199,7 +199,6 @@
                 <search string="Search Timesheet">
                    <group col="10" colspan="4">
 		                <filter icon="terp-partner" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheet"/>
-		                <filter icon="terp-crm" string="My departments timesheets"  domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
 						<separator orientation="vertical"/>
 						<filter icon="terp-crm" string="Unvalidated" domain="[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Unvalidated Timesheets"/>
                        	<separator orientation="vertical"/>
@@ -209,6 +208,11 @@
 						</field>
 						<field name="name" select="1"/>
 						<field name="user_id" select="1" widget="selection"/>
+						<field name="department_id" widget="selection">
+							<filter icon="terp-crm"
+								domain="[('user_id', 'child_of', [uid])]"
+								help="My Departments Timesheet"/>
+						</field>
                    </group>
                </search>
             </field>
diff --git a/addons/resource/hr_demo.xml b/addons/resource/hr_demo.xml
deleted file mode 100755
index fc01109d86c..00000000000
--- a/addons/resource/hr_demo.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Example employee -->
-
-        <record id="timesheet_group1" model="resource.calendar">
-            <field name="name">38 Hours/Week</field>
-        </record>
-
-        <record id="employee1" model="hr.employee">
-            <field name="name">Fabien Pinckaers</field>
-            <!--<field name="regime">45</field>-->
-            <field name="user_id" ref="base.user_root"/>
-            <!--<field name="holiday_max">25</field>-->
-        </record>
-
-        <record model="resource.calendar.week">
-            <field name="name">Monday morning</field>
-            <field name="dayofweek">0</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Monday evening</field>
-            <field name="dayofweek">0</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Tuesday morning</field>
-            <field name="dayofweek">1</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Tuesday evening</field>
-            <field name="dayofweek">1</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Wednesday morning</field>
-            <field name="dayofweek">2</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Wednesday evening</field>
-            <field name="dayofweek">2</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Thursday morning</field>
-            <field name="dayofweek">3</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Thursday evening</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="dayofweek">3</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Friday morning</field>
-            <field name="dayofweek">4</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Friday evening</field>
-            <field name="dayofweek">4</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/resource/hr_department.py b/addons/resource/hr_department.py
deleted file mode 100755
index 907bc55a435..00000000000
--- a/addons/resource/hr_department.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields,osv
-import tools
-
-class hr_department(osv.osv):
-    _name = "hr.department"
-    _columns = {
-        'name': fields.char('Department Name', size=64, required=True),
-        'company_id': fields.many2one('res.company', 'Company', select=True, required=True),
-        'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
-        'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
-        'note': fields.text('Note'),
-        'manager_id': fields.many2one('res.users', 'Manager', required=True),
-        'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
-    }
-    def _get_members(self,cr, uid, context={}):
-        mids = self.search(cr, uid, [('manager_id','=',uid)])
-        result = {uid:1}
-        for m in self.browse(cr, uid, mids, context):
-            for user in m.member_ids:
-                result[user.id] = 1
-        return result.keys()
-    def _check_recursion(self, cr, uid, ids):
-        level = 100
-        while len(ids):
-            cr.execute('select distinct parent_id from hr_department where id in ('+','.join(map(str, ids))+')')
-            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
-            if not level:
-                return False
-            level -= 1
-        return True
-
-    _constraints = [
-        (_check_recursion, 'Error! You can not create recursive departments.', ['parent_id'])
-    ]
-
-hr_department()
-
-
-class ir_action_window(osv.osv):
-    _inherit = 'ir.actions.act_window'
-
-    def read(self, cr, uid, ids, fields=None, context=None,
-            load='_classic_read'):
-        select = ids
-        if isinstance(ids, (int, long)):
-            select = [ids]
-        res = super(ir_action_window, self).read(cr, uid, select, fields=fields,
-                context=context, load=load)
-        for r in res:
-            mystring = 'department_users_get()'
-            if mystring in (r.get('domain', '[]') or ''):
-                r['domain'] = r['domain'].replace(mystring, str(
-                    self.pool.get('hr.department')._get_members(cr, uid)))
-        if isinstance(ids, (int, long)):
-            if res:
-                return res[0]
-            else:
-                return False
-        return res
-
-ir_action_window()
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-    _description = 'res.users'
-
-    def _parent_compute(self, cr, uid, ids, name, args, context={}):
-        result = {}
-        obj_dept = self.pool.get('hr.department')
-        for user_id in ids:
-            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])])
-            parent_ids = []
-            if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'])
-                parent_ids = map(lambda x: x['manager_id'][0], data_dept)
-            result[user_id] = parent_ids
-        return result
-
-    def _parent_search(self, cr, uid, obj, name, args):
-        parent = []
-        for arg in args:
-            if arg[0] == 'parent_id':
-                parent = arg[2]
-        child_ids = self._child_compute(cr, uid, parent,name, args, {})
-        if not child_ids:
-            return [('id', 'in', [0])]
-        return [('id', 'in', child_ids.get(uid,[]))]
-
-    def _child_compute(self, cr, uid, ids, name, args, context={}):
-        obj_dept = self.pool.get('hr.department')
-        obj_user = self.pool.get('res.users')
-        result = {}
-        for manager_id in ids:
-            child_ids = []
-            mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
-            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)])
-            if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
-                childs = map(lambda x: x['member_ids'], data_dept)                
-                childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id','in',childs),('active','=',True)])                
-                if manager_id in childs:
-                    childs.remove(manager_id)
-                
-                child_ids.extend(tools.flatten(childs))
-                set = {}
-                map(set.__setitem__, child_ids, [])
-                child_ids =  set.keys()
-            else:
-               child_ids = []
-            result[manager_id] = child_ids
-        return result
-
-    def _child_search(self, cr, uid, obj, name, args):
-        parent = []
-        for arg in args:
-            if arg[0] == 'child_ids':
-                parent = arg[2]
-        child_ids = self._child_compute(cr, uid, parent,name, args, {})
-        if not child_ids:
-            return [('id', 'in', [0])]
-        return [('id', 'in', child_ids.get(uid,[]))]
-
-    _columns = {
-        'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
-        'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search,method=True, string="Subordinates", type='many2many'),
-    }
-
-
-res_users()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/resource/hr_department_demo.xml b/addons/resource/hr_department_demo.xml
deleted file mode 100755
index c7ea68f1dc3..00000000000
--- a/addons/resource/hr_department_demo.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        
-        <record id="dep_management" model="hr.department">
-            <field name="name">Management</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-        </record>
-        <record id="dep_administration" model="hr.department">
-            <field name="name">Administration</field>
-            <field name="parent_id" ref="dep_management"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-        </record>
-        
-        <record id="dep_technical" model="hr.department">
-            <field name="name">Technical department</field>
-            <field name="parent_id" ref="dep_management"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-        </record>
-        
-        <record id="dep_it" model="hr.department">
-            <field name="name">IT</field>
-            <field name="parent_id" ref="dep_technical"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-        </record>
-        
-        <record id="dep_marketing" model="hr.department">
-            <field name="name">Marketing</field>
-            <field name="parent_id" ref="dep_management"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-        </record>
-        
-        <record id="dep_sales" model="hr.department">
-            <field name="name">Sales</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-            <field name="parent_id" ref="dep_management"/>
-        </record>
-        
-        <record id="dep_sales_europe" model="hr.department">
-            <field name="name">Sales Europe</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-            <field name="parent_id" ref="dep_sales"/>
-        </record>
-        
-        <record id="dep_sales_america" model="hr.department">
-            <field name="name">Sales America</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
-            <field name="parent_id" ref="dep_sales"/>
-        </record>
-        
-        
-        
-        
-    </data>
-</openerp>
diff --git a/addons/resource/hr_department_view.xml b/addons/resource/hr_department_view.xml
deleted file mode 100755
index cf4f8a789de..00000000000
--- a/addons/resource/hr_department_view.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!--
-    ======================
-    department
-    ======================
-    -->
-        <record id="view_department_form" model="ir.ui.view">
-            <field name="name">hr.department.form</field>
-            <field name="model">hr.department</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="department">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                    <field name="parent_id" select="2"/>
-                    <field colspan="4" name="manager_id" select="1"/>
-                    <notebook colspan="4" >
-                        <page string="Members">
-                            <field colspan="4" name="member_ids" nolabel="1"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        <record id="view_department_tree" model="ir.ui.view">
-            <field name="name">hr.department.tree</field>
-            <field name="model">hr.department</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Companies">
-                    <field name="name"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="manager_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="open_module_tree_department_tree" model="ir.actions.act_window">
-            <field name="name">Departments</field>
-            <field name="res_model">hr.department</field>
-            <field name="view_type">tree</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-        </record>
-        <menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
-
-        <record id="open_module_tree_department" model="ir.actions.act_window">
-            <field name="name">Departments</field>
-            <field name="res_model">hr.department</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
-
-        <!-- res.users inherit -->
-        <!--<record model="ir.ui.view" id="view_users_form_inherit">
-            <field name="name">res.users.form</field>
-            <field name="type">form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Departements Informations">
-                        <separator string="Managers" colspan="4"/>
-                        <field name="parent_id" nolabel="1" colspan="4"/>
-                        <separator string="Subordinates" colspan="4"/>
-                        <field name="child_ids" nolabel="1" colspan="4"/>
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
-    --></data>
-</openerp>
diff --git a/addons/resource/hr_view.xml b/addons/resource/hr_view.xml
deleted file mode 100755
index c0fc3c54ffd..00000000000
--- a/addons/resource/hr_view.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
-        <menuitem
-            id="menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="40" />
-        <menuitem
-            id="menu_hr_configuration"
-            name="Configuration"
-            parent="hr.menu_hr_root"
-            sequence="5" groups="group_hr_manager"/>
-
-        <!--
-        ==========
-        Employee
-        ==========
-        -->
-        <record id="view_employee_form" model="ir.ui.view">
-            <field name="name">hr.employee.form</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Employee">
-                    <group colspan="4" col="4">
-                        <field name="name" select="1"/>
-                        <field name="active" select="1"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="user_id"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Personal Information">
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Social IDs"/>
-                                <field name="ssnid"/>
-                                <field name="sinid"/>
-                                <field name="otherid"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Status" colspan="2"/>
-                                <field name="gender"/>
-                                <field name="marital"/>
-                                <field name="country_id"/>
-                                <field name="birthday"/>
-                            </group>
-
-                            <group col="2" colspan="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="address_home_id" colspan="2"/>
-                                <field name="address_id" colspan="2"/>
-                                <field name="work_phone"/>
-                                <field name="work_email" widget="email" />
-                                <field name="work_location"/>
-                            </group>
-
-                            <group col="4" colspan="2">
-                                <separator string="Job Information" colspan="4"/>
-                                <field name="parent_id" select="1" colspan="4"/>
-
-                                <field name="category_id" colspan="4" widget="selection"/>
-                            </group>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" nolabel="1" name="notes"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_employee_tree" model="ir.ui.view">
-            <field name="name">hr.employee.tree</field>
-            <field name="model">hr.employee</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Employees">
-                    <field name="name"/>
-                    <field name="work_phone"/>
-                    <field name="work_email"/>
-                    <field name="address_id"/>
-                    <field name="parent_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="open_view_employee_tree" model="ir.actions.act_window">
-            <field name="name">Employees Structure</field>
-            <field name="res_model">hr.employee</field>
-            <field name="view_type">tree</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_employee_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
-        </record>
-
-        <record id="open_view_employee_list" model="ir.actions.act_window">
-            <field name="name">Employees</field>
-            <field name="res_model">hr.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" eval="False"/>
-        </record>
-        <menuitem
-            id="menu_open_view_employee_list"
-            name="Employees"
-            groups="group_hr_manager"
-            parent="hr.menu_hr_root"/>
-
-        <menuitem
-            action="open_view_employee_tree"
-            id="menu_open_view_employee_tree"
-            parent="menu_open_view_employee_list"/>
-
-       <record id="open_view_employee_list_my" model="ir.actions.act_window">
-            <field name="name">All Employees</field>
-            <field name="res_model">hr.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[]</field>
-        </record>
-        <menuitem
-            action="open_view_employee_list_my"
-            id="menu_open_view_employee_list_my"
-            parent="menu_open_view_employee_list"/>
-
-        <!--
-        =======================
-        Employee architecture
-        =======================
-        -->
-        <record id="view_partner_tree2" model="ir.ui.view">
-            <field name="name">hr.employee.tree</field>
-            <field name="model">hr.employee</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Employees">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="address_id"/>
-
-                </tree>
-            </field>
-        </record>
-        <record id="action2" model="ir.actions.act_window">
-            <field name="name">Employee 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="view_type">tree</field>
-            <field name="view_id" ref="view_partner_tree2"/>
-        </record>
-        <ir_set>
-            <field eval="'action'" name="key"/>
-            <field eval="'client_action_multi'" name="key2"/>
-            <field eval="['hr.employee']" name="models"/>
-            <field name="name">Employees Hierarchy</field>
-            <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
-            <field eval="True" name="isobject"/>
-            <field eval="True" name="replace"/>
-        </ir_set>
-
-
-        <!--
-        ============
-        Working Time
-        ============
-        -->
-        <record id="create_group" model="ir.ui.view">
-            <field name="name">resource.calendar.form</field>
-            <field name="model">resource.calendar</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Working Time Category">
-                    <field name="name" select="1"/>
-                    <field name="manager" select="1"/>
-                    <newline/>
-                    <field colspan="4" name="week_id" nolabel="1" widget="one2many_list"/>
-                </form>
-            </field>
-        </record>
-        <record id="edit_workgroup" model="ir.actions.act_window">
-            <field name="name">Working Time Categories</field>
-            <field name="res_model">resource.calendar</field>
-            <field name="view_type">form</field>
-            <field name="view_id" eval="False"/>
-        </record>
-        <menuitem action="edit_workgroup" id="menu_edit_workgroup" parent="hr.menu_hr_configuration"/>
-
-        <record id="view_timesheet_tree" model="ir.ui.view">
-            <field name="name">resource.calendar.week.tree</field>
-            <field name="model">resource.calendar.week</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Working Time">
-                    <field name="name"/>
-                    <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_timesheet_form" model="ir.ui.view">
-            <field name="name">resource.calendar.week.form</field>
-            <field name="model">resource.calendar.week</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Working Time">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="date_from"/>
-                    <field name="dayofweek" select="1"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
-                </form>
-            </field>
-        </record>
-
-        <!--
-        ============
-        Employee Category
-        ============
-        -->
-
-       <record id="view_employee_category_form" model="ir.ui.view">
-            <field name="name">hr.employee.category.form</field>
-            <field name="model">hr.employee.category</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Employee Category">
-                    <field name="name" select="1"/>
-                    <field name="parent_id" select="1"/>
-                </form>
-            </field>
-        </record>
-        <record id="view_employee_category_list" model="ir.ui.view">
-            <field name="name">hr.employee.category.list</field>
-            <field name="model">hr.employee.category</field>
-            <field name="type">tree</field>
-            <field eval="8" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Employees Categories">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_employee_category_tree" model="ir.ui.view">
-            <field name="name">hr.employee.category.tree</field>
-            <field name="model">hr.employee.category</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Employees Categories">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record id="open_view_categ_form" model="ir.actions.act_window">
-            <field name="name">Categories of Employee</field>
-            <field name="res_model">hr.employee.category</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="hr.menu_hr_configuration"/>
-
-        <record id="open_view_categ_tree" model="ir.actions.act_window">
-            <field name="name">Categories structure</field>
-            <field name="res_model">hr.employee.category</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_employee_category_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
-        </record>
-
-        <record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
-            <field name="name">Employees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('category_id','child_of',[active_id])]</field>
-            <field name="context">{'category_id':active_id}</field>
-        </record>
-
-        <record id="hr_employee_category_open" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'hr.employee.category'" name="model"/>
-            <field name="name">Employees by Categories</field>
-            <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
-        <menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
-
-    </data>
-</openerp>