From a5ea68f1712124812069b942bba344bb3667cb39 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 1 Jul 2008 19:20:40 +0000
Subject: [PATCH] Improvements in menus

bzr revid: fp@tinyerp.com-68282dbd98b8fed381c42457236a3a17a4b6c45f
---
 addons/account/account_end_fy.xml             |  4 +-
 addons/account/account_view.xml               | 32 +++++++-------
 addons/account/account_wizard.xml             | 21 ++++++---
 addons/account/project/project_view.xml       |  5 ++-
 addons/account_payment/payment_view.xml       |  5 +--
 addons/account_report/account_view.xml        |  4 +-
 addons/crm/crm_view.xml                       |  3 +-
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     | 43 ++++++++-----------
 .../hr_timesheet_project_view.xml             |  6 +--
 .../hr_timesheet_sheet_view.xml               |  6 +--
 addons/mrp/mrp_view.xml                       | 12 +++---
 addons/profile_service/__terp__.py            |  1 -
 addons/purchase/purchase_view.xml             | 22 +++++++---
 .../report_analytic_planning_view.xml         | 29 +++++++++----
 addons/sale/sale_view.xml                     |  5 +--
 addons/stock/stock_view.xml                   |  4 +-
 17 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index 5f9cdfd3b75..4860384ec11 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -2,8 +2,6 @@
 <terp>
     <data>
         
-        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance" sequence="20"/>
-        
         <record id="action_account_period_tree" model="ir.actions.act_window">
             <field name="name">Close Period</field>
             <field name="res_model">account.period</field>
@@ -14,4 +12,4 @@
         <menuitem action="action_account_period_tree" id="menu_action_account_period_close_tree" parent="account.menu_account_end_year_treatments"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5f47a368ab0..c6cbb072dd8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -6,8 +6,6 @@
 	 Fiscal Year
 	-->
         
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
-        <menuitem groups="base.group_admin" id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
         
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
@@ -139,12 +137,12 @@
             </field>
         </record>
         <record id="action_account_form" model="ir.actions.act_window">
-            <field name="name">Accounts</field>
+            <field name="name">Financial Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_24" name="General Accounts" parent="account.menu_finance_configuration"/><menuitem action="action_account_form" id="menu_action_account_form" parent="next_id_24"/>
+        <menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_configuration"/><menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
         
         <record id="view_account_tree" model="ir.ui.view">
             <field name="name">account.account.tree</field>
@@ -169,7 +167,7 @@
             <field name="view_id" ref="view_account_tree"/>
             <field name="domain">[('code','=','0')]</field>
         </record>
-        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.next_id_24"/>
+        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>
         
         <record id="view_account_list" model="ir.ui.view">
             <field name="name">account.account.list</field>
@@ -288,12 +286,13 @@
             </field>
         </record>
         <record id="action_account_journal_form" model="ir.actions.act_window">
-            <field name="name">Account journal</field>
+            <field name="name">Financial Journals</field>
             <field name="res_model">account.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_25" name="Journal" parent="account.menu_finance_configuration"/><menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="next_id_25"/>
+        <menuitem id="next_id_25" name="Journal" parent="account.menu_finance_configuration"/>
+		<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="next_id_25"/>
         
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
@@ -375,7 +374,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem id="next_id_26" name="Entries" parent="account.menu_finance"/><menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="next_id_26"/>
+        <menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_entries"/>
         
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
             <field name="name">Draft statements</field>
@@ -458,7 +457,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="account.next_id_24"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="account.account_account_menu"/>
         <!--
 	Entries
 	-->
@@ -547,8 +546,10 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
-        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration"/><menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
-        <menuitem id="next_id_28" name="Taxes" parent="account.next_id_19"/><menuitem action="action_tax_code_tree" id="menu_action_tax_code_tree" parent="next_id_28" sequence="12"/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration"/>
+		<menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
+        <menuitem id="next_id_28" name="Taxes" parent="menu_finance_periodical_processing"/>
+		<menuitem action="action_tax_code_tree" id="menu_action_tax_code_tree" parent="next_id_28" sequence="12"/>
         
         
         <!--
