From 039314e0cd51f3e401fc77bca323b26a70aff1ae Mon Sep 17 00:00:00 2001
From: uco <uco@tinyerp.com>
Date: Mon, 21 Jun 2010 16:27:10 +0530
Subject: [PATCH] [REF] account,account_budget,email_template: Remaining
 changes of menus.

bzr revid: uco@tinyerp.com-20100621105710-fhp6y2ek6df7rs5h
---
 addons/account/account_menuitem.xml                   | 3 +--
 addons/account_budget/crossovered_budget_view.xml     | 8 --------
 addons/email_template/email_template_mailbox_view.xml | 6 ++----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 7394b15f0be..dd577f98458 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    	<menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="1"/>
+    	<menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
         <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"/>
@@ -26,7 +26,6 @@
         		<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
         	<menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
 				<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
 <!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 06b889d2cee..a99ce35d3b2 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -315,14 +315,6 @@
             auto="False"
             menu="False"/>-->
 
-        <!--Menu for project management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_pm_invoicing" name="Billing" parent="base.menu_main_pm" sequence="7"/>
-        <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
-        <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
-        <menuitem parent="menu_pm_budget"
-             id="menu_act_pm_crossovered_budget_view"
-             action="act_crossovered_budget_view" />
     </data>
 </openerp>
 
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index 93a1a9958d4..a49fabbd523 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -111,10 +111,8 @@
 
         <!--======================================== MENUS ========================================-->
         <menuitem name="MailBox" id="menu_email_template_mailbox_all_main2" parent="menu_email_template" />
-        <menuitem name="Personal" id="menu_email_template_personal" parent="menu_email_template_mailbox_all_main2" />
-        <menuitem name="Mails" id="menu_email_template_personal_mails" parent="menu_email_template_personal" action="action_email_template_mailbox"/>
-        <menuitem name="Company" id="menu_email_template_company" parent="menu_email_template_mailbox_all_main2" />
-        <menuitem name="Mails" id="menu_email_template_company_mails" parent="menu_email_template_company" action="action_email_template_mailbox"/>
+        <menuitem name="Personal Mails" id="menu_email_template_personal_mails" parent="menu_email_template_mailbox_all_main2" action="action_email_template_mailbox"/>
+        <menuitem name="Company Mails" id="menu_email_template_company_mails" parent="menu_email_template_mailbox_all_main2" action="action_email_template_mailbox"/>
 
     </data>
 </openerp>