From 6c58d4d4f29e2a4b3257d80335ae5e9af5971272 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 28 Jun 2007 10:41:33 +0000
Subject: [PATCH] TOOLS: improve menu

bzr revid: ced-84a6df5403da7603bf2c229788d762a22b8071cb
---
 addons/letter/letter_view.xml             |  1 +
 addons/network/network_view.xml           | 16 ++++++++--------
 addons/project/project.py                 |  4 +---
 addons/subscription/subscription_view.xml |  3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/letter/letter_view.xml b/addons/letter/letter_view.xml
index 1f2dccfbd73..1b7ce59e404 100644
--- a/addons/letter/letter_view.xml
+++ b/addons/letter/letter_view.xml
@@ -2,6 +2,7 @@
 <terp>
 <data>
 
+	<menuitem name="Tools" id="menu_tools" type="STOCK_PREFERENCES"/>
 	<record model="ir.ui.view" id="letter_letter_type_form">
 		<field name="model">letter.letter.type</field>
 		<field name="name">letter.letter.type.view</field>
diff --git a/addons/network/network_view.xml b/addons/network/network_view.xml
index 8d8e6150f64..51911680bf9 100644
--- a/addons/network/network_view.xml
+++ b/addons/network/network_view.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <terp>
 	<data>
-		<menuitem name="Network" groups="admin"/>
-		<menuitem name="Network/Configuration" id="menu_network_definition" groups="admin" sequence="1"/>
+		<menuitem name="Tools" id="menu_tools" type="STOCK_PREFERENCES"/>
+		<menuitem name="Tools/Network" groups="admin" id="menu_network"/>
+		<menuitem name="Tools/Network/Configuration" id="menu_network_definition" groups="admin" sequence="1"/>
 
 		<record model="ir.ui.view" id="edit_network">
 			<field name="name">network.material.form</field>
@@ -56,7 +57,7 @@
 			<field name="view_type">form</field>
 			<field name="domain">[('parent_id','=',False)]</field>
 		</record>
-		<menuitem name="Network/All Materials" id="menu_action_material_tree" action="action_material_tree" groups="admin"/>
+		<menuitem name="Tools/Network/All Materials" id="menu_action_material_tree" action="action_material_tree" groups="admin"/>
 
 		<record model="ir.ui.view" id="material_view_by_network">
 			<field name="name">network.material.tree</field>
@@ -130,8 +131,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 		</record>
-		<menuitem name="Network/Configuration" groups="admin" />
-		<menuitem name="Network/Configuration/Software/Types" id="menu_action_software_type" action="action_software_type"/>
+		<menuitem name="Tools/Network/Configuration/Software/Types" id="menu_action_software_type" action="action_software_type"/>
 
 		<record model="ir.ui.view" id="view_hardware_type_form">
 			<field name="name">network.hardware.type.form</field>
@@ -149,7 +149,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 		</record>
-		<menuitem name="Network/Configuration/Hardware/Types" id="menu_action_hard_type" action="action_hard_type" groups="admin"/>
+		<menuitem name="Tools/Network/Configuration/Hardware/Types" id="menu_action_hard_type" action="action_hard_type" groups="admin"/>
 
 
 		<record model="ir.ui.view" id="password_form">
@@ -223,7 +223,7 @@
 			<field name="res_model">network.network</field>
 			<field name="view_type">tree</field>
 		</record>
-		<menuitem name="Network/Network list"
+		<menuitem name="Tools/Network/Network list"
 			id="menu_add_view_network" action="add_view_network" groups="admin"/>
 
 		<record model="ir.ui.view" id="add_network_view">
@@ -267,7 +267,7 @@
 			<field name="res_model">network.network</field>
 			<field name="view_type">form</field>
 		</record>
-		<menuitem name="Network/Networks" id="menu_add_new_network" action="add_new_network" groups="admin"/>
+		<menuitem name="Tools/Network/Networks" id="menu_add_new_network" action="add_new_network" groups="admin"/>
 
 		<record model="ir.ui.view" id="add_diary_entry_form">
 			<field name="name">network.changes.form</field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 33978e0ba14..af21f11c1a2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -141,9 +141,7 @@ class project(osv.osv):
 		self.write(cr, uid, [id], {'active': value}, context)
 		cr.execute('select id from project_task where project_id=%d', (proj.id,))
 		tasks_id = [x[0] for x in cr.fetchall()]
-		self.pool.get('project.task').write(cr, uid,
-			tasks_id,
-			{'active': value}, context)
+		self.pool.get('project.task').write(cr, uid, tasks_id, {'active': value}, context)
 		project_ids = [x[0] for x in cr.fetchall()]
 		for child in project_ids:
 			self.setActive(cr, uid, child, value, context)
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3be16d2ce40..cf85bb37dcf 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -2,7 +2,8 @@
 <terp>
 <data>
 
-	<menuitem name="Tools/Subscriptions/Configuration" groups="admin"/>
+	<menuitem name="Tools" id="menu_tools" type="STOCK_PREFERENCES"/>
+	<menuitem name="Tools/Subscriptions/Configuration" groups="admin" id="menu_subscription_config"/>
 	<!--
 	=======================================================
 	Subscription Views