@@ -630,10 +631,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tax_tree"/>
         </record>
-        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="account.next_id_27"/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="menu_action_tax_tree"/>
         
         
-        <menuitem id="menu_finance_entries" name="Entries" parent="account.menu_finance" sequence="2"/>
         
         <!--
 	Entries Journal lines
@@ -649,7 +649,7 @@
             <field eval="True" name="object"/>
         </record>
         
-        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Standard entry"/>
+        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Standard Entry"/>
         <menuitem action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard"/>
         
         <record id="action_move_journal_period_line_form" model="ir.actions.act_window">
@@ -911,7 +911,6 @@
         <menuitem action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
         <menuitem action="action_account_tree2" id="menu_action_account_tree3" parent="account.menu_action_account_tree2"/>
         
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
         
         
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
@@ -984,7 +983,6 @@
         
         <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
         
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
         
         <!--
 	TODO:
@@ -1497,4 +1495,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 29e626720c7..b81852a64dd 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
+        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
+        <menuitem groups="base.group_admin" id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance" sequence="20"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
+        <menuitem id="menu_finance_entries" name="Entries" parent="account.menu_finance" sequence="2"/>
+
         <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Refund invoice"/>
         
         <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice"/>
@@ -9,16 +16,16 @@
         
         <!-- close year, period, journal -->
         <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Close a Fiscal Year"/>
-        <menuitem id="next_id_17" name="Financial Management"/><menuitem id="next_id_18" name="End of Year Treatments" parent="next_id_17"/><menuitem action="wizard_fiscalyear_close" id="menu_wizard_fy_close" parent="next_id_18" sequence="11" type="wizard"/>
+        <menuitem id="menu_finance" name="Financial Management"/><menuitem action="wizard_fiscalyear_close" id="menu_wizard_fy_close" parent="menu_account_end_year_treatments" sequence="11" type="wizard"/>
         
         <wizard id="wizard_open_closed_fiscalyear" menu="False" model="account.fiscalyear" name="account.open_closed_fiscalyear" string="Open a Closed Fiscal Year"/>
-        <menuitem action="wizard_open_closed_fiscalyear" id="menu_wizard_open_closed_fy" parent="account.next_id_18" sequence="12" type="wizard"/>
+        <menuitem action="wizard_open_closed_fiscalyear" id="menu_wizard_open_closed_fy" parent="account.menu_account_end_year_treatments" sequence="12" type="wizard"/>
         
         <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close Period"/>
         
         <!-- automatic reconcile -->
         <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
-        <menuitem id="next_id_19" name="Periodical Processing" parent="account.next_id_17"/><menuitem id="next_id_20" name="Reconciliation" parent="next_id_19"/><menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
+        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
         
         <!-- manual reconcile -->
         <wizard id="wizard_reconcile" model="account.move.line" name="account.move.line.reconcile" string="Reconcile Entries"/>
@@ -37,11 +44,11 @@
         
         <!-- subscriptions -->
         <wizard id="wizard_generate_subscription" menu="False" model="account.subscription" name="account.subscription.generate" string="Create subscription entries"/>
-        <menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.next_id_19" type="wizard"/>
+        <menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" type="wizard"/>
         
         <!-- Aged partner balance -->
         <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged partner balance"/>
-        <menuitem id="next_id_21" name="Reporting" parent="account.next_id_17"/><menuitem id="next_id_22" name="Partner Accounts" parent="next_id_21"/><menuitem action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
+        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_reporting"/><menuitem action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
         
         <!-- report-related wizards -->
         <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner balance"/>
@@ -62,9 +69,9 @@
         
         <!-- account.move validate -->
         <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Account Moves"/>
-        <menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.next_id_19" type="wizard"/>
+        <menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/>
         
         <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Account Moves"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index defbd07f391..9848f1713c9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -74,7 +74,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        <menuitem id="next_id_39" name="Analytic Accounts" parent="account.menu_finance_configuration"/><menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="next_id_39"/>
