From 80a4baeaa5902679ce84a5a07e7486ac9b006417 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 8 Aug 2007 06:39:54 +0000
Subject: [PATCH] Better menus

bzr revid: fp@tinyerp.com-29155f01ebaad2da252cad6cc2e2b0629e3405e3
---
 addons/hr/hr_view.xml                 |  1 +
 addons/mrp/mrp_view.xml               | 42 +++++++++++++--------------
 addons/mrp/mrp_wizard.xml             |  6 ++--
 addons/report_mrp/report_mrp_view.xml |  4 +--
 addons/report_stock/report_stock.py   |  2 +-
 addons/sale/sale_view.xml             | 18 ++++++------
 addons/stock/stock_sequence.xml       |  2 +-
 addons/stock/stock_view.xml           |  8 ++---
 8 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6cca603b906..f12c6926071 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,6 +2,7 @@
 <terp>
 	<data>
 		<menuitem name="Human Resources" id="menu_hr_root" icon="terp-hr"/>
+		<menuitem name="Human Resources/Reporting" id="menu_hr_reporting" sequence="40"/>
 		<menuitem name="Human Resources/Configuration" groups="admin"/>
 
 		<!--
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ef8c268f088..c08b09d0b3b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,7 +2,7 @@
 <terp>
 <data>
 
-	<menuitem name="Production" icon="terp-mrp" id="menu_mrp_root"/>
+	<menuitem name="Production Management" icon="terp-mrp" id="menu_mrp_root"/>
 
 	<!--
 	Property / Property Group
@@ -26,8 +26,8 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Production/Configuration" groups="admin"/>
-	<menuitem name="Production/Configuration/Properties/Property groups" id="menu_mrp_property_group_action" action="mrp_property_group_action"/>
+	<menuitem name="Production Management/Configuration" groups="admin"/>
+	<menuitem name="Production Management/Configuration/Properties/Property groups" id="menu_mrp_property_group_action" action="mrp_property_group_action"/>
 
 	<record model="ir.ui.view" id="mrp_property_tree_view">
 		<field name="name">mrp.property.tree</field>
@@ -62,7 +62,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Production/Configuration/Properties/Properties" id="menu_mrp_property_action" action="mrp_property_action"/>
+	<menuitem name="Production Management/Configuration/Properties/Properties" id="menu_mrp_property_action" action="mrp_property_action"/>
 
 	<!--
 	Workcenters
@@ -124,7 +124,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="mrp_workcenter_tree_view"/>
 	</record>
-	<menuitem name="Production/Configuration/Workcenters" id="menu_mrp_workcenter_action" action="mrp_workcenter_action"/>
+	<menuitem name="Production Management/Configuration/Workcenters" id="menu_mrp_workcenter_action" action="mrp_workcenter_action"/>
 
 	<!-- 
 	Routings
@@ -197,7 +197,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="mrp_routing_tree_view"/>
 	</record>
-	<menuitem name="Production/Configuration/Routings" id="menu_mrp_routing_action" action="mrp_routing_action"/>
+	<menuitem name="Production Management/Configuration/Routings" id="menu_mrp_routing_action" action="mrp_routing_action"/>
 
 	<!-- 
 	Bill of Materials
@@ -264,7 +264,7 @@
 		<field name="domain">[('bom_id','=',False)]</field>
 		<field name="view_id" ref="mrp_bom_tree_view"/>
 	</record>
-	<menuitem name="Production/Configuration/Bill of Materials" id="menu_mrp_bom_form_action" action="mrp_bom_form_action"/>
+	<menuitem name="Production Management/Configuration/Bill of Materials" id="menu_mrp_bom_form_action" action="mrp_bom_form_action"/>
 
 	<record model="ir.actions.act_window" id="mrp_bom_tree_action">
 		<field name="type">ir.actions.act_window</field>
@@ -273,7 +273,7 @@
 		<field name="domain">[('bom_id','=',False)]</field>
 		<field name="view_id" ref="mrp_bom_tree_view"/>
 	</record>
-	<menuitem name="Production/Configuration/Bill of Materials/BoMs Structure" action="mrp_bom_tree_action" id="menu_bom_tree"/>
+	<menuitem name="Production Management/Configuration/Bill of Materials/BoMs Structure" action="mrp_bom_tree_action" id="menu_bom_tree"/>
 
 	<record model="ir.actions.act_window" id="mrp_bom_form_action2">
 		<field name="type">ir.actions.act_window</field>
@@ -281,7 +281,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="mrp_bom_tree_view"/>
 	</record>
