[IMP]: restructured menu structure for account module

bzr revid: pap@tinyerp.co.in-20100604130156-k559gfearbk0mcdt

19 files changed, 245 insertions, 119 deletions

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 51724f47d33..c53e2030e7f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -100,9 +100,9 @@ module named account_voucherss
         'project/wizard/account_analytic_chart_view.xml',
         'product_view.xml',
         'account_assert_test.xml',
-        'process/statement_process.xml',
-        'process/customer_invoice_process.xml',
-        'process/supplier_invoice_process.xml',
+#        'process/statement_process.xml',
+#        'process/customer_invoice_process.xml',
+#        'process/supplier_invoice_process.xml',
         'sequence_view.xml',
         'company_view.xml',
         'account_installer.xml',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 77369bdca25..0f70d2d6aaf 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -403,7 +403,7 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
-        <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>
+<!--        <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>-->
 
         <record id="action_invoice_tree1" model="ir.actions.act_window">
             <field name="name">Customer Invoices</field>
@@ -426,10 +426,10 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
-        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Supplier Invoices</field>
+            <field name="name">Vendor Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -438,7 +438,7 @@
             <field name="context">{'type':'in_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
@@ -464,10 +464,10 @@
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
 
-        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
-            <field name="name">Supplier Refunds</field>
+            <field name="name">Vendor Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -476,7 +476,7 @@
             <field name="context">{'type':'in_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
-        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
         <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 4cdcb7787b6..d0ae2ccc58f 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -1,28 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+    
+    	<menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="1"/>
+        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="3"/>
+        <menuitem id="menu_finance_bank_and_cash" name="Bank And Cash" parent="menu_finance" sequence="4"/>
+<!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
+        	<menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
+        	<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+<!--        	<menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
+        	<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+<!--        	<menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="10"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        	<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        	<menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
+        	<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+        	<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="13"/>
+        	<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        	<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+        		<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+        		<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+        	<menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+				<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
-        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
-        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+<!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
+<!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
+<!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
+<!--        <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
 
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="7"/>
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="account.menu_finance_reporting" sequence="1"/>
-        <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance_reporting" sequence="2"/>
-        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
+<!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+<!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
+<!--        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
 
-        <menuitem id="menu_finance_entries" name="Accounting" parent="account.menu_finance" sequence="1"
+        <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="1"
             groups="group_account_user"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance"
-            sequence="3"
-            groups="group_account_user"/>
-        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
+<!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
+<!--            sequence="3"-->
+<!--            groups="group_account_user"/>-->
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="account.menu_finance_reporting" sequence="3"/>
+       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
     </data>
 </openerp>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a2729676fe3..ec7d7681c05 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -163,13 +163,13 @@
         </record>
 
         <record id="action_account_form" model="ir.actions.act_window">
-            <field name="name">List of Accounts</field>
+            <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_account_search"/>
         </record>
-        <menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_accounting"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
 
         <record id="view_account_tree" model="ir.ui.view">
@@ -197,7 +197,7 @@
             <field name="view_id" ref="view_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>
+<!--        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
 
         <!--
     Journal
@@ -326,12 +326,12 @@
             </field>
         </record>
         <record id="action_account_journal_form" model="ir.actions.act_window">
-            <field name="name">Financial Journals</field>
+            <field name="name">Journals</field>
             <field name="res_model">account.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_finance_accounting"/>
+        <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
 
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
@@ -415,12 +415,12 @@
             </field>
         </record>
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
-            <field name="name">Entries by Statements</field>
+            <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_entries" sequence="7"/>
+        <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
 
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
             <field name="name">Draft statements</field>
@@ -517,7 +517,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.account_account_menu"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->
@@ -609,7 +609,7 @@
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
+        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
 
 
         <!--
@@ -1006,8 +1006,19 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
-        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
+        
+        <record id="action_move_to_review" model="ir.actions.act_window">
+            <field name="name">Journal Entries to Review</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="domain">[('to_check','=',True)]</field>
+        </record>
+        <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
+<!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
+<!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
             <field name="name">Journal Entries</field>
@@ -1019,6 +1030,30 @@
         </record>
 
         <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
+        
+        <record id="action_account_moves_sale" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'sale')]</field>
+        </record>
+
+        <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
+        
+        <record id="action_account_moves_purchase" model="ir.actions.act_window">
+            <field name="name">Transaction Journals</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'purchase')]</field>
+        </record>
+
+        <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
 
         <record id="action_move_line_search" model="ir.actions.act_window">
             <field name="name">Entry Lines</field>
