From 3709122dd8af500b64ebd987bcf9cfb97eba03c3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Aug 2010 12:17:23 +0530
Subject: [PATCH] [REM]: email_template: Removed useless menuitem "Emails/Email
 Template/MailBox", [IMP]: email_template: "Personal Mails" -> "Emails" [REM]:
 email_template: Removed menu "Company Emails"

bzr revid: rpa@tinyerp.com-20100825064723-6x12yvxhxeks93xb
---
 addons/email_template/email_template_mailbox_view.xml |  8 +++++---
 addons/email_template/i18n/email_template.pot         |  5 -----
 addons/email_template/i18n/en_US.po                   | 10 ----------
 addons/email_template/i18n/fr.po                      | 10 ----------
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index 018b1800ccc..017f04db2e5 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -107,9 +107,11 @@
         </record>
 
         <!--======================================== MENUS ========================================-->
-        <menuitem name="MailBox" id="menu_email_template_mailbox_all_main2" parent="menu_email_template" />
-        <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"/>
+
+        <menuitem name="Emails"
+            id="menu_email_template_personal_mails"
+            parent="menu_email_template"
+            action="action_email_template_mailbox" />
 
     </data>
 </openerp>
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 3a077c82d17..6d0d31cf430 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -335,11 +335,6 @@ msgstr ""
 msgid "Send/Receive"
 msgstr ""
 
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_mailbox_all_main2
-msgid "MailBox"
-msgstr ""
-
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
diff --git a/addons/email_template/i18n/en_US.po b/addons/email_template/i18n/en_US.po
index 00e682ea025..40cccf5a2cc 100644
--- a/addons/email_template/i18n/en_US.po
+++ b/addons/email_template/i18n/en_US.po
@@ -335,11 +335,6 @@ msgstr "Body(Html)"
 msgid "Send/Receive"
 msgstr "Send/Receive"
 
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_mailbox_all_main2
-msgid "MailBox"
-msgstr "MailBox"
-
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
@@ -1113,11 +1108,6 @@ msgstr "Corporate"
 msgid "Enter name of outgoing server, eg:smtp.gmail.com "
 msgstr "Enter name of outgoing server, eg:smtp.gmail.com "
 
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
-msgid "Company Mails"
-msgstr "Company Mails"
-
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index 3a077c82d17..327669fe129 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -335,11 +335,6 @@ msgstr ""
 msgid "Send/Receive"
 msgstr ""
 
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_mailbox_all_main2
-msgid "MailBox"
-msgstr ""
-
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
@@ -1101,11 +1096,6 @@ msgstr ""
 msgid "Enter name of outgoing server, eg:smtp.gmail.com "
 msgstr ""
 
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
-msgid "Company Mails"
-msgstr ""
-
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"