Modifs in menus

bzr revid: fp@tinyerp.com-57d53bd5ed06434639b17713f912b572b8398d89

6 files changed, 33 insertions, 12 deletions

diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index 48ddf633f31..b4fe58063d2 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -54,7 +54,6 @@ _transaction_fields = {
 def _trans_rec_get(self, cr, uid, data, context=None):
 	pool = pooler.get_pool(cr.dbname)
 	account_move_line_obj = pool.get('account.move.line')
-
 	credit = debit = 0
 	account_id = False
 	count = 0
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5383f9a26ba..959c0bf35cc 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -4,7 +4,11 @@
 	#
 	# Delivery Carriers
 	# 
-	<menuitem name="Inventory Control/Configuration/Delivery" sequence="4"/>
+	<menuitem
+		parent="stock.menu_stock_configuration"
+		name="Delivery"
+		id="menu_delivery"
+		sequence="4"/>
 
 	<record model="ir.ui.view" id="view_delivery_carrier_tree">
 		<field name="name">delivery.carrier.tree</field>
@@ -31,12 +35,16 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_delivery_carrier_form">
+		<field name="name">Delivery Method</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">delivery.carrier</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Inventory Control/Configuration/Delivery/Delivery Method" id="menu_action_delivery_carrier_form" action="action_delivery_carrier_form"/>
+	<menuitem 
+		parent="menu_delivery"
+		id="menu_action_delivery_carrier_form" 
+		action="action_delivery_carrier_form"/>
 
 	#
 	# Delivery Grids
@@ -80,13 +88,16 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_delivery_grid_form">
+		<field name="name">Delivery Pricelist</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">delivery.grid</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Inventory Control/Configuration/Delivery/Delivery Pricelist" id="menu_action_delivery_grid_form" action="action_delivery_grid_form"/>
-
+	<menuitem
+		parent="menu_delivery"
+		id="menu_action_delivery_grid_form"
+		action="action_delivery_grid_form"/>
 
 	<record model="ir.ui.view" id="view_delivery_grid_line_form">
 		<field name="name">delivery.grid.line.form</field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index bf2355dc610..2fc067ef6d8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -718,13 +718,21 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_orderpoint_form">
+		<field name="name">Minimum Stock Rules</field>
 		<field name="res_model">stock.warehouse.orderpoint</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_warehouse_orderpoint_tree"/>
 	</record>
-	<menuitem name="Inventory Control/Reordering Policy" sequence="4"/>
-	<menuitem name="Inventory Control/Reordering Policy/Minimum Stock Rules" id="menu_action_orderpoint_form" action="action_orderpoint_form"/>
+	<menuitem
+		name="Reordering Policy"
+		parent="stock.menu_stock_root"
+		id="menu_mrp_reordering"
+		sequence="4"/>
+	<menuitem 
+		parent="menu_mrp_reordering" 
+		id="menu_action_orderpoint_form" 
+		action="action_orderpoint_form"/>
 
 	<act_window name="Minimum Stock Rules"
 		domain="[('warehouse_id', '=', active_id)]"
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 563770e7af0..dc3e38d01af 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -95,7 +95,7 @@
 			<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 		</record>
 
-		<menuitem name="Inventory Control/Reporting/This Month/Intrastat" action="action_report_intrastat_tree" id="menu_report_intrastat"/>
+		<menuitem name="Stock Management/Reporting/This Month/Intrastat" action="action_report_intrastat_tree" id="menu_report_intrastat"/>
 
 		<record model="ir.actions.act_window" id="action_report_intrastat_tree_all">
 			<field name="type">ir.actions.act_window</field>
@@ -104,6 +104,6 @@
 			<field name="view_mode">tree</field>
 		</record>
 
-		<menuitem name="Inventory Control/Reporting/All Months/Intrastat" action="action_report_intrastat_tree_all" id="menu_report_intrastat_all"/>
+		<menuitem name="Stock Management/Reporting/All Months/Intrastat" action="action_report_intrastat_tree_all" id="menu_report_intrastat_all"/>
 	</data>
 </terp>
diff --git a/addons/report_stock/report_stock_view.xml b/addons/report_stock/report_stock_view.xml
index 44e1f60625a..92a3087af33 100644
--- a/addons/report_stock/report_stock_view.xml
+++ b/addons/report_stock/report_stock_view.xml
@@ -24,7 +24,7 @@
 			<field name="view_mode">form,tree</field>
 		</record>
 
-		<menuitem name="Inventory Control/Reporting/Traceability/Stock by Production Lots" action="action_report_stock_prodlots_form" id="menu_report_stock_prodlots"/>
+		<menuitem name="Stock Management/Reporting/Traceability/Stock by Production Lots" action="action_report_stock_prodlots_form" id="menu_report_stock_prodlots"/>
 
 		<act_window name="Stock by production lots"
 			domain="[('location_id', '=', active_id)]"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a4ae5d5ef3b..5437df85139 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1235,13 +1235,16 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_incoterms_tree">
+		<field name="name">Incoterms</field>
 		<field name="res_model">stock.incoterms</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Inventory Control/Configuration/Incoterms" id="menu_action_incoterms_tree" action="action_incoterms_tree"/>
-
+	<menuitem
+		parent="menu_stock_configuration"
+		id="menu_action_incoterms_tree"
+		action="action_incoterms_tree"/>
 
 	<act_window
 		domain="[('type','&lt;&gt;','service')]"