-	<menuitem name="Production/Configuration/Bill of Materials/BoMs Components" id="menu_mrp_bom_form_action2" action="mrp_bom_form_action2"/>
+	<menuitem name="Production Management/Configuration/Bill of Materials/BoMs Components" id="menu_mrp_bom_form_action2" action="mrp_bom_form_action2"/>
 
 
 	<record model="ir.actions.act_window" id="action2">
@@ -329,7 +329,7 @@
 	</record>
 
 	<!-- 
-	Productions
+	Production Management
 	--> 
 
 	<record model="ir.ui.view" id="mrp_production_tree_view">
@@ -406,7 +406,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="mrp_production_form_view"/>
 	</record>
-	<menuitem name="Production/Production orders" id="menu_mrp_production_action" action="mrp_production_action"/>
+	<menuitem name="Production Management/Production orders" id="menu_mrp_production_action" action="mrp_production_action"/>
 	<record model="ir.actions.act_window" id="mrp_production_action2">
 		<field name="name">Production orders to start</field>
 		<field name="type">ir.actions.act_window</field>
@@ -415,7 +415,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','ready')]</field>
 	</record>
-	<menuitem name="Production/Production orders/Production orders to start" action="mrp_production_action2" id="menu_production_orders_start"/>
+	<menuitem name="Production Management/Production orders/Production orders to start" action="mrp_production_action2" id="menu_production_orders_start"/>
 	<record model="ir.actions.act_window" id="mrp_production_action3">
 		<field name="name">Production orders in progress</field>
 		<field name="type">ir.actions.act_window</field>
@@ -424,7 +424,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','in_production')]</field>
 	</record>
-	<menuitem name="Production/Production orders/Production orders in progress" id="menu_mrp_production_action3" action="mrp_production_action3"/>
+	<menuitem name="Production Management/Production orders/Production orders in progress" id="menu_mrp_production_action3" action="mrp_production_action3"/>
 	<record model="ir.actions.act_window" id="mrp_production_action4">
 		<field name="name">Production orders waiting goods</field>
 		<field name="type">ir.actions.act_window</field>
@@ -433,7 +433,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','confirmed')]</field>
 	</record>
-	<menuitem name="Production/Production orders/Production orders waiting goods" action="mrp_production_action4" id="menu_production_orders_waiting4"/>
+	<menuitem name="Production Management/Production orders/Production orders waiting goods" action="mrp_production_action4" id="menu_production_orders_waiting4"/>
 
 	<record model="ir.ui.view" id="mrp_production_workcenter_form_view">
 		<field name="name">mrp.production.workcenter.line.form</field>
@@ -584,7 +584,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="mrp_procurement_form_view"/>
 	</record>
-	<menuitem name="Production/Procurement orders" id="menu_mrp_procurement_action" action="mrp_procurement_action"/>
+	<menuitem name="Production Management/Procurement orders" id="menu_mrp_procurement_action" action="mrp_procurement_action"/>
 
 	<record model="ir.actions.act_window" id="mrp_procurement_action2">
 		<field name="name">Draft procurements</field>
@@ -594,7 +594,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','draft')]</field>
 	</record>
-	<menuitem name="Production/Procurement orders/Draft procurements" id="menu_mrp_procurement_action2" action="mrp_procurement_action2"/>
+	<menuitem name="Production Management/Procurement orders/Draft procurements" id="menu_mrp_procurement_action2" action="mrp_procurement_action2"/>
 	<record model="ir.actions.act_window" id="mrp_procurement_action3">
 		<field name="name">Unschedulled procurements</field>
 		<field name="type">ir.actions.act_window</field>
@@ -603,7 +603,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','confirmed')]</field>
 	</record>
-	<menuitem name="Production/Procurement orders/Unschedulled procurements" id="menu_mrp_procurement_action3" action="mrp_procurement_action3"/>
+	<menuitem name="Production Management/Procurement orders/Unschedulled procurements" id="menu_mrp_procurement_action3" action="mrp_procurement_action3"/>
 	<record model="ir.actions.act_window" id="mrp_procurement_action4">
 		<field name="name">Exceptions procurements to fix</field>
 		<field name="type">ir.actions.act_window</field>
@@ -612,7 +612,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
 	</record>
-	<menuitem name="Production/Procurement orders/All exceptions/Exceptions to fix" id="menu_mrp_procurement_action4" action="mrp_procurement_action4"/>
+	<menuitem name="Production Management/Procurement orders/All exceptions/Exceptions to fix" id="menu_mrp_procurement_action4" action="mrp_procurement_action4"/>
 	<record model="ir.actions.act_window" id="mrp_procurement_action5">
 		<field name="name">Exceptions procurements</field>
 		<field name="type">ir.actions.act_window</field>
