From 59d21594d6adfcbfc3143d06dd4f38b0ca0603ab Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 9 Aug 2007 12:55:50 +0000
Subject: [PATCH] move timesheet unvalidate to the menu instead of board
 accounting

bzr revid: ced-c20c0c7977eacc90fce6f3e302270382503aaf92
---
 addons/board_account/board_account_view.xml   | 32 -------------------
 .../hr_timesheet_sheet_view.xml               | 28 ++++++++++++++++
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index bda4e4b4c52..94b6eb7f8cc 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -6,22 +6,6 @@
 			<field name="name">Accountants</field>
 		</record>
 
-		<record model="ir.ui.view" id="hr_timesheet_sheet_tree">
-			<field name="name">hr.timesheet.sheet.tree.simplified.board</field>
-			<field name="model">hr_timesheet_sheet.sheet</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Timesheets">
-					<field name="date_from" />
-					<field name="user_id"/>
-					<field name="name" />
-					<field name="total_attendance"/>
-					<field name="total_timesheet"/>
-					<field name="state"/>
-				</tree>
-			</field>
-		</record>
-
 		<record model="ir.actions.act_window" id="action_account_analytic_line_to_invoice">
 			<field name="res_model">report.account.analytic.line.to.invoice</field>
 			<field name="view_type">form</field>
@@ -52,16 +36,6 @@
 			view_mode="tree,form"
 			id="act_my_account"/>
 
-		<record model="ir.actions.act_window" id="act_hr_timesheet_sheet">
-			<field name="name">Timesheets</field>
-			<field name="res_model">hr_timesheet_sheet.sheet</field>
-			<field name="domain">[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
-			<field name="view_type">form</field>
-			<field name="view_id" ref="hr_timesheet_sheet_tree"/>
-		</record>
-
-
-
 		<record model="ir.ui.view" id="board_account_form">
 			<field name="name">board.account.form</field>
 			<field name="model">board.board</field>
@@ -86,12 +60,6 @@
 								height="160"
 								width="510"/>
 
-							<action
-								string="Unvalidated timesheets"
-								name="%(act_hr_timesheet_sheet)s"
-								colspan="4"
-								height="160"/>
-
 							<action
 								string="Draft invoices"
 								name="%(account.action_invoice_tree5)d"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 4423eca0f9f..896e46bf3ce 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -313,5 +313,33 @@
 			src_model="hr_timesheet_sheet.sheet"
 			id="act_hr_timesheet_sheet_sheet_2_hr_attendance"/>
 
+		<record model="ir.ui.view" id="hr_timesheet_sheet_tree_simplified">
+			<field name="name">hr.timesheet.sheet.tree.simplified</field>
+			<field name="model">hr_timesheet_sheet.sheet</field>
+			<field name="type">tree</field>
+			<field name="priority" eval="20"/>
+			<field name="arch" type="xml">
+				<tree string="Timesheets">
+					<field name="date_from" />
+					<field name="user_id"/>
+					<field name="name" />
+					<field name="total_attendance"/>
+					<field name="total_timesheet"/>
+					<field name="state"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="act_hr_timesheet_sheet_unvalidate">
+			<field name="name">Unvalidated Timesheets</field>
+			<field name="res_model">hr_timesheet_sheet.sheet</field>
+			<field name="domain">[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="hr_timesheet_sheet_tree_simplified"/>
+		</record>
+
+		<menuitem name="Human Resources/Timesheets/All Timesheets/Timesheets Unvalidate"
+			id="menu_hr_timesheet_sheet_unvalidate"
+			action="act_hr_timesheet_sheet_unvalidate"/>
 	</data>
 </terp>