From 50db1019ddc88dc6d87c186a66fe4774dccd716a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 17 Apr 2008 06:24:58 +0000
Subject: [PATCH] Bugfixes

bzr revid: fp@tinyerp.com-4c0eb49b01507477b903fb1019b3aeadabb42ffe
---
 addons/hr/__terp__.py                             |  2 +-
 addons/hr/hr_security.xml                         | 15 +++++++++------
 .../hr_timesheet_invoice_demo.xml                 |  7 -------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index 7f2777d0d4c..3b31bbb31db 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -22,10 +22,10 @@
 	],
 	"update_xml" : [
 		"hr_view.xml", 
-		"hr_security.xml",
 		"hr_report.xml", 
 		"hr_wizard.xml",
 		"hr_department_view.xml",
+		"hr_security.xml",
 	],
 	"active": False,
 	"installable": True
diff --git a/addons/hr/hr_security.xml b/addons/hr/hr_security.xml
index ecfdc9dd5b0..c79a5c5eee0 100644
--- a/addons/hr/hr_security.xml
+++ b/addons/hr/hr_security.xml
@@ -4,23 +4,26 @@
 
 		<record model="res.groups" id="group_hr_manager">
 			<field name="name">HR Manager</field>
+			<field eval="[(6,0,[ref('hr.menu_open_view_employee_tree'),ref('hr.menu_open_view_employee_list'),ref('hr.menu_open_view_employee_new'),ref('hr.menu_view_employee_category_form')])]" name="menu_access"/>
 		</record>
 
 		<record model="res.groups" id="group_hr_employee">
 			<field name="name">Employee</field>
+			<field eval="[(6,0,[ref('hr.menu_open_view_employee_tree'),ref('hr.menu_open_view_employee_list'),ref('hr.menu_open_view_employee_new'),ref('hr.menu_view_employee_category_form')])]" name="menu_access"/>
 		</record>
 
-		<record model="res.groups" id="base.group_admin">
+		<record model="res.users" id="base.group_admin">
 			<field name="groups_id" eval="[(4, ref('base.group_admin')), (4, ref('group_hr_employee')),(4, ref('group_hr_manager'))]"/>
 		</record>
 
-		<record id="hr.group_hr_employee" model="res.groups">
-			<field eval="[(6,0,[ref('hr.menu_open_view_employee_tree'),ref('hr.menu_open_view_employee_list'),ref('hr.menu_open_view_employee_new'),ref('hr.menu_view_employee_category_form')])]" name="menu_access"/>
+		<!--
+		<record id="hr.group_hr_employee" model="res.users">
 		</record>
 
-		<record id="hr.group_hr_manager" model="res.groups">
-			<field eval="[(6,0,[ref('hr.menu_open_view_employee_tree'),ref('hr.menu_open_view_employee_list'),ref('hr.menu_open_view_employee_new'),ref('hr.menu_view_employee_category_form')])]" name="menu_access"/>
+		<record id="hr.group_hr_manager" model="res.users">
 		</record>
+		-->
+
 		<!-- Department security -->
 		<record model="ir.model.access" id="access_hr_department">
 			<field name="name">HR Department</field>
@@ -241,4 +244,4 @@
 			<field name="perm_unlink" eval="False"/>
 		</record>
 	</data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index c217f1b43cd..f67334a2874 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -32,12 +32,5 @@
 			<field name="to_invoice" ref="timesheet_invoice_factor1" />
 		</record>
 
-		<record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet9">
-			<field name="to_invoice" ref="timesheet_invoice_factor1" />
-		</record>
-
-		<record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet10">
-			<field name="to_invoice" ref="timesheet_invoice_factor1" />
-		</record>
 	</data>
 </terp>