@@ -1040,7 +1075,30 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
+        <record id="action_move_line_search_view3" model="ir.actions.act_window">
+            <field name="name">Cash Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'cash')]</field>
+        </record>
+        <record id="action_move_line_search_view4" model="ir.actions.act_window">
+            <field name="name">Checks Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
+        </record>
+        <menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
+        
+<!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
     <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
@@ -1108,20 +1166,20 @@
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_bank_statement_reconcile_form"/>
         </record>
-        <menuitem
-            id="next_id_30"
-            name="Bank Reconciliation"
-            parent="account.menu_finance_periodical_processing"
-            groups="group_account_user"/>
+<!--        <menuitem-->
+<!--            id="next_id_30"-->
+<!--            name="Bank Reconciliation"-->
+<!--            parent="account.menu_finance_periodical_processing"-->
+<!--            groups="group_account_user"/>-->
 
-        <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
+<!--        <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>-->
   <!--        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
     <!--     <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>   -->
 
 <!--  bank reconsilation  -->
-        <menuitem action="action_account_bank_reconcile_tree"
-            id="menu_action_account_bank_reconcile_check_tree"
-            parent="account.next_id_30" />
+<!--        <menuitem action="action_account_bank_reconcile_tree"-->
+<!--            id="menu_action_account_bank_reconcile_check_tree"-->
+<!--            parent="account.next_id_30" />-->
 
 
         <act_window
@@ -1244,12 +1302,12 @@
             </field>
         </record>
         <record id="action_model_form" model="ir.actions.act_window">
-            <field name="name">Models Definition</field>
+            <field name="name">Define Models</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" parent="menu_finance_configuration"/>
+        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_finance_recurrent_entries"/>
 
 
         <!--
@@ -1312,7 +1370,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_finance_configuration"/>
+        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
 
         <!--
     # Account Subscriptions
@@ -1392,7 +1450,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>
+<!--        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>-->
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -1525,8 +1583,18 @@
         <menuitem
             id="account_template_folder"
             name="Templates"
-            parent="account.menu_finance_accounting"
+            parent="menu_finance_accounting"
             groups="base.group_multi_company"/>
+        <menuitem
+            id="account_template_taxes"
+            name="Taxes"
+            parent="account_template_folder"
+            groups="base.group_multi_company" sequence="2"/>
+        <menuitem
+            id="account_template_accounts"
+            name="Accounts"
+            parent="account_template_folder"
+            groups="base.group_multi_company" sequence="1"/>
 
 
         <record id="view_account_template_form" model="ir.ui.view">
@@ -1577,7 +1645,7 @@
         </record>
 
 
-        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_folder"/>
+        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
 
         <!-- Chart of Accounts Templates -->
 
@@ -1622,7 +1690,7 @@
             <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_folder"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
 
         <!-- Account Tax Templates -->
 
@@ -1698,7 +1766,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_folder" sequence="13"/>
+        <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
 
         <!-- Account Tax Code Templates -->
         <record id="view_tax_code_template_tree" model="ir.ui.view">
@@ -1736,7 +1804,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_folder" sequence="14"/>
+        <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
 
 
         <!--  Wizard for Multi Charts of Accounts -->
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 8b093fb2310..f71c81b48ca 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -33,7 +33,7 @@
  -->
 
         <!-- automatic reconcile -->
-        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+<!--        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>-->
     <!--    <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
         <menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>-->
 
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index e1e43420d6e..72004afa944 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -57,7 +57,7 @@
         <menuitem
             action="action_account_fiscal_position_form"
             id="menu_action_account_fiscal_position_form"
-            parent="account.menu_finance_accounting" sequence="20"/>
+            parent="next_id_27" sequence="20"/>
 
         <!--
         Partners Extension
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index b4a7b67a05a..1d74edb3f3a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -101,7 +101,7 @@
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic"/>
 
 		<record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
@@ -114,7 +114,7 @@
         </record>
 
         <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
-            <field name="name">Analytic Chart of Accounts</field>
+            <field name="name">Chart of Analytic Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="domain">[('parent_id','=',False)]</field>
@@ -122,10 +122,10 @@
              <field name="view_mode">form,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        <menuitem