@@ -621,7 +621,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','exception')]</field>
 	</record>
-	<menuitem name="Production/Procurement orders/All exceptions" id="menu_mrp_procurement_action5" action="mrp_procurement_action5"/>
+	<menuitem name="Production Management/Procurement orders/All exceptions" id="menu_mrp_procurement_action5" action="mrp_procurement_action5"/>
 
 	=============================
 	Order Point
@@ -670,8 +670,8 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_warehouse_orderpoint_tree"/>
 	</record>
-	<menuitem name="Inventory Control/Ordering policy" sequence="4"/>
-	<menuitem name="Inventory Control/Ordering policy/Minimum quantity rules" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
+	<menuitem name="Inventory Control/Reordering policy" sequence="4"/>
+	<menuitem name="Inventory Control/Reordering policy/Minimum quantity rules" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
 
 	<act_window name="Orderpoints"
 		domain="[('warehouse_id', '=', active_id)]"
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 713c264e525..7e8356401d9 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -6,7 +6,7 @@
 			<field name="wiz_name">mrp.procurement.compute.all</field>
 		</record>
 		<menuitem
-			name="Production/Start all schedulers" 
+			name="Production Management/Start all schedulers" 
 			action="wiz_mrp_proc0" 
 			type="wizard"
 			id="mrp_Sched_all"/>
@@ -15,13 +15,13 @@
 			<field name="name">Compute procurement</field>
 			<field name="wiz_name">mrp.procurement.compute</field>
 		</record>
-		<menuitem name="Production/Start all schedulers/Start procurement scheduling" action="wiz_mrp_proc1" type="wizard" id="menu_wiz_mrp_proc1"/>
+		<menuitem name="Production Management/Start all schedulers/Start procurement scheduling" action="wiz_mrp_proc1" type="wizard" id="menu_wiz_mrp_proc1"/>
 
 		<record model="ir.actions.wizard" id="wiz_mrp_proc2">
 			<field name="name">Compute Orderpoint</field>
 			<field name="wiz_name">mrp.procurement.orderpoint.compute</field>
 		</record>
-		<menuitem name="Production/Start all schedulers/Start order point scheduling" action="wiz_mrp_proc2" type="wizard" id="menu_wiz_mrp_proc2"/>
+		<menuitem name="Production Management/Start all schedulers/Start order point scheduling" action="wiz_mrp_proc2" type="wizard" id="menu_wiz_mrp_proc2"/>
 
 		<wizard 
 			string="Workcenter load" 
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 070ec462fc0..ebec344deb7 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -49,7 +49,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">graph,tree</field>
 	</record>
-	<menuitem name="Production/Reporting/Workcenter loads" action="action_report_workcenter_load_tree" id="menu_report_workcenter_load"/>
+	<menuitem name="Production Management/Reporting/Workcenter loads" action="action_report_workcenter_load_tree" id="menu_report_workcenter_load"/>
 
 =============================
 stock.move compared to internal location src/dest
@@ -97,7 +97,7 @@ stock.move compared to internal location src/dest
 		<field name="view_type">form</field>
 		<field name="view_mode">graph,tree</field>
 	</record>
-	<menuitem name="Production/Reporting/Weekly stock value variation" action="action_report_in_out_picking_tree" id="menu_report_in_out_picking"/>
+	<menuitem name="Production Management/Reporting/Weekly stock value variation" action="action_report_in_out_picking_tree" id="menu_report_in_out_picking"/>
 
 
 
diff --git a/addons/report_stock/report_stock.py b/addons/report_stock/report_stock.py
index caf6f340768..4d4129a115b 100644
--- a/addons/report_stock/report_stock.py
+++ b/addons/report_stock/report_stock.py
@@ -31,7 +31,7 @@ from osv import osv, fields
 
 class report_stock_prodlots(osv.osv):
 	_name = "report.stock.prodlots"
