From 5fac1b4d5789b9e70274b69f33b595ae6771d2e3 Mon Sep 17 00:00:00 2001
From: pinky <>
Date: Mon, 18 Dec 2006 21:00:20 +0000
Subject: [PATCH] Modifs

bzr revid: pinky-3bd090b712c55adc78df7c11e466e0add2b755de
---
 addons/hr_timesheet/hr_timesheet_report.xml            | 10 +++++++---
 .../hr_timesheet_invoice_report.xml                    |  6 +++++-
 addons/project/project.py                              |  2 +-
 addons/report_analytic/report_analytic_view.xml        |  8 ++++----
 .../report_analytic_line/report_analytic_line_view.xml |  2 +-
 .../report_analytic_planning_view.xml                  |  4 ++--
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index a9bc00922cc..85051113498 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -16,7 +16,7 @@
 			name="hr.analytical.timesheet"
 			menu="False" />
 		<menuitem
-			name="Human Resources/Hours encoding/Print a user timesheet"
+			name="Human Resources/Reporting/Timesheet/Print a user timesheet"
 			action="wizard_hr_timesheet"
 			type="wizard"
 			id="menu_wizard_hr_timesheet"/>
@@ -27,7 +27,7 @@
 			name="hr.analytical.timesheet.my"
 			menu="False" />
 		<menuitem
-			name="Human Resources/Hours encoding/Print my timesheet"
+			name="Human Resources/Reporting/Timesheet/Print my timesheet"
 			id="menu_wizard_hr_timesheet_my"
 			action="wizard_hr_timesheet_my"
 			type="wizard" />
@@ -45,7 +45,11 @@
 			model="hr.employee"
 			name="hr.analytical.timesheet_users"
 			menu="False"/>
-		<menuitem name="Human Resources/Hours encoding/Print users timesheet" action="wizard_hr_timesheet_users" type="wizard"/>
+		<menuitem
+			name="Human Resources/Reporting/Timesheet/Print summary timesheet"
+			action="wizard_hr_timesheet_users"
+			type="wizard"
+			id="menu_wizard_hr_timesheet_users"/>
 
 	</data>
 </terp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 68b75bbc02d..65b8ef9b969 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -32,7 +32,11 @@
 			model="account.analytic.line"
 			name="account.analytic.profit"
 			menu="False"/>
-		<menuitem id="print_account_analytic_profit" name="Financial Management/Reporting/Invoice rate by user" action="account_analytic_profit" type="wizard"/>
+		<menuitem
+			id="print_account_analytic_profit"
+			name="Human Resources/Reporting/Invoice rate by user"
+			action="account_analytic_profit"
+			type="wizard"/>
 
 	</data>
 </terp>
diff --git a/addons/project/project.py b/addons/project/project.py
index 921ad206b9e..d14aa9e15fa 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -162,7 +162,7 @@ class task(osv.osv):
 		'date_start': fields.datetime('Date Start'),
 		'date_deadline': fields.datetime('Deadline'),
 		'date_close': fields.datetime('Date Closed', readonly=True),
-		'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
+		'project_id': fields.many2one('project.project', 'Project', ondelete='cascade', relate=True),
 		'notes': fields.text('Notes'),
 		'start_sequence': fields.boolean('Wait for previous sequences'),
 		'planned_hours': fields.float('Planned hours'),
diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml
index cb67573b16e..3f30a91607d 100644
--- a/addons/report_analytic/report_analytic_view.xml
+++ b/addons/report_analytic/report_analytic_view.xml
@@ -11,7 +11,7 @@
 		<field name="model">report.analytic.account.close</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Expirated analytic accounts">
+			<form string="Expired analytic accounts">
 				<field name="name" select="1"/>
 				<field name="partner_id" select="1"/>
 				<field name="quantity" select="1"/>
@@ -29,7 +29,7 @@
 		<field name="model">report.analytic.account.close</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Expirated analytic accounts">
+			<tree string="Expired analytic accounts">
 				<field name="name"/>
 				<field name="partner_id"/>
 				<field name="state"/>
@@ -46,7 +46,7 @@
 		<field name="model">report.analytic.account.close</field>
 		<field name="type">graph</field>
 		<field name="arch" type="xml">
-			<graph string="Analytic accounts to close">
+			<graph string="Expired analytic accounts">
 				<field name="partner_id" group="True"/>
 				<field name="quantity" operator="+"/>
 				<field name="quantity_max" operator="+"/>
@@ -61,7 +61,7 @@
 		<field name="view_mode">tree,graph</field>
 		<field name="domain">[('state','=','open')]</field>
 	</record>
-	<menuitem name="Financial Management/Reporting/All Months/Analytic accounts to close"
+	<menuitem name="Financial Management/Reporting/Analytic/All Months/Expired analytic accounts"
 		action="action_analytic_account_tree"
 		id="menu_action_analytic_account_tree"/>
 
diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml
index 9c19f39eaaf..ade7ad8aa9b 100644
--- a/addons/report_analytic_line/report_analytic_line_view.xml
+++ b/addons/report_analytic_line/report_analytic_line_view.xml
@@ -56,7 +56,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,graph</field>
 		</record>
-		<menuitem name="Financial Management/Entries/Analytic lines to invoice" id="account_analytic_lines_to_invoice_report" action="action_account_analytic_line_to_invoice" />
+		<menuitem name="Financial Management/Reporting/Analytic/All Months/Analytic lines to invoice" id="account_analytic_lines_to_invoice_report" action="action_account_analytic_line_to_invoice" />
 
 	</data>
 </terp>
diff --git a/addons/report_analytic_line/report_analytic_planning_view.xml b/addons/report_analytic_line/report_analytic_planning_view.xml
index f431c2d544a..c70c8606663 100644
--- a/addons/report_analytic_line/report_analytic_planning_view.xml
+++ b/addons/report_analytic_line/report_analytic_planning_view.xml
@@ -131,7 +131,7 @@
 			<field name="view_mode">graph,tree</field>
 		</record>
 		<menuitem
-			name="Human Resources/Planning/Planning statistics for all users"
+			name="Human Resources/Reporting/Planning/Planning statistics"
 			id="menu_report_account_analytic_planning_stat"
 			action="action_account_analytic_planning_stat_form" />
 
@@ -143,7 +143,7 @@
 			<field name="view_mode">graph,tree</field>
 		</record>
 		<menuitem
-			name="Human Resources/Planning/My planning statistics"
+			name="Human Resources/Reporting/Planning/My planning statistics"
 			id="menu_report_account_analytic_planning_stat_my"
 			action="action_account_analytic_planning_stat_my_form" />