-            action="action_account_analytic_account_tree2"
-            id="account_analytic_def_chart"
-            parent="account_analytic_def_account"/>
+<!--        <menuitem-->
+<!--            action="action_account_analytic_account_tree2"-->
+<!--            id="account_analytic_def_chart"-->
+<!--            parent="account_analytic_def_account"/>-->
 <!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
 
 <!--		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
@@ -206,14 +206,14 @@
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-       <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>
-        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
+<!--       <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>-->
+<!--        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>-->
           <!-- Entries by Line -->
 
-         <menuitem  icon="STOCK_JUSTIFY_FILL"
-          action="action_project_account_analytic_line_form"
-          id="account_entries_analytic_entries"
-          parent="next_id_41"/>
+<!--         <menuitem  icon="STOCK_JUSTIFY_FILL"-->
+<!--          action="action_project_account_analytic_line_form"-->
+<!--          id="account_entries_analytic_entries"-->
+<!--          parent="next_id_41"/>-->
 
         <record id="action_account_tree1" model="ir.actions.act_window">
             <field name="name">Analytic Entries</field>
@@ -293,31 +293,49 @@
             </field>
         </record>
         <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
-            <field name="name">Analytic Journal Definition</field>
+            <field name="name">Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.menu_analytic_accounting"/>
+        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
 
         #
         # Open journal entries
         #
 
         <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">Entries of Open Analytic Journals</field>
+            <field name="name">Analytic Journal Items</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('journal_id','=',active_id)]</field>
         </record>
-        <record id="ir_open_account_journal_analytic" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'account.analytic.journal'" name="model"/>
-            <field name="name">Open Analytic Journal</field>
-            <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>
-            <field eval="True" name="object"/>
+        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+            <field name="name">Check Register</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('journal_id','=',active_id)]</field>
+        </record>
+<!--        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
+        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+            <field name="name">Checks Register</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('journal_id','=',active_id)]</field>
         </record>
+<!--        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
+        
+<!--        <record id="ir_open_account_journal_analytic" model="ir.values">-->
+<!--            <field eval="'tree_but_open'" name="key2"/>-->
+<!--            <field eval="'account.analytic.journal'" name="model"/>-->
+<!--            <field name="name">Open Analytic Journal</field>-->
+<!--            <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>-->
+<!--            <field eval="True" name="object"/>-->
+<!--        </record>-->
 
         #
         # Reporting
@@ -331,13 +349,13 @@
         <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
 
 
-        <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">
-            <field name="name">Analytic Entries by Journal</field>
-            <field name="res_model">account.analytic.journal</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_account_analytic_journal_tree"/>
-        </record>
-        <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>
+<!--        <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">-->
+<!--            <field name="name">Analytic Entries by Journal</field>-->
+<!--            <field name="res_model">account.analytic.journal</field>-->
+<!--            <field name="view_type">tree</field>-->
+<!--            <field name="view_id" ref="view_account_analytic_journal_tree"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>-->
 
         #
         # Statistics
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9711fc9b941..76b10e8745c 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -43,7 +43,7 @@
  	   		name="Automatic reconciliation"
  	   		action="action_account_automatic_reconcile"
  			id="menu_automatic_reconcile"
- 			parent="next_id_20"/>
+ 			parent="periodical_processing_reconciliation"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index e8db5193275..20547cde235 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
-            <field name="name">Generate Fiscal Year Opening Entries</field>
+            <field name="name">Generate Opening Entries</field>
             <field name="res_model">account.fiscalyear.close</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 7a25932bb98..c3a9e4ad75a 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -32,10 +32,10 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem icon="STOCK_JUSTIFY_FILL"
-        	action="action_account_move_journal_line_form"
-        	id="menu_action_move_journal_line_form"
-        	parent="account.menu_finance_entries" sequence="5" />
+<!--        <menuitem icon="STOCK_JUSTIFY_FILL"-->
+<!--        	action="action_account_move_journal_line_form"-->
+<!--        	id="menu_action_move_journal_line_form"-->
+<!--        	parent="account.menu_finance_entries" sequence="5" />-->
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index dbd25408fe1..795ae925ef9 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -32,7 +32,7 @@
         </record>
 
         <menuitem action="action_account_reconcile_select"
-        	id="menu_reconcile_select" parent="account.next_id_20" />
+        	id="menu_reconcile_select" parent="periodical_processing_reconciliation" />
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 7d10c02f010..50449b36d2f 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -32,7 +32,7 @@
         </record>
 
         <menuitem action="action_account_unreconcile_select"