+        <menuitem id="next_id_39" name="Analytic Accounts" parent="account.menu_finance_configuration"/>
+		<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="next_id_39"/>
         
         <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
             <field name="name">Analytic Charts of Accounts</field>
@@ -328,4 +329,4 @@
         <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 188bd09f6d0..2e8049540c0 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -2,7 +2,6 @@
 <terp>
     <data>
         <menuitem id="menu_main" name="Payment" parent="account.menu_finance"/>
-        <menuitem groups="base.group_admin" id="menu_main_configuration" name="Configuration" parent="account.menu_finance" sequence="1"/>
         
         <record id="view_payment_type_form" model="ir.ui.view">
             <field name="name">payment.type.form</field>
@@ -49,7 +48,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         
-        <menuitem id="next_id_44" name="Payment" parent="account_payment.menu_main_configuration"/><menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
+        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/><menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
         
         <record id="view_payment_order_form" model="ir.ui.view">
             <field name="name">payment.order.form</field>
@@ -216,4 +215,4 @@
         <act_window domain="[('move_line_id.move_id.id', '=', move_id)]" id="act_account_invoice_2_payment_line" name="Payment Lines" res_model="payment.line" src_model="account.invoice"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index ba819588c65..052fcafe6e3 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -77,7 +77,7 @@
             <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
         
-        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account_payment.menu_main_configuration"/>
+        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration"/>
         <record id="action_account_report_form" model="ir.actions.act_window">
             <field name="name">New Reporting Item Formula</field>
             <field name="res_model">account.report.report</field>
@@ -141,4 +141,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 7449f740452..2704bc71e4e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -542,7 +542,6 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="next_id_53" name="Segmentations" parent="crm.menu_crm_configuration"/><menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="next_id_53"/>
-        <menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation_tree-act" parent="crm.menu_crm"/>
         
         <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>
         
@@ -556,4 +555,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 48ed1d24cd8..bb649734bb0 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -161,7 +161,7 @@
             <field name="name">Working Time Categories</field>
             <field name="res_model">hr.timesheet.group</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="create_group"/>
+            <field name="view_id" eval="False"/>
         </record>
         <menuitem action="edit_workgroup" groups="base.group_admin" id="menu_edit_workgroup" parent="hr.menu_hr_configuration"/>
         
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a9ebd1cedd1..e1995546d75 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -42,7 +42,7 @@
         </record>
         
         <record id="act_hr_timesheet_line_today_form" model="ir.actions.act_window">
-            <field name="name">Hours Encoding</field>
+            <field name="name">Working Hours</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
@@ -50,45 +50,36 @@
         </record>
         <menuitem action="act_hr_timesheet_line_today_form" id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root"/>
         
-        <record id="act_hr_timesheet_line_me_today_form" model="ir.actions.act_window">
-            <field name="name">My works of the day</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.analytic.timesheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date', '=', time.strftime('%Y-%m-%d')),('user_id','=',uid)]</field>
-        </record>
-        <menuitem id="next_id_46" name="For me" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/><menuitem action="act_hr_timesheet_line_me_today_form" id="menu_act_hr_timesheet_line_me_today_form" parent="next_id_46"/>
-        
         <record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
-            <field name="name">All my works</field>
+            <field name="name">My Working Hours</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.next_id_46"/>
+        <menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
+
         
+        <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
+            <field name="name">Workin Hours</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem action="act_hr_timesheet_line_evry1_all_form" id="menu_act_hr_timesheet_line_evry1_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
+         
         <record id="act_hr_timesheet_line_evry1_today_form" model="ir.actions.act_window">
-            <field name="name">All works of the day</field>
+            <field name="name">Working Hours of The Day</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date', '=',	time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem id="next_id_47" name="For Everyone" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/><menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="next_id_47"/>
-        
-        <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
-            <field name="name">All works</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.analytic.timesheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem action="act_hr_timesheet_line_evry1_all_form" id="menu_act_hr_timesheet_line_evry1_all_form" parent="hr_timesheet.next_id_47"/>
-        
+        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form"/>
+       
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
@@ -101,4 +92,4 @@
             </field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/hr_timesheet_project/hr_timesheet_project_view.xml b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
