[IMP] Generic: configuration menus reorganization
authorYannick Tivisse <yti@odoo.com>
Tue, 9 Sep 2014 06:52:13 +0000 (08:52 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 10 Sep 2014 14:28:49 +0000 (16:28 +0200)
80 files changed:
addons/account/account_analytic_view.xml
addons/account/account_bank_view.xml
addons/account/account_invoice_view.xml
addons/account/account_menuitem.xml
addons/account/account_view.xml
addons/account/edi/invoice_action_data.xml
addons/account/partner_view.xml
addons/account/wizard/account_fiscalyear_close_state.xml
addons/account/wizard/account_fiscalyear_close_view.xml
addons/account/wizard/account_open_closed_fiscalyear_view.xml
addons/account_accountant/account_accountant_data.xml
addons/account_analytic_analysis/account_analytic_analysis_view.xml
addons/account_asset/account_asset_view.xml
addons/account_asset/wizard/wizard_asset_compute_view.xml
addons/account_bank_statement_extensions/account_bank_statement_view.xml
addons/account_bank_statement_import/account_bank_statement_import_view.xml
addons/account_budget/account_budget_view.xml
addons/account_check_writing/account_voucher_view.xml
addons/account_followup/account_followup_customers.xml
addons/account_followup/account_followup_view.xml
addons/account_followup/report/account_followup_report.xml
addons/account_followup/wizard/account_followup_print_view.xml
addons/account_payment/account_payment_view.xml
addons/account_voucher/voucher_payment_receipt_view.xml
addons/account_voucher/voucher_sales_purchase_view.xml
addons/crm/base_partner_merge_view.xml
addons/crm/crm_lead_view.xml
addons/crm/crm_phonecall_menu.xml
addons/crm/crm_view.xml
addons/crm_claim/crm_claim_menu.xml
addons/crm_partner_assign/res_partner_view.xml
addons/crm_profiling/crm_profiling_view.xml
addons/delivery/delivery_view.xml
addons/event/event_view.xml
addons/event/report/report_event_registration_view.xml
addons/fleet/fleet_board_view.xml
addons/hr/hr_view.xml
addons/hr_attendance/hr_attendance_view.xml
addons/hr_contract/hr_contract_view.xml
addons/hr_evaluation/hr_evaluation_view.xml
addons/hr_expense/hr_expense_view.xml
addons/hr_holidays/hr_holidays_view.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/hr_timesheet/hr_timesheet_view.xml
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
addons/marketing/marketing_view.xml
addons/marketing/res_config_view.xml
addons/marketing_campaign/marketing_campaign_view.xml
addons/mass_mailing/views/email_template.xml
addons/mass_mailing/views/mass_mailing.xml
addons/mrp/mrp_view.xml
addons/mrp/report/mrp_report_view.xml
addons/mrp/res_config_view.xml
addons/point_of_sale/point_of_sale_view.xml
addons/product/pricelist_view.xml
addons/product/product_view.xml
addons/product_margin/product_margin_view.xml
addons/project/project_view.xml
addons/project/report/project_report_view.xml
addons/project/res_config_view.xml
addons/project_issue/project_issue_view.xml
addons/project_timesheet/report/task_report_view.xml
addons/purchase/purchase_view.xml
addons/purchase/report/purchase_report_view.xml
addons/purchase/res_config_view.xml
addons/sale_journal/sale_journal_view.xml
addons/sale_layout/views/sale_layout_category_view.xml
addons/stock/stock_view.xml
addons/stock/wizard/orderpoint_procurement_view.xml
addons/stock_account/wizard/stock_valuation_history_view.xml
addons/stock_landed_costs/stock_landed_costs_view.xml
addons/survey/views/survey_views.xml
addons/website_certification/views/website_certification_views.xml
addons/website_quote/views/website_quotation_backend.xml
addons/website_sale/views/views.xml
openerp/addons/base/res/res_bank_view.xml
openerp/addons/base/res/res_country_view.xml
openerp/addons/base/res/res_partner_view.xml
openerp/addons/base/res/res_security.xml

index c73e0cb..7077b73 100644 (file)
             groups="analytic.group_analytic_accounting"/>
         <menuitem action="analytic.action_account_analytic_account_form" id="account_analytic_def_account"
             parent="menu_analytic_accounting"
-            groups="analytic.group_analytic_accounting"/>
+            groups="analytic.group_analytic_accounting" sequence="0"/>
             
         <menuitem groups="analytic.group_analytic_accounting" action="analytic.action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
     </data>
index 426309e..fedb13c 100644 (file)
@@ -35,7 +35,7 @@
 
 
     <record id="action_bank_tree" model="ir.actions.act_window">
-        <field name="name">Setup your Bank Accounts</field>
+        <field name="name">Bank Accounts</field>
         <field name="res_model">res.partner.bank</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -53,8 +53,8 @@
         </field>
     </record>
     <menuitem
-        sequence="0"
-        parent="account.account_account_menu"
+        sequence="99"
+        parent="account.menu_journals"
         id="menu_action_bank_tree"
         action="action_bank_tree"/>
 
index 250c8e2..4e0d952 100644 (file)
               </p>
             </field>
         </record>
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables" sequence="1"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
               </p>
             </field>
         </record>
-        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables" sequence="2"/>
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
index f7bf334..a448317 100644 (file)
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
-        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
+        <menuitem id="periodical_processing_bank_statements" name="Bank Statements" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="9"/>
         <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
-        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
-        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user" sequence="8"/>
+        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="10" groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" sequence="1"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="40"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="5"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="5"/>
+
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
-        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
+        <menuitem id="menu_journals" sequence="3" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
+        <menuitem id="menu_configuration_recurrent_entries" name="Reccuring Entries" parent="menu_finance_configuration" sequence="54"/>
+        <menuitem id="menu_config_multi_currency" name="Multi-Currencies" parent="menu_finance_configuration" sequence="9" groups="base.group_multi_currency"/>
+
+        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_config_multi_currency" sequence="20" groups="base.group_no_one"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="6" groups="group_account_user,group_account_manager"/>
+
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
+        <menuitem id="menu_account_reports" name="Reports" parent="account.account_account_menu" sequence="4" />
 
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
             parent="menu_finance_periodical_processing" sequence="15"/>
@@ -45,6 +52,7 @@
 
         <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
         <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10" groups="base.group_multi_currency"/>
+
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="final_accounting_reports"
index 639c699..3a766a0 100644 (file)
@@ -86,7 +86,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
+        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="1" />
         <menuitem id="menu_action_account_fiscalyear" action="action_account_fiscalyear" parent="next_id_23"/>
 
         <!-- Period -->
               </p>
             </field>
         </record>
-        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
-        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
+        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" sequence="1"/>
 
         <act_window
             id="act_account_acount_move_line_open_unreconciled"
         </record>
         
         <!-- because of the needaction badge, groups needs to be specified -->
-        <menuitem id="menu_bank_reconcile_bank_statements" name="Reconciliation on Bank Statements" parent="account.periodical_processing_reconciliation" groups="group_account_user" action="action_bank_reconcile" sequence="20"/>
+        <menuitem id="menu_bank_reconcile_bank_statements" name="Reconcile" parent="account.periodical_processing_bank_statements" groups="group_account_user" action="action_bank_reconcile" sequence="20"/>
 
         <record id="view_account_statement_operation_template_form" model="ir.ui.view">
             <field name="name">account.statement.operation.template.form</field>
             </field>
         </record>
         <record id="action_account_statement_operation_template" model="ir.actions.act_window">
-            <field name="name">Statement Operation Templates</field>
+            <field name="name">Statement Operations</field>
             <field name="res_model">account.statement.operation.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
               </p>
             </field>
         </record>
-        <menuitem action="action_account_statement_operation_template" id="menu_action_account_statement_operation_template" parent="menu_configuration_misc" name="Statement Operation Templates" sequence="22"/>
+
+        <menuitem
+            id="account_template_folder"
+            name="Templates"
+            parent="account_account_menu"
+            groups="account.group_account_manager"
+            sequence="3"/>
+        <menuitem
+            id="account_report_folder"
+            name="Reports"
+            parent="account_account_menu"
+            groups="account.group_account_manager"
+            sequence="4"/>
+        <menuitem action="action_account_statement_operation_template" id="menu_action_account_statement_operation_template" parent="account_template_folder" name="Statement Operation Templates" sequence="22"/>
 
         <!-- Account Types -->
         <record id="view_account_type_search" model="ir.ui.view">
               </p>
             </field>
         </record>
-        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
+        <menuitem action="action_account_type_form" sequence="2" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
 
         <!-- Entries -->
         <record id="view_account_move_tree" model="ir.ui.view">
               </p>
             </field>
         </record>
-        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="4"/>
+        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="2" groups="base.group_no_one"/>
 
         <act_window
             id="action_tax_code_line_open"
             <field name="view_id" ref="view_tax_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27" sequence="1"/>
 
         <record id="action_tax_code_tree" model="ir.actions.act_window">
             <field name="name">Chart of Taxes</field>
         </record>
         <menuitem
             action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
-            parent="account.menu_finance_recurrent_entries"/>
+            parent="account.menu_configuration_recurrent_entries"/>
 
         <!-- Payment Terms -->
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
+        <menuitem id="account_followup_main_menu" parent="menu_finance_configuration" name="Follow-ups" sequence="6"/>
+
         <menuitem action="action_payment_term_form"
-            id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
+            id="menu_action_payment_term_form" parent="account_followup_main_menu" sequence="0"/>
 
         <!-- Account Subscriptions -->
         <record id="view_subscription_line_form" model="ir.ui.view">
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
             id="menu_action_subscription_form" sequence="1"
-            parent="account.menu_finance_recurrent_entries"/>
+            parent="account.menu_configuration_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
         </record>
 
         <!-- Account Templates -->
-        <menuitem
-            id="account_template_folder"
-            name="Templates"
-            parent="account_account_menu"
-            groups="account.group_account_manager"/>
+
         <menuitem
             id="account_template_taxes"
-            name="Taxes"
-            parent="account_template_folder"
-            sequence="2"/>
-        <menuitem
-            id="account_template_accounts"
-            name="Accounts"
-            parent="account_template_folder"
-            sequence="1"/>
+            name="Templates"
+            parent="next_id_27"
+            sequence="4"/>
 
         <record id="view_account_template_form" model="ir.ui.view">
             <field name="name">account.account.template.form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_template_search"/>
         </record>
-        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
+        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_folder" 
+        sequence="2"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_folder" sequence="1"/>
 
         <!-- Account Tax Templates -->
         <record id="view_account_tax_template_form" model="ir.ui.view">
             </field>
         </record>
         <record id="action_account_tax_code_template_form" model="ir.actions.act_window">
-            <field name="name">Tax Code Templates</field>
+            <field name="name">Tax Code</field>
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Position Templates</field>
+            <field name="name">Fiscal Position</field>
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
 
         <menuitem id="menu_account_supplier" name="Suppliers"
             parent="menu_finance_payables"
-            action="base.action_partner_supplier_form" sequence="100"/>
+            action="base.action_partner_supplier_form" sequence="7"/>
 
         <!-- Account Reports -->
         <record id="view_account_financial_report_form" model="ir.ui.view">
             <field name="search_view_id" ref="view_account_financial_report_search"/>
             <field name="view_id" ref="view_account_financial_report_tree"/>
         </record>
-        <menuitem id="menu_account_financial_reports_tree" name="Account Reports" parent="menu_account_reports" action="action_account_financial_report_tree"/>
+        <menuitem id="menu_account_financial_reports_tree" name="Account Reports Types" parent="menu_account_reports" action="action_account_financial_report_tree"/>
 
         <record id="view_account_report_tree_hierarchy" model="ir.ui.view">
             <field name="name">account.report.hierarchy</field>
index 766db9e..92b906c 100644 (file)
@@ -12,8 +12,6 @@
             <field name="context">{'search_default_model_id':'account.invoice'}</field>
             <field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/>
         </record>
-        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
-
     </data>
 
     <!-- Mail template are declared in a NOUPDATE block
index 679baa8..71d17ca 100644 (file)
         <menuitem
             action="action_account_fiscal_position_form"
             id="menu_action_account_fiscal_position_form"
-            parent="next_id_27" sequence="20"/>
+            parent="next_id_27" sequence="3"/>
 
         <!--
         Partners Extension
index 8275f0a..8c8b82c 100644 (file)
@@ -29,7 +29,7 @@
 
         <menuitem action="action_account_fiscalyear_close_state"
             id="menu_wizard_fy_close_state"
-            sequence="20"
+            sequence="3"
             parent="menu_account_end_year_treatments" />
 
     </data>
index 0da94ee..20a424c 100644 (file)
@@ -36,7 +36,8 @@
 
         <menuitem action="action_account_fiscalyear_close"
             id="menu_wizard_fy_close"
-            parent="menu_account_end_year_treatments" />
+            parent="menu_account_end_year_treatments" 
+            sequence="5"/>
 
     </data>
 </openerp>
index 6f3eb91..0cb3692 100644 (file)
@@ -33,7 +33,7 @@ This wizard will remove the end of year journal entries of selected fiscal year.
 
         <menuitem action="action_account_open_closed_fiscalyear"
             id="menu_wizard_account_open_closed_fiscalyear"
-            sequence="18"
+            sequence="2"
             parent="menu_account_end_year_treatments" />
 
     </data>
index 8f9fd92..e99da0f 100644 (file)
@@ -5,7 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Accounting"
             id="account.menu_finance"/>
-        <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config"/>
+        <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config" sequence="3"/>
 
     </data>
 
index 332158f..c104a37 100644 (file)
                 </p>
             </field>
         </record>
-        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
+
+        <menuitem
+            id= "base.menu_sales_config"
+            parent= "base.menu_base_config"
+            sequence= "1"
+            name= "Sales"
+        />
+
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_sales_config" sequence="3"/>
         
         <record id="account_analytic_analysis_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
index 47a0679..7fa3f48 100644 (file)
         </field>
     </record>
 
-    <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance" sequence="9"/>
+    <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance" sequence="7"/>
     <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
         sequence="100"
         action="action_account_asset_asset_tree"/>
 
     <act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
 
-    <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_configuration" sequence="25"/>
+    <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_configuration" sequence="7"/>
     <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
         <field name="name">Asset Categories</field>
         <field name="res_model">account.asset.category</field>
index f74121c..165287d 100644 (file)
@@ -29,7 +29,7 @@
 
         <menuitem action="action_asset_depreciation_confirmation_wizard"
             id="menu_asset_depreciation_confirmation_wizard"
-            parent="account.menu_finance_recurrent_entries" />
+            parent="account.periodical_processing_journal_entries_validation" />
 
     </data>
 </openerp>
index edb9e2f..f0796b4 100644 (file)
       <field name="view_id" ref="view_bank_statement_line_list"/>
     </record>
 
+
     <menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20" groups="base.group_no_one"/>
 
+
   </data>
 </openerp>
index b637a07..c48371c 100644 (file)
@@ -31,7 +31,7 @@
         </record>
 
         <record id="action_account_bank_statement_import" model="ir.actions.act_window">
-            <field name="name">Import Bank Statements</field>
+            <field name="name">Import</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.bank.statement.import</field>
             <field name="view_type">form</field>
@@ -40,7 +40,7 @@
             <field name="view_id" ref="account_bank_statement_import_view"/>
         </record>
 
-        <menuitem parent="account.menu_finance_bank_and_cash" id="menu_account_bank_statement_import" action="action_account_bank_statement_import" sequence="11"/>
+        <menuitem parent="account.periodical_processing_bank_statements" id="menu_account_bank_statement_import" action="action_account_bank_statement_import" sequence="11"/>
 
     </data>
 </openerp>
index 1b71d72..1f1798e 100644 (file)
@@ -37,8 +37,8 @@
             <field name="view_id" ref="view_budget_post_tree"/>
             <field name="search_view_id" ref="view_budget_post_search"/>
         </record>
-        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="6"/>
-        <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="50"/>
+        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="8"/>
+        <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="8"/>
         <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/>
 
 
index 2201a7c..f10fff1 100644 (file)
@@ -59,7 +59,7 @@
             <field name="act_window_id" ref="action_write_check"/>
         </record>
 
-        <menuitem action="action_write_check" icon="STOCK_JUSTIFY_FILL" sequence="12"
+        <menuitem action="action_write_check" icon="STOCK_JUSTIFY_FILL" sequence="6"
             id="menu_action_write_check"  parent="account.menu_finance_payables"/>
     </data>
 </openerp>
index c91ce55..778e89e 100644 (file)
 
         <!-- Menus about followup of customers -->
         <menuitem id="account_followup_s" action="action_customer_followup" 
-            parent="menu_finance_followup" name="Do Manual Follow-Ups" sequence="3"/>
+            parent="menu_finance_followup" name="Manual Follow-Ups" sequence="2"/>
         <record id="action_customer_my_followup" model="ir.actions.act_window">
             <field name="name">My Follow-Ups</field>
             <field name="view_id" ref="customer_followup_tree"/>
index 5b1b4b3..bcc2ef1 100644 (file)
         </record>
 
         <menuitem
-             name="Reconcile Invoices &amp; Payments"
+             name="Reconcile"
              action="account.action_account_manual_reconcile"
              parent="menu_finance_followup"
-             sequence="0"
+             sequence="3"
              id="menu_manual_reconcile_followup"/>
        
-       <menuitem id="account_followup_main_menu" parent="account.menu_finance_configuration" name="Follow-up"/>
 
 
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.account_followup_main_menu" name="Levels"
+        sequence="1"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>
index e7d7aba..3c7284f 100644 (file)
@@ -46,7 +46,8 @@
             <field name="context">{'search_default_followup_level':1}</field>
             <field name="search_view_id" ref="view_account_followup_stat_search"/>
         </record>
-        <menuitem id="menu_finance_followup" parent="account.menu_finance" name="Payment Follow-up" groups="account.group_account_invoice"/>
+        <menuitem id="menu_finance_followup" parent="account.menu_finance" name="Payment Follow-ups" groups="account.group_account_invoice"
+          sequence="5"/>
         <menuitem action="action_followup_stat" id="menu_action_followup_stat_follow" parent="account.menu_finance_reporting" groups="account.group_account_invoice" name="Follow-Ups Analysis" sequence="10"/>
 
     </data>
index 0728e8e..6349624 100644 (file)
@@ -37,7 +37,7 @@
                   parent="menu_finance_followup"
                   name = "Send Letters and Emails"
                   groups = "account.group_account_user"
-                  sequence="2"/>
+                  sequence="1"/>
 
         <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.search</field>
index 40f1382..312f38b 100644 (file)
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="7"/>
-
         <record id="view_payment_mode_search" model="ir.ui.view">
             <field name="name">payment.mode.search</field>
             <field name="model">payment.mode</field>
@@ -54,8 +52,6 @@
             <field name="search_view_id" ref="view_payment_mode_search"/>
         </record>
 
-        <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc" groups="base.group_no_one"/>
-
         <record id="view_payment_order_form" model="ir.ui.view">
             <field name="name">payment.order.form</field>
             <field name="model">payment.order</field>
             </field>
         </record>
 
-        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="menu_main_payment" sequence="3"/>
+        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="account.menu_finance_payables" sequence="5"/>
 
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>
index ee9313b..5da0369 100644 (file)
         </record>
 
 
-        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
+        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="4"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
         <!-- Register Payment Form (old Pay Invoice wizard) -->
index f8c2d65..70ac2f7 100644 (file)
         </record>
 
         <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
-            action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
+            action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="3"/>
 
     </data>
 </openerp>
index 8bda960..60d1a6c 100644 (file)
@@ -2,7 +2,6 @@
 <openerp>
     <data>
         <!-- the sequence of the configuration sub menu is 30 -->
-        <menuitem id='root_menu' name='Tools' parent='base.menu_base_partner' sequence="25"/>
 
         <record model="ir.actions.act_window" id="base_partner_merge_automatic_act">
             <field name="name">Deduplicate Contacts</field>
@@ -16,7 +15,8 @@
         <menuitem id='partner_merge_automatic_menu'
             action='base_partner_merge_automatic_act'
             groups='base.group_system'
-            parent='root_menu' />
+            parent='base.menu_config_address_book' 
+            sequence='4'/>
 
         <record model='ir.ui.view' id='base_partner_merge_automatic_wizard_form'>
             <field name='name'>base.partner.merge.automatic.wizard.form</field>
index 17e231c..e75923a 100644 (file)
@@ -61,7 +61,7 @@
         </record>
 
         <menuitem action="crm_lead_categ_action"
-            id="menu_crm_lead_categ" name="Sales Tags"
+            id="menu_crm_lead_categ" name="Tags"
             parent="base.menu_crm_config_lead" sequence="1" groups="base.group_no_one"/>
 
         <!--
                         </page>
                         <page string="Fund Raising" groups="crm.group_fund_raising">
                             <group>
-                                <field name="payment_mode" widget="selection"/>
+                                <field name="payment_mode"/>
                                 <field name="planned_cost"/>
                             </group>
                         </page>
index 2448351..6141b5f 100644 (file)
@@ -49,7 +49,7 @@
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
         groups="base.group_sale_salesman"
-        parent="base.menu_base_partner" sequence="4" />
+        parent="base.menu_base_partner" sequence="2" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Logged Calls</field>
index c1c5285..42618e5 100644 (file)
@@ -12,7 +12,7 @@
             groups="base.group_sale_manager,base.group_sale_salesman"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_base_config" sequence="80" groups="base.group_sale_manager"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_sale_manager"/>
 
         <menuitem id="base.menu_crm_config_opportunity" name="Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_no_one" sequence="15"
-            parent="base.menu_base_config"/>
+            groups="base.group_no_one" sequence="4"
+            parent="base.menu_localisation"/>
 
         <!-- Payment Mode Tree View -->
 
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_crm_payment_mode"
-            id="menu_crm_payment_mode_act"
-            groups="base.group_no_one"
-            name="Payment Modes"
-            parent="base.menu_crm_config_lead"/>
     </data>
 </openerp>
index 59ec2ac..5e00044 100644 (file)
@@ -4,7 +4,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
-            parent="base.menu_base_partner" sequence="2" />
+            parent="base.menu_base_partner" sequence="3" />
 
         <!-- Claims Menu -->
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
index 98c00a9..88492fb 100644 (file)
@@ -33,7 +33,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="res_partner_activation_config_mi" parent="base.menu_config_address_book" action="res_partner_activation_act" groups="base.group_no_one"/>
+        <menuitem id="res_partner_activation_config_mi" parent="base.menu_localisation" action="res_partner_activation_act" groups="base.group_no_one"
+            sequence="6"/>
 
     <!--Partner Grade -->
 
@@ -68,7 +69,8 @@
     </record>
     <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"
         groups="base.group_no_one"
-        parent="base.menu_crm_config_lead" />
+        parent="base.menu_localisation"
+        sequence="5" />
 
     <!-- Partner form -->
     <record id="view_res_partner_filter_assign_tree" model="ir.ui.view">
index 7f9090c..2dbb2e0 100644 (file)
@@ -10,8 +10,8 @@
           <field name="help">You can create specific topic-related questionnaires to guide your team(s) in the sales cycle by helping them to ask the right questions. The segmentation tool allows you to automatically assign a partner to a category according to his answers to the different questionnaires.</field>
         </record>
 
-        <menuitem parent="base.menu_base_config" id="menu_segm_questionnaire"
-                  action="open_questionnaires" sequence="1"/>
+        <menuitem parent="base.menu_localisation" id="menu_segm_questionnaire"
+                  action="open_questionnaires" sequence="7"/>
 
         <record model="ir.actions.act_window" id="open_questions">
           <field name="name">Questions</field>
@@ -20,8 +20,8 @@
           <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="base.menu_base_config" id="menu_segm_answer"
-                  action="open_questions" sequence="37" groups="base.group_no_one"/>
+        <menuitem parent="base.menu_localisation" id="menu_segm_answer"
+                  action="open_questions" sequence="8" groups="base.group_no_one"/>
 
 <!-- Profiling Questionnaire Tree view  -->
 
index 5864b4c..731e1ea 100644 (file)
             </field>
         </record>
 
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="stock.menu_stock_configuration" sequence="15"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" sequence="1"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">
               </p>
             </field>
         </record>
-        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
+        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery" sequence="2"/>
 
         <record id="view_delivery_grid_line_form" model="ir.ui.view">
             <field name="name">delivery.grid.line.form</field>
index 9433c00..910922f 100644 (file)
@@ -9,7 +9,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
         </record>
-        <menuitem name="Events" parent="base.marketing_menu" id="event_main_menu"/>
+        <menuitem name="Events" parent="base.marketing_menu" id="event_main_menu" sequence="2"/>
 
         <!-- EVENTS  -->
 
         </record>
 
         <record model="ir.actions.act_window" id="action_event_type">
-            <field name="name">Types of Events</field>
+            <field name="name">Events Types</field>
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="base.marketing_menu" sequence="30"/>
-        <menuitem name="Events" id="event_configuration" parent="base.menu_marketing_config_root"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="event.event_configuration" groups="base.group_no_one"/>
+        <menuitem name="Events" id="event_configuration" parent="base.menu_marketing_config_root" sequence="1"/>
+        <menuitem name="Events Types" id="menu_event_type" action="action_event_type" parent="event.event_configuration" groups="base.group_no_one"/>
 
         <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
index 07711af..1b39a9d 100644 (file)
@@ -65,7 +65,7 @@
             <field name="act_window_id" ref="action_report_event_registration"/>
         </record>
 
-        <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="30" groups="event.group_event_manager" name="Events"/>
+        <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="50" groups="event.group_event_manager" name="Events"/>
         <menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
 
     </data>
index 4775990..e28b85b 100644 (file)
@@ -38,8 +38,8 @@
         </p>
       </field>
     </record>
-
-    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" groups="group_fleet_manager"/>
+    
+    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="90" groups="group_fleet_manager"/>
 
     <menuitem id="menu_fleet_reporting_costs"
               parent="menu_fleet_reporting"
index 708387d..ac02db1 100644 (file)
@@ -7,9 +7,14 @@
             id="menu_hr_root"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"
             sequence="90"/>
-        <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
+        <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="60" />
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_user" sequence="50"/>
+        <menuitem id="menu_hr_configuration_employees" name="Employees" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="1"/>
+        <menuitem id="menu_hr_configuration_recruitment" name="Recruitment" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="2"/>
+        <menuitem id="menu_hr_configuration_timesheets_attendances" name="Timesheets &amp; Attendances" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="3"/>
+        <menuitem id="menu_hr_configuration_expenses" name="Expenses" parent="hr.menu_hr_configuration" groups="base.group_hr_manager" sequence="4"/>
+
         <menuitem id="menu_hr_reporting_timesheet" name="Reports"
             parent="menu_hr_reporting" sequence="6"/>
 
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one,base.group_hr_manager"/>
+            parent="hr.menu_hr_configuration_employees" sequence="1" groups="base.group_no_one,base.group_hr_manager"/>
 
         <record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
             <field name="name">Employees</field>
               </p>
             </field>
         </record>
-        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration_employees" sequence="2" groups="base.group_hr_manager,base.group_hr_user"/>
 
     </data>
 </openerp>
index f5de522..66e4caa 100644 (file)
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem
-            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" groups="base.group_hr_attendance,base.group_hr_manager" name="Attendance"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_hr_attendance"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration_timesheets_attendances" groups="base.group_hr_attendance" sequence="1"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
index f0e1510..aa812a4 100644 (file)
@@ -13,7 +13,6 @@
             <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
         </record>
         
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one,base.group_hr_manager"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
             <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
 
-        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
+        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="hr.menu_hr_configuration_employees" sequence="3" groups="base.group_no_one"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
     </data>
index 5f1b2db..a243855 100644 (file)
@@ -73,8 +73,8 @@
 
         <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
-        <menuitem parent="hr.menu_hr_configuration" id="menu_open_view_hr_evaluation_plan_tree"
-            action="open_view_hr_evaluation_plan_tree" sequence="15" groups="base.group_hr_manager"/>
+        <menuitem parent="hr.menu_hr_configuration_employees" id="menu_open_view_hr_evaluation_plan_tree"
+            action="open_view_hr_evaluation_plan_tree" sequence="5" groups="base.group_hr_manager"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
             <field name="name">hr_evaluation.plan.phase.form</field>
index 6d284d2..bb9d5d9 100644 (file)
         </record>
 
         <record id="hr_expense_product" model="ir.actions.act_window">
-            <field name="name">Expense Categories</field>
+            <field name="name">Expense Products</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
             </field>
         </record>
         
-        <menuitem id="menu_expense_approved" parent="account.menu_finance_payables" action="action_approved_expense" sequence="101"/> 
-        <menuitem id="menu_hr_product" name="Expense Categories" parent="hr.menu_hr_configuration" action="hr_expense_product" groups="base.group_hr_manager"/>
+        <menuitem id="menu_expense_approved" parent="account.menu_finance_payables" action="action_approved_expense" sequence="8"/> 
+        <menuitem id="menu_hr_product" name="Expense Products" parent="hr.menu_hr_configuration_expenses" action="hr_expense_product" groups="base.group_hr_manager"/>
         <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
         <menuitem action="action_request_approve_expense" id="menu_expense_to_approve" name="Expenses to Approve" parent="next_id_49" groups="base.group_hr_user"/>
index 24e656d..958194d 100644 (file)
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_hr_manager"/>
-        <menuitem name="Leaves Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10" groups="base.group_hr_manager"/>
+        <menuitem name="Leave Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration_employees" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
index cb21980..3978e05 100644 (file)
@@ -6,7 +6,7 @@
         id="menu_hr_recruitment_recruitment"
         parent="hr.menu_hr_configuration"
         groups="base.group_hr_manager"
-        sequence="40"/>
+        sequence="2"/>
 
     <act_window
         id="act_hr_applicant_to_meeting"
index 9dc52bd..0a3f5e7 100644 (file)
             <field name="context">{'invoice_on_timesheets':1}</field>
         </record>
 
-        <menuitem parent="hr.menu_hr_configuration" id="menu_timesheet_accounts" action="act_hr_timesheet_accounts_form" sequence="7" groups="base.group_hr_manager"/>
+        <menuitem parent="hr.menu_hr_configuration_timesheets_attendances" id="menu_timesheet_accounts" action="act_hr_timesheet_accounts_form" sequence="2" groups="base.group_hr_manager"/>
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="name">Timesheet Activities</field>
index 72b3036..b7f0368 100644 (file)
             </field>
         </record>
         <record id="action_hr_timesheet_invoice_factor_form" model="ir.actions.act_window">
-            <field name="name">Types of Invoicing</field>
+            <field name="name">Invoicing Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_timesheet_invoice.factor</field>
             <field name="view_type">form</field>
         <menuitem
             action="action_hr_timesheet_invoice_factor_form"
             id="hr_timesheet_invoice_factor_view"
-            parent="account.menu_configuration_misc" sequence="25" groups="base.group_no_one"/>
+            parent="account.menu_analytic_accounting" sequence="99" groups="base.group_no_one"/>
 
     </data>
 </openerp>
index ebf188a..9df754d 100644 (file)
@@ -5,7 +5,7 @@
             id="hr.menu_hr_reporting"
             name="Human Resources"
             parent="base.menu_reporting"
-            sequence="40" />
+            sequence="60" />
 
         <record id="view_timesheet_line_graph" model="ir.ui.view">
             <field name="name">report.timesheet.line.graph</field>
index 21254a9..f2cab59 100644 (file)
@@ -7,7 +7,7 @@
             groups="base.group_user"/>
 
         <!-- Reporting for Marketing -->
-        <menuitem name="Marketing" id="base.marketing_reporting_menu" sequence="10"
+        <menuitem name="Marketing" id="base.marketing_reporting_menu" sequence="49"
             parent="base.menu_reporting" />
 
     </data>
index 6d15ac8..ad973a3 100644 (file)
@@ -46,7 +46,7 @@
         </record>
 
         <menuitem id="menu_marketing_configuration" name="Marketing" parent="base.menu_config"
-            sequence="17" action="action_marketing_configuration"/>
+            sequence="14" action="action_marketing_configuration"/>
 
     </data>
 </openerp>
index 1ba5621..4a7c82a 100644 (file)
         </field>
     </record>
 
-    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu" groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
+    <menuitem name="Lead Automation" id="menu_marketing_campaign" parent="base.marketing_menu" groups="marketing.group_marketing_user,marketing.group_marketing_manager" 
+    sequence="3"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30"/>
 
     <!-- Marketing Segments -->
     </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Follow-up</field>
+        <field name="name">Follow-up</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>
index 09701f4..bea94db 100644 (file)
@@ -89,7 +89,7 @@
 
         <!-- Add Templates in Marketing / Mass mailing menu -->
         <menuitem name="Mail Templates" id="menu_email_template"
-            parent="mass_mailing_campaign" sequence="3"
+            parent="menu_view_mass_mailing_config" sequence="3"
             action="action_email_template_marketing"/>
 
     </data>
index f1ed063..0be156c 100644 (file)
@@ -12,9 +12,6 @@
         <!-- Marketing / Mass Mailing -->
         <menuitem name="Mass Mailing" id="mass_mailing_campaign"
             parent="base.marketing_menu" sequence="1"/>
-        <!-- Marketing / Mailing Lists -->
-        <menuitem name="Mailing Lists" id="mass_mailing_list"
-            parent="base.marketing_menu" sequence="2"/>
         <!-- Marketing / Configuration -->
         <menuitem name="Configuration" id="marketing_configuration"
             parent="base.marketing_menu" sequence="99"/>
         </record>
 
         <menuitem name="Contacts" id="menu_email_mass_mailing_contacts"
-            parent="mass_mailing_list" sequence="50"
+            parent="mass_mailing_campaign" sequence="4"
             action="action_view_mass_mailing_contacts"/>
 
         <!--  MASS MAILING LIST -->
         </record>
 
         <menuitem name="Mailing Lists" id="menu_email_mass_mailing_lists"
-            parent="mass_mailing_list" sequence="40"
+            parent="mass_mailing_campaign" sequence="3"
             action="action_view_mass_mailing_lists"/>
 
         <!--  MASS MAILING !-->
             <field name="view_mode">tree,form</field>
         </record>
 
+        <menuitem name= "Mass Mailing" id= "menu_view_mass_mailing_config"
+            parent = "base.menu_marketing_config_root" sequence= "4"
+             groups="mass_mailing.group_mass_mailing_campaign"/>
+           
         <menuitem name="Campaign Stages" id="menu_view_mass_mailing_stages"
-            parent="marketing_configuration" sequence="1"
+            parent="menu_view_mass_mailing_config" sequence="1"
             groups="mass_mailing.group_mass_mailing_campaign"
             action="action_view_mass_mailing_stages"/>
 
index 0a9b21f..de4793d 100644 (file)
             parent="base.menu_mrp_root"
             groups="group_mrp_manager"
             sequence="50"/>
+        <menuitem
+            id="menu_mrp_configuration_manufacturing"
+            name="Manufacturing"
+            parent="menu_mrp_configuration"
+            groups="group_mrp_manager"
+            sequence="1"/>
+        <menuitem
+            id="menu_mrp_configuration_products"
+            name="Products"
+            parent="menu_mrp_configuration"
+            groups="group_mrp_manager"
+            sequence="2"/>
+
+
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
             <field name="name">mrp.property.tree</field>
             action="mrp_property_action"
             id="menu_mrp_property_action"
             groups="product.group_mrp_properties"
-            parent="menu_mrp_configuration"
+            parent="menu_mrp_configuration_products"
             sequence="30"/>
         <menuitem
             action="mrp_property_group_action"
-            parent="menu_mrp_configuration"
+            parent="menu_mrp_configuration_products"
             groups="base.group_no_one,product.group_mrp_properties"
             id="menu_mrp_property_group_action"
             sequence="35"/>
             action="mrp_bom_form_action"
             id="menu_mrp_bom_form_action"
             parent="menu_mrp_bom"
-            sequence="10"/>
+            sequence="99"/>
        <menuitem name="Products" 
             id="menu_mrp_product_form" 
             action="product_template_action"
             parent="menu_mrp_bom"/>
-        <menuitem
-            action="mrp_bom_form_action2"
-            id="menu_mrp_bom_form_action2"
-            parent="menu_mrp_configuration"
-            sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Bill of Materials Structure</field>
             </field>
         </record>
 
-        <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
-        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_configuration" sequence="25"/>
+        <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration" sequence="3"/>
+        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_configuration_manufacturing" sequence="25"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
 
index db2a2f8..e4de1d7 100644 (file)
@@ -39,7 +39,7 @@
             </field>
         </record>
         <menuitem id="next_id_77" name="Manufacturing"
-            parent="base.menu_reporting" sequence="20"/>
+            parent="base.menu_reporting" sequence="48"/>
 
         <!-- stock.move compared to internal location src/dest -->
 
index d9af7a6..1e064dd 100644 (file)
@@ -76,7 +76,7 @@
         </record>
 
         <menuitem id="base.menu_mrp_config" name="Manufacturing" parent="base.menu_config"
-            sequence="8" action="action_mrp_configuration"/>
+            sequence="13" action="action_mrp_configuration"/>
 
     </data>
 </openerp>
index 97d8836..5b53448 100644 (file)
         <menuitem
             action="product_template_action"
             id="menu_pos_products"
-            parent="menu_point_of_sale_product" sequence="2"/>
+            parent="menu_point_of_sale_product" sequence="0"/>
 
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
               </p>
             </field>
         </record>
-        <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_of_sale_product" sequence="0" />
+        <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_of_sale_product" sequence="2" />
         <!-- END -->
 
         <record id="action_edit_ean" model="ir.actions.act_window">
         </record>
 
         <!--  Miscellaneous Operations/Reporting -->
-        <menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="50" groups="group_pos_manager"/>
+        <menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="4" groups="group_pos_manager"/>
         <!-- Invoice -->
 
         <record model="ir.actions.act_window" id="action_pos_invoice">
index 94f9db1..e15741b 100644 (file)
@@ -5,7 +5,7 @@
         <menuitem id="base.menu_sale_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="0"/>
         <menuitem id="menu_product_pricelist_main" name="Pricelists" 
-            parent="base.menu_base_config" groups="product.group_sale_pricelist" sequence="70"/>
+            parent="base.menu_base_config" groups="product.group_sale_pricelist" sequence="3"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
index 4503764..962c7f3 100644 (file)
 
         <!-- product product -->
 
-        <menuitem id="prod_config_main" name="Product Categories &amp; Attributes" parent="base.menu_base_config" sequence="70" groups="base.group_no_one"/>
+        <menuitem id="prod_config_main" name="Products" parent="base.menu_base_config" sequence="2" groups="base.group_no_one"/>
 
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
 
         <menuitem action="attribute_action"
             id="menu_attribute_action"
-            parent="product.prod_config_main" sequence="9" />
+            parent="product.prod_config_main" sequence="4" />
 
         <record id="variants_tree_view" model="ir.ui.view">
             <field name="name">product.attribute.value.tree</field>
 
         <menuitem action="variants_action"
             id="menu_variants_action"
-            parent="product.prod_config_main" sequence="10" />
+            parent="product.prod_config_main" sequence="5" />
 
         <!--  -->
 
             </field>
         </record>
         <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="30" groups="product.group_uom"/>
-        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="base.menu_base_config" sequence="30" groups="product.group_uom"/>
+        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="product.prod_config_main" sequence="6" groups="product.group_uom"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
               </p>
             </field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="base.group_no_one"/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.prod_config_main" sequence="7" groups="base.group_no_one"/>
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
             </field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="5"/>
+            action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
index 2255b10..7515f6a 100644 (file)
@@ -86,7 +86,7 @@
             </field>
         </record>
 
-  <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"/>
+  <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="36"/>
   <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.next_id_73"/>
 
 </data>
index f87d0f7..650a9b3 100644 (file)
 
         <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="open_task_type_form" id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1" groups="base.group_no_one"/>
 
-        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
          <record id="product_search_form_view_procurment_consume" model="ir.ui.view">
index 24ac1c4..d118ef2 100644 (file)
@@ -4,7 +4,7 @@
 
         <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
-            parent="base.menu_reporting" sequence="25"/>
+            parent="base.menu_reporting" sequence="5"/>
 
         <record id="view_task_project_user_graph" model="ir.ui.view">
             <field name="name">report.project.task.user.graph</field>
index 7db447c..11882a0 100644 (file)
@@ -99,7 +99,7 @@
         </record>
 
         <menuitem id="base.menu_project_config" name="Project" parent="base.menu_config"
-            sequence="10" action="action_config_settings"/>
+            sequence="2" action="action_config_settings"/>
 
     </data>
 </openerp>
index 9437f6b..2dd50de 100644 (file)
@@ -2,7 +2,6 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
@@ -39,7 +38,8 @@
               </p>
             </field>
         </record>
-        <menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" groups="base.group_no_one"/>
+
+        <menuitem  action="project_issue_version_action" id="menu_project_confi" name="Issues Versions" parent="base.menu_definitions" sequence="2"/>
 
 
         <record model="ir.ui.view" id="project_issue_form_view">
index b587132..2295720 100644 (file)
@@ -5,7 +5,7 @@
             id="hr.menu_hr_reporting"
             name="Human Resources"
             parent="base.menu_reporting"
-            sequence="40" />
+            sequence="60" />
 
         <!-- Report for Users' Timesheet and Task Hours per Month -->
 
index 5ab16ae..c519938 100644 (file)
 
         <menuitem
              action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
-             parent="purchase.menu_product_in_config_purchase" sequence="5" />
+             parent="purchase.menu_product_in_config_purchase" sequence="10" />
 
         <menuitem
               action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
-              parent="purchase.menu_product_in_config_purchase" sequence="10"/>
-
-        <menuitem
-            id="menu_purchase_partner_cat" name="Address Book"
-            parent="menu_purchase_config_purchase"/>
-
-        <menuitem
-            action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Tags"
-            parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
+              parent="purchase.menu_product_in_config_purchase" sequence="5"/>
 
     <!--Supplier menu-->
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
           parent="base.menu_purchase_root" sequence="8"/>
 
       <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
-           parent="menu_procurement_management_product" sequence="10"/>
+           parent="menu_procurement_management_product" sequence="2"/>
 
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product_normal_action_puchased"
-          parent="menu_procurement_management_product"/>
+          parent="menu_procurement_management_product" sequence="1"/>
 
         <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
index 32164cf..159268f 100644 (file)
@@ -81,7 +81,7 @@
         <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field>
     </record>
 
-    <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"
+    <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="37"
         groups="purchase.group_purchase_manager"/>
     <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
 
index 60645de..44dce04 100644 (file)
         </record>
 
         <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config"
-            sequence="3" action="action_purchase_configuration"/>
+            sequence="4" action="action_purchase_configuration"/>
 
         <record id="view_account_config" model="ir.ui.view">
             <field name="name">account settings</field>
index 8457874..1ce5eda 100644 (file)
@@ -41,8 +41,8 @@
             <field name="help">Invoice types are used for partners, sales orders and delivery orders. You can create a specific invoicing journal to group your invoicing according to your customer's needs: daily, each Wednesday, monthly, etc.</field>
         </record>
 
-     <menuitem id="menu_definition_journal_invoice_type" sequence="15"
-        parent="base.menu_base_config" action="action_definition_journal_invoice_type"/>
+     <menuitem id="menu_definition_journal_invoice_type" sequence="4"
+        parent="base.menu_sales_config" action="action_definition_journal_invoice_type"/>
 
     <!-- Inherit sales order form view -->
 
index 7e189b0..70c152e 100644 (file)
             <field name="view_mode">tree,form</field>
         </record>
 
+        <menuitem
+            id= "base.menu_sales_config"
+            parent= "base.menu_base_config"
+            sequence= "1"
+            name= "Sales"
+            groups= "base.group_sale_manager,base.group_sale_salesman,account.group_account_manager,account.group_account_user"
+        />
+
         <menuitem 
             action="report_configuration_action" 
             id="Report_configuration" 
-            parent="base.menu_base_config" 
-            sequence="25" 
+            parent="base.menu_sales_config" 
+            sequence="2" 
             name="Report Layout Categories" 
             groups="base.group_sale_manager,base.group_sale_salesman,account.group_account_manager,account.group_account_user"
         />
index 6b72f99..4da90a1 100644 (file)
         <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
-            parent="stock.menu_stock_product" sequence="0" groups="base.group_no_one"/>
+            parent="stock.menu_stock_product" sequence="2" groups="base.group_no_one"/>
         <menuitem action="product.product_template_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_no_one"/>
+        <menuitem id="menu_schedulers_config" name="Schedulers Management" parent="stock.menu_stock_configuration" sequence="2" groups="base.group_no_one"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
         <menuitem
             id="menu_product_in_config_stock" name="Products"
-            parent="stock.menu_stock_configuration" sequence="45" groups="base.group_no_one"/>
+            parent="stock.menu_stock_configuration" sequence="3" groups="base.group_no_one"/>
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_stock"
-            parent="stock.menu_product_in_config_stock" sequence="0"/>
+            parent="stock.menu_product_in_config_stock" sequence="2"/>
         <menuitem
             action="product.product_normal_action" id="menu_product_variant_config_stock"
-            parent="stock.menu_product_in_config_stock" sequence="2"/>
+            parent="stock.menu_stock_product" sequence="3"/>
         <menuitem
             action="product.product_template_action" id="menu_product_template_config_stock"
             parent="stock.menu_product_in_config_stock" sequence="1"/>
             parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
         <menuitem
             action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
-            parent="menu_stock_configuration" sequence="30" groups="product.group_uom"/>
+            parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/>
         <menuitem
             action="product.product_uom_form_action" id="menu_stock_uom_form_action"
-            parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
+            parent="menu_product_in_config_stock" sequence="4" groups="product.group_uom"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
             parent="menu_traceability" groups="stock.group_production_lot"
-            sequence="1"/>
+            sequence="2"/>
 
         #
         # Lot composition (history)
             </field>
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" groups="stock.group_locations"
-            parent="menu_stock_configuration" sequence="5"/>
+            parent="menu_warehouse_config" sequence="2"/>
 
 
         <record id="act_product_stock_move_open" model="ir.actions.act_window">
             </field>
         </record>
         <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" groups="stock.group_locations"
-            parent="menu_stock_configuration" sequence="1"/>
+            parent="menu_warehouse_config" sequence="1"/>
 
         <!--
             Stock picking
         <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3" groups="stock.group_locations"/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1" groups="stock.group_locations"/>
 
         <!--
             Receipt Picking (By Stock Move)
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_stock_configuration" sequence="40"/>
-
+        <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_warehouse_config" sequence="4"/>
 
          <record id="view_pickingtype_filter" model="ir.ui.view">
             <field name="name">stock.picking.type.filter</field>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
         <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="stock.group_stock_manager"/>
-        <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" groups="base.group_no_one"/>
-        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
+        <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" groups="base.group_no_one" sequence="2"/>
+        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="1" groups="stock.group_stock_manager"/>
         <menuitem action="procurement.procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
-        <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
-        <menuitem id="stock.next_id_61" name="Warehouse" sequence="15" parent="base.menu_reporting" groups="group_stock_manager"/>
+        <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_schedulers_config" sequence="1"/>
+        <menuitem id="stock.next_id_61" name="Warehouse" sequence="40" parent="base.menu_reporting" groups="group_stock_manager"/>
         <menuitem id="menu_quants" name="Quants" parent="menu_traceability" sequence="20" action="quantsact" groups="base.group_no_one"/>
-        <menuitem id="menu_procurement_rules" name="Procurement Rules" parent="stock.menu_stock_configuration" action="procrules" groups="base.group_no_one"/>
-        <menuitem id="menu_pickingtype" name="Types of Operation" parent="stock.menu_stock_configuration" action="action_picking_type_list"/>
+        <menuitem id="menu_procurement_rules" name="Procurement Rules" parent="stock.menu_schedulers_config" action="procrules" groups="base.group_no_one" sequence="2"/>
+        <menuitem id="menu_pickingtype" name="Operations Types" parent="stock.menu_warehouse_config" action="action_picking_type_list" sequence="3"/>
 
 
         <record model="ir.actions.act_window" id="product_open_orderpoint">
                 </p>
             </field>
         </record>
-        <menuitem id="menu_package" name="Packages" parent="menu_stock_product" action="action_package_view" groups="stock.group_tracking_lot"/>
+        <menuitem id="menu_package" name="Packages" parent="menu_stock_product" action="action_package_view" groups="stock.group_tracking_lot" sequence="4"/>
         
         
         <!--Routes-->
         </record>
         
         <menuitem action="action_routes_form" id="menu_stock_routes"
-            parent="stock.menu_stock_configuration" sequence="11" />
+            parent="stock.menu_schedulers_config" sequence="3" />
 
         <record id="do_view_pickings" model="ir.actions.act_window">
             <field name="name">Pickings for Groups</field>
index c18c494..94113fb 100644 (file)
@@ -5,7 +5,7 @@
         <!--  Compute Stock Minimum Rules Only -->
 
         <record id="view_procurement_compute_wizard" model="ir.ui.view">
-            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="name">Run Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
@@ -21,7 +21,7 @@
             </field>
         </record>
 
-        <act_window name="Compute Stock Minimum Rules Only"
+        <act_window name="Run Stock Minimum Rules Only"
             res_model="procurement.orderpoint.compute"
             src_model="procurement.order"
             view_mode="form"
index ea2450e..f01d1d5 100644 (file)
@@ -86,7 +86,7 @@
     </record>
 
     <record id="action_history_tree" model="ir.actions.act_window">
-            <field name="name">Current Inventory Valuation</field>
+            <field name="name">Current Inventory</field>
             <field name="res_model">stock.history</field>
             <field name="type">ir.actions.act_window</field>
             <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
index a527efa..1cd3988 100644 (file)
            <field name="act_window_id" ref="stock_landed_cost_type_action"/>
         </record>
 
-       <menuitem action="stock_landed_cost_type_action" name="Landed Cost Type" parent="stock.menu_stock_configuration" id="menu_stock_landed_cost_type" sequence="1"/>
+       <menuitem action="stock_landed_cost_type_action" name="Landed Cost Type" parent="stock.menu_warehouse_config" id="menu_stock_landed_cost_type" sequence="5"/>
 
     </data>
 </openerp>
index 2c34007..50ecaea 100644 (file)
         <menuitem name="Answers" id="menu_survey_type_form1" action="action_survey_user_input" parent="menu_surveys" sequence="1"/>
 
         <!-- Left menu elements: Technical Configuration -->
-        <menuitem name="Surveys" id="menu_surveys_configuration" parent="base.menu_marketing_config_root" groups="base.group_no_one" sequence="25" />
+        <menuitem name="Surveys" id="menu_surveys_configuration" parent="base.menu_marketing_config_root" groups="base.group_no_one" sequence="2" />
         <menuitem name="Pages" id="menu_survey_page_form1" action="action_survey_page_form" parent="menu_surveys_configuration" sequence="1"/>
         <menuitem name="Questions" id="menu_survey_question_form1" action="action_survey_question_form" parent="menu_surveys_configuration" sequence="2"/>
         <menuitem name="Labels" id="menu_survey_label_form1" action="action_survey_label_form" parent="menu_surveys_configuration" sequence="3"/>
index 9a83a6b..8c92d80 100644 (file)
@@ -52,7 +52,7 @@
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="certification_certification_search"/>
     </record>
-    <menuitem name="Certifications" id="menu_certifications" parent="base.marketing_menu" sequence="35" />
+    <menuitem name="Certifications" id="menu_certifications" parent="base.menu_marketing_config_root" sequence="3" />
     <menuitem name="Certifications" id="menu_certifications_list" action="action_certifications_list" parent="menu_certifications" sequence="1"/>
 </data>
 </openerp>
index e39f8a0..6b15f55 100644 (file)
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_sale_quotation_template" id="menu_sale_quote_template" parent="base.menu_base_config" sequence="6" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem action="action_sale_quotation_template" id="menu_sale_quote_template" parent="base.menu_sales_config" sequence="1" name="Quotation Templates" groups="base.group_sale_salesman,base.group_sale_manager"/>
     </data>
 </openerp>
index 9971097..88f8d12 100644 (file)
           </p>
         </field>
     </record>
-    <menuitem action="product_public_category_action" id="menu_product_public_category" parent="product.prod_config_main" sequence="10" />
+    <menuitem action="product_public_category_action" id="menu_product_public_category" parent="product.prod_config_main" sequence="2" />
     <!-- END -->
 
  </data>
index 5e96510..3131122 100644 (file)
               </p>
             </field>
         </record>
-        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form" parent="base.menu_config_address_book" sequence="11" groups="base.group_no_one"/>
+
+        <menuitem  id="menu_config_bank_accounts"
+                    name="Bank Accounts"
+                    parent="base.menu_config_address_book"
+                    sequence="6"
+                    groups="base.group_no_one"/>
+
+        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form" parent="base.menu_config_bank_accounts" sequence="1" groups="base.group_no_one"/>
 
 
         <record id="view_partner_bank_type_form" model="ir.ui.view">
         </record>
         <menuitem action="action_res_partner_bank_account_form"
             id="menu_action_res_partner_bank_form"
-            parent="base.menu_config_address_book"
+            parent="base.menu_config_bank_accounts"
             groups="base.group_no_one"
-            sequence="9"/>
+            sequence="2"/>
 
 
         <record id="action_res_partner_bank_type_form" model="ir.actions.act_window">
         </record>
         <menuitem action="action_res_partner_bank_type_form"
             id="menu_action_res_partner_bank_typeform"
-            parent="base.menu_config_address_book"
+            parent="base.menu_config_bank_accounts"
             groups="base.group_no_one"
-            sequence="15"/>
+            sequence="3"/>
 
 
 
index f131684..3988fcd 100644 (file)
@@ -46,9 +46,9 @@
             <field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field>
         </record>
 
-        <menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
+        <menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="5" groups="base.group_no_one"/>
 
-        <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="0" groups="base.group_no_one"/>
+        <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="1" groups="base.group_no_one"/>
 
         <record id="view_country_group_tree" model="ir.ui.view">
             <field name="name">res.country.group.tree</field>
@@ -80,7 +80,7 @@
         </record>
 
 
-        <menuitem action="action_country_group" id="menu_country_group" name="Country Group" parent="menu_localisation" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="action_country_group" id="menu_country_group" name="Country Group" parent="menu_localisation" sequence="3" groups="base.group_no_one"/>
 
         <!--
           State
             <field name="help">If you are working on the American market, you can manage the different federal states you are working on from here. Each state is attached to one country.</field>
         </record>
 
-          <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="1" groups="base.group_no_one"/>
+          <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="2" groups="base.group_no_one"/>
 
     </data>
 </openerp>
index 7d77bd8..24779f8 100644 (file)
@@ -10,7 +10,7 @@
 
             <menuitem id="base.menu_sales" parent="base.menu_base_partner" name="Sales" sequence="1" />
             <menuitem id="menu_base_config" parent="menu_base_partner" name="Configuration" sequence="30" groups="group_system"/>
-            <menuitem id="menu_config_address_book" parent="menu_base_config" name="Address Book" sequence="40" groups="group_system"/>
+            <menuitem id="menu_config_address_book" parent="menu_base_config" name="Contacts" sequence="4" groups="group_system"/>
 
         <!-- Partner Titles -->
         <record id="view_partner_title_tree" model="ir.ui.view">
@@ -47,7 +47,7 @@
         -->
 
         <record id="action_partner_title_partner" model="ir.actions.act_window">
-            <field name="name">Titles</field>
+            <field name="name">Company Titles</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.title</field>
             <field name="view_type">form</field>
             </field>
         </record>
 
-        <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Tags" sequence="4" parent="menu_config_address_book" groups="base.group_no_one"/>
+        <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Tags" sequence="1" parent="menu_config_address_book" groups="base.group_no_one"/>
 
     </data>
 </openerp>
index cb122e0..a8184c5 100644 (file)
@@ -7,7 +7,7 @@
         </record>
 
         <record model="ir.ui.menu" id="menu_config_address_book">
-            <field name="name">Address Book</field>
+            <field name="name">Contacts</field>
             <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
         </record>
         <record model="ir.ui.menu" id="menu_base_config">