-        	id="menu_unreconcile_select" parent="account.next_id_20" />
+        	id="menu_unreconcile_select" parent="periodical_processing_reconciliation" />
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c5269939e0c..421d3a319e4 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -29,9 +29,9 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_open_closed_fiscalyear"
-        	id="menu_wizard_open_closed_fy"  sequence="2"
-        	parent="account.menu_account_end_year_treatments" />
+<!--        <menuitem action="action_account_open_closed_fiscalyear"-->
+<!--        	id="menu_wizard_open_closed_fy"  sequence="2"-->
+<!--        	parent="account.menu_account_end_year_treatments" />-->
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 252865f322e..cfe91171621 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -32,7 +32,7 @@
            	<field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" />
+<!--        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" />-->
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index fec632c2e59..a5720e3a0b4 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -39,8 +39,8 @@
             <field name="model">account.move.line</field>
 		</record>
 
-		<menuitem action="action_view_account_use_model" name="Create Entries From Models"
-					parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
+<!--		<menuitem action="action_view_account_use_model" name="Create Entries From Models"-->
+<!--					parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
 
 		<record id="view_account_use_model_open_entry" model="ir.ui.view">
             <field name="name">account.use.model.open.entry.form</field>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 27ca48662bc..8e006bf171f 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -34,7 +34,7 @@
 
         <menuitem
 	        name="Validate Ledger Postings"
-	        parent="account.menu_finance_periodical_processing"
+	        parent="periodical_processing_journal_entries_validation"
 	        action="action_validate_account_move"
 	        id="menu_validate_account_moves"
 	       />
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index b94afdc9292..6eda0241eea 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -42,10 +42,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem
-            action="action_analytic_default_form"
-            id="menu_analytic_defaul_form"
-            parent="account.menu_analytic_accounting"/>
+<!--        <menuitem-->
+<!--            action="action_analytic_default_form"-->
+<!--            id="menu_analytic_defaul_form"-->
+<!--            parent="account.menu_analytic_accounting"/>-->
 
         <act_window
             domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 55afe582445..656b9105210 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -129,10 +129,10 @@
         src_model="account.analytic.plan"
         id="account_analytic_instance_model_open"/>
 
-    <menuitem
-        name="Analytic Distribution's models" parent="account.account_def_analytic_journal"
-        id="menu_account_analytic_plan_instance_action"
-        action="account_analytic_plan_instance_action"/>
+<!--    <menuitem-->
+<!--        name="Analytic Distribution's models" parent="account.account_def_analytic_journal"-->
+<!--        id="menu_account_analytic_plan_instance_action"-->
+<!--        action="account_analytic_plan_instance_action"/>-->
 
     <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
         <field name="name">account.analytic.plan.instance.line.form</field>
@@ -192,11 +192,16 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem
-        parent="account.account_analytic_def_account"
-        id="menu_account_analytic_plan_action"
-        action="account_analytic_plan_form_action"/>
+	
+	<menuitem
+        parent="account.menu_analytic"
+        name="Multi Plans"
+        id="menu_account_analytic_multi_plan_action"
+        />
+     <menuitem
+         parent="menu_account_analytic_multi_plan_action"
+         id="menu_account_analytic_plan_action"
+         action="account_analytic_plan_form_action"/>	
 
     <record model="ir.ui.view" id="account_analytic_plan_line_form">
         <field name="name">account.analytic.plan.line.form</field>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 6eb6988480d..0095d950f76 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -108,18 +108,29 @@
             </field>
         </record>
         
-        <!--  Receipt Vouchers -->
+         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-            <field name="name">Voucher Entries</field>
+            <field name="name">Customer Vouchers</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
-<!--            <field name="domain">[('type','like','rec_voucher')]</field>-->
-<!--            <field name="context">{'type':'rec_voucher'}</field>-->
+            <field name="domain">[('journal_id.type','=','sale')]</field>
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
-        action="action_receipt_vou_voucher_list" parent="account.menu_finance_entries" sequence="8"/>
+        action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="8"/>
+        
+        <!--  Purchase Vouchers -->
+        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
+            <field name="name">Vendor Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('journal_id.type','=','purchase')]</field>
+        </record>
+        <menuitem id="menu_action_pay_vou_voucher_list"
+        action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="8"/>
 
 <!--        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
 <!--            <field name="name">Cash Receipt</field>-->