index c3e62b9d0e1..c1493a20a9e 100644
--- a/addons/hr_timesheet_project/hr_timesheet_project_view.xml
+++ b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
@@ -3,9 +3,9 @@
     <data>
         
         <wizard id="encode_hour" model="hr.employee" name="hr_timesheet_project.encode.hour" string="Hours From Tasks"/>
-        <menuitem action="encode_hour" id="menu_act_hr_timesheet_line_me_today_project_form" parent="hr_timesheet.next_id_46" type="wizard"/>
+        <menuitem action="encode_hour" id="menu_act_hr_timesheet_line_me_today_project_form" parent="hr_timesheet.menu_act_hr_timesheet_line_me_all_form" type="wizard"/>
         
-        <wizard id="encode_hour_tss" model="hr_timesheet_sheet.sheet" name="hr_timesheet_project.encode.hour.noopen" string="Timesheet From Tasks"/>
+        <wizard id="encode_hour_tss" model="hr_timesheet_sheet.sheet" name="hr_timesheet_project.encode.hour.noopen" string="Import Hours From Tasks"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 05f219c14ec..791f0a254fb 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -173,11 +173,11 @@
         </record>
         
         <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
-            <field name="name">All Timesheets</field>
+            <field name="name">Timesheets</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="hr_timesheet_sheet_form"/>
+            <field name="view_id" eval="False"/>
         </record>
         <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/><menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"/>
         
@@ -334,4 +334,4 @@
         
         <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7a710a5f4ad..133cec70c6b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -27,7 +27,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem groups="base.group_admin" id="menu_mrp_configuration" name="Configuration"/>
+        <menuitem groups="base.group_admin" id="menu_mrp_configuration" name="Configuration" parent="menu_mrp_root"/>
         <menuitem id="menu_mrp_property_group_action_prop" name="Properties" parent="menu_mrp_configuration"/>
         <menuitem action="mrp_property_group_action" id="menu_mrp_property_group_action" parent="menu_mrp_property_group_action_prop"/>
         
@@ -437,7 +437,7 @@
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
-            <field name="view_id" ref="mrp_production_form_view"/>
+            <field name="view_id" eval="False"/>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/>
 
@@ -451,14 +451,14 @@
         </record>
         <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action"/>
         <record id="mrp_production_action3" model="ir.actions.act_window">
-            <field name="name">Production orders in progress</field>
+            <field name="name">Production Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','in_production')]</field>
         </record>
-        <menuitem id="next_id_76" name="Production Orders" parent="mrp.menu_mrp_root"/><menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="next_id_76"/>
+        <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="mrp_production_action"/>
         <record id="mrp_production_action4" model="ir.actions.act_window">
             <field name="name">Production orders waiting goods</field>
             <field name="type">ir.actions.act_window</field>
@@ -467,7 +467,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.next_id_76"/>
+        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.mrp_production_action"/>
         
         <record id="mrp_production_workcenter_form_view" model="ir.ui.view">
             <field name="name">mrp.production.workcenter.line.form</field>
@@ -737,4 +737,4 @@
 
         <act_window domain="[('product_id', '=', active_id),('bom_id','=',False)]" id="act_product_product_2_mrp_bom" name="Bill of Material" res_model="mrp.bom" src_model="product.product"/>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py
index 934c6405278..240c0fb899e 100644
--- a/addons/profile_service/__terp__.py
+++ b/addons/profile_service/__terp__.py
@@ -34,7 +34,6 @@
 		"hr",
 		"hr_timesheet",
 		"hr_timesheet_invoice",
-		"hr_timesheet_project",
 		"crm",
 		"project",
 		"board_project",
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 6fed731affc..b335775da82 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -64,14 +64,15 @@
         </record>
         
         <record id="purchase_form_action" model="ir.actions.act_window">