-	_description = "Report stock by production lots"
+	_description = "Stock report by production lots"
 	_auto = False
 	_columns = {
 			'name': fields.float('Quantity', readonly=True),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b812125cb33..41ca1a73486 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -208,24 +208,24 @@
 
 
 	<record model="ir.actions.act_window" id="action_order_tree2">
-		<field name="name">Sales order in shipping exception</field>
+		<field name="name">Sales in shipping exception</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">sale.order</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','shipping_except')]</field>
 	</record>
-	<menuitem name="Sales Management/Sales order/All sales order/Shipping exception" id="menu_action_order_tree2" action="action_order_tree2"/>
+	<menuitem name="Sales Management/Sales order/All sales order/" id="menu_action_order_tree2" action="action_order_tree2"/>
 
 	<record model="ir.actions.act_window" id="action_order_tree3">
-		<field name="name">Sales order waiting Invoice</field>
+		<field name="name">Sales order to be invoiced</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">sale.order</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','manual')]</field>
 	</record>
-	<menuitem name="Sales Management/Sales order/All sales order/Waiting Invoice" id="menu_action_order_tree3" action="action_order_tree3"/>
+	<menuitem name="Sales Management/Sales order/All sales order/" id="menu_action_order_tree3" action="action_order_tree3"/>
 
 	<record model="ir.actions.act_window" id="action_order_tree4">
 		<field name="name">Sales order in progress</field>
@@ -264,19 +264,19 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','invoice_except')]</field>
 	</record>
-	<menuitem name="Sales Management/Sales order/All sales order/Invoice exception" id="menu_action_order_tree6" action="action_order_tree6"/>
+	<menuitem name="Sales Management/Sales order/All sales order/" id="menu_action_order_tree6" action="action_order_tree6"/>
 
 
 
 	<record model="ir.actions.act_window" id="action_order_tree7">
-		<field name="name">My sales order in shipping exception</field>
+		<field name="name">My sales in shipping exception</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">sale.order</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','shipping_except'),('user_id','=',uid)]</field>
 	</record>
-	<menuitem name="Sales Management/Sales order/My sales order/Shipping exception" id="menu_action_order_tree7" action="action_order_tree7"/>
+	<menuitem name="Sales Management/Sales order/My sales order/My sales in shipping exception" id="menu_action_order_tree7" action="action_order_tree7"/>
 
 	<record model="ir.actions.act_window" id="action_order_tree8">
 		<field name="name">My sales order waiting Invoice</field>
@@ -286,7 +286,7 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
 	</record>
-	<menuitem name="Sales Management/Sales order/My sales order/My sales waiting Invoice" id="menu_action_order_tree8" action="action_order_tree8"/>
+	<menuitem name="Sales Management/Sales order/My sales order/My sales to be invoiced" id="menu_action_order_tree8" action="action_order_tree8"/>
 
 	<record model="ir.actions.act_window" id="action_order_tree9">
 		<field name="name">My sales order in progress</field>
@@ -312,7 +312,7 @@
 		<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
 	</record>
 	<menuitem
-		name="Sales Management/Sales order/My sales order/Quotations"
+		name="Sales Management/Sales order/My sales order/"
 		sequence="1"
 		id="menu_action_order_tree10" action="action_order_tree10"/>
 
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 3a057fdeb25..6feee6dc1fe 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -38,7 +38,7 @@
 	Sequences from tracking numbers
 	-->
 	<record model="ir.sequence.type" id="sequence_type_serial">
-		<field name="name">Stock Production Lots</field>
+		<field name="name">Stock production lots</field>
 		<field name="code">stock.lot.serial</field>
 	</record>
 	<record model="ir.sequence.type" id="sequence_type_tracking">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 03eb2810b25..5162cca6d2a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -79,7 +79,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_inventory_tree"/>
 	</record>
-	<menuitem name="Inventory Control/Lot Inventory" id="menu_action_inventory_form" action="action_inventory_form"/>
+	<menuitem name="Inventory Control/Physical inventory" id="menu_action_inventory_form" action="action_inventory_form"/>
 
 	<record model="ir.actions.act_window" id="action_inventory_line_form">
 		<field name="type">ir.actions.act_window</field>
@@ -381,7 +381,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_location_tree2"/>
 	</record>
-	<menuitem name="Inventory Control/Configuration/Stock location" id="menu_action_location_form" action="action_location_form"/>
+	<menuitem name="Inventory Control/Configuration/Locations" id="menu_action_location_form" action="action_location_form"/>
 
 	<record model="ir.ui.view" id="view_location_tree">
 		<field name="name">stock.location.tree</field>
@@ -401,7 +401,7 @@
 		<field name="view_type">tree</field>
 		<field name="view_id" ref="view_location_tree"/>
 	</record>
-	<menuitem name="Inventory Control/Location Tree" id="menu_action_location_tree" action="action_location_tree"/>
+	<menuitem name="Inventory Control/Locations structure" id="menu_action_location_tree" action="action_location_tree"/>
 
 	=============================
 	Warehouse
@@ -441,7 +441,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_warehouse_tree"/>
 	</record>
-	<menuitem name="Inventory Control/Configuration/Warehouse" id="menu_action_warehouse_form" action="action_warehouse_form"/>
+	<menuitem name="Inventory Control/Configuration/Warehouses" id="menu_action_warehouse_form" action="action_warehouse_form"/>
 
 	=============================
 	Packing