-            <field name="name">Purchase Order</field>
+            <field name="name">Purchase Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
+
         <record id="purchase_form_action2" model="ir.actions.act_window">
-            <field name="name">Request for quotation</field>
+            <field name="name">Request For Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="domain">[('state','=','draft')]</field>
@@ -79,8 +80,9 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action"/>
+
         <record id="purchase_form_action3" model="ir.actions.act_window">
-            <field name="name">Purchase order waiting Approval</field>
+            <field name="name">Purchase Order Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -88,6 +90,7 @@
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
         <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action"/>
+
         <record id="purchase_form_action4" model="ir.actions.act_window">
             <field name="name">Purchase Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -97,6 +100,15 @@
             <field name="domain">[('state','=','approved')]</field>
         </record>
         <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action"/>
+
+        <record id="purchase_form_action_new" model="ir.actions.act_window">
+            <field name="name">New Purchase Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem action="purchase_form_action_new" id="menu_purchase_form_action_new" parent="purchase.menu_purchase_root"/>
+
         
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
@@ -162,4 +174,4 @@
         
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_purchase_order" name="Purchase orders" res_model="purchase.order" src_model="res.partner"/>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index d7e8858bb13..aeebc175595 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -73,15 +73,19 @@
         </record>
         
         <record id="action_account_analytic_planning_form" model="ir.actions.act_window">
-            <field name="name">Planning</field>
+            <field name="name">Plannings</field>
             <field name="res_model">report_account_analytic.planning</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_84" name="Planning" parent="hr.menu_hr_root"/><menuitem action="action_account_analytic_planning_form" id="menu_report_account_analytic_planning" parent="next_id_84"/>
+        <menuitem id="planning_main" name="Planning" parent="hr.menu_hr_root"/>
+		<menuitem 
+			action="action_account_analytic_planning_form" 
+			id="menu_report_account_analytic_planning" 
+			parent="planning_main"/>
         
         <record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
-            <field name="name">My Planning</field>
+            <field name="name">My Plannings</field>
             <field name="res_model">report_account_analytic.planning</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -90,23 +94,30 @@
         <menuitem action="action_account_analytic_planning_form_my" id="menu_report_account_analytic_planning_my2" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
         
         <record id="action_account_analytic_planning_form_current_my" model="ir.actions.act_window">
-            <field name="name">My Current Planning</field>
+            <field name="name">My Current Plannings</field>
             <field name="res_model">report_account_analytic.planning</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem action="action_account_analytic_planning_form_current_my" id="menu_report_account_analytic_planning_current_my" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
-        
+        <menuitem action="action_account_analytic_planning_form_current_my" id="menu_report_account_analytic_planning_current_my" parent="menu_report_account_analytic_planning_my2"/>
         
         <record id="action_account_analytic_planning_form_current" model="ir.actions.act_window">
-            <field name="name">Current Planning</field>
+            <field name="name">Current Plannings</field>
             <field name="res_model">report_account_analytic.planning</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
         </record>
         <menuitem action="action_account_analytic_planning_form_current" id="menu_report_account_analytic_planning_current" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
+
+        <record id="action_account_analytic_planning_form_new" model="ir.actions.act_window">
+            <field name="name">New Planning</field>
+            <field name="res_model">report_account_analytic.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem action="action_account_analytic_planning_form_new" id="menu_report_account_analytic_planning_new" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
         
         
         
@@ -190,4 +201,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5a42c67de46..4ed255f17c0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -181,11 +181,10 @@
             </field>
         </record>
         <record id="action_order_form" model="ir.actions.act_window">
-            <field name="name">Sales Order</field>
+            <field name="name">Sales Orders</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_id" ref="view_order_form"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
         
@@ -451,4 +450,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5c8cab2bca9..2290b4504f4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1129,7 +1129,7 @@
         <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2"/>
         
         <record id="action_picking_all" model="ir.actions.act_window">
-            <field name="name">All Packings</field>
+            <field name="name">Packings</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1189,4 +1189,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>