[MOD] Modification done according to New Finance Management menu structure.

bzr revid: vir@tinyerp.com-20100109084631-8k3gpl6wr0avhqc9

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index be02eb0..9ca09af 100644 (file)
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -360,7 +360,7 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
-        <menuitem action="action_invoice_tree" id="menu_finance_invoice" parent="account.menu_finance"/>
+        <menuitem action="action_invoice_tree" 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>

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 97cf55e..f1dda33 100644 (file)
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -3,16 +3,17 @@
     <data>
 
         <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
+        <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_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
-        <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/>
+        <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_entries" name="Making Entries" parent="account.menu_finance" sequence="2"
+        <menuitem id="menu_finance_entries" name="Accounting" parent="account.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"/>
 

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 83b186b..9485185 100644 (file)
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -28,8 +28,8 @@
 
         <menuitem
             id="menu_tax_report"
-            name="Taxes Reports"
-            parent="account.menu_finance_reporting"/>
+            name="Taxes"
+            parent="account.menu_finance_generic_reporting" sequence="3"/>
 
         <wizard
             id="wizard_vat_declaration"

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c3df794..9b12f68 100644 (file)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -955,7 +955,7 @@
             <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_reporting"/>
+        <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">
@@ -991,7 +991,7 @@
         </record>
         <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="7"/>
+        <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"/>
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
 
@@ -1111,7 +1111,7 @@
             <field name="res_model">account.journal.period</field>
             <field name="view_type">tree</field>
         </record>
-        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_reporting"/>
+        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
 
 
         <!--

diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index d827055..bd03390 100644 (file)
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -67,7 +67,7 @@
 
         <!-- Aged partner balance -->
         <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
-        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_reporting"/>
+        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
         <menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
 
         <!-- report-related wizards -->
@@ -114,7 +114,7 @@
 
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
                <menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
-        
+
         <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>
     </data>
 </openerp>

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index b66baa7..7ffb93f 100644 (file)
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -129,7 +129,7 @@
                <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
 
-        <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/>
+        <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
         <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">

diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index a8d03be..86516f3 100644 (file)
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -7,7 +7,7 @@
             <field name="res_model">account.budget.post</field>
             <field name="view_type">tree</field>
         </record>
-        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_reporting"/>
+        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
 
         <!--
     Budgets
@@ -57,8 +57,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_budget_post_tree"/>
         </record>
-        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance"/>
-        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
+        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
+        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31" sequence="2"/>
 
 
         <record model="ir.ui.view" id="view_budget_post_form">
@@ -70,7 +70,7 @@
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
                     <field name="company_id"  groups="base.group_multi_company"/>
-                    <field name="sequence" select="2"/>                    
+                    <field name="sequence" select="2"/>
                     <notebook colspan="4">
                         <page string="Accounts">
                             <field name="account_ids" colspan="4" nolabel="1"/>
@@ -187,7 +187,7 @@
         </record>
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"
-            action="act_crossovered_budget_view" />
+            action="act_crossovered_budget_view" sequence="1" />
 
         <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
             <field name="name">crossovered.budget.line.tree</field>

diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 863cd0e..cf481f5 100644 (file)
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -36,7 +36,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_main" name="Payment" parent="account.menu_finance"/>
+        <menuitem id="menu_main" name="Payment" parent="account.menu_finance" sequence="6"/>
 
         <record id="view_payment_type_form" model="ir.ui.view">
             <field name="name">payment.type.form</field>
@@ -51,7 +51,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_payment_type_tree" model="ir.actions.act_window">
             <field name="name">Payment Type</field>
             <field name="res_model">payment.type</field>
@@ -91,11 +91,11 @@
         </record>
 
                <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
-        
+
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
-        
+
         <menuitem action="action_payment_type_tree" id="menu_action_paymen_type" parent="next_id_44"/>
-        
+
         <record id="view_payment_order_form" model="ir.ui.view">
             <field name="name">payment.order.form</field>
             <field name="model">payment.order</field>
@@ -144,7 +144,7 @@
                                 </page>
                             </notebook>
                         </form>
-                        <tree string="Payment Line"> 
+                        <tree string="Payment Line">
                             <field name="ml_inv_ref" />
                             <field name="partner_id" select="1"/>
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
@@ -201,7 +201,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_payment_order_open" model="ir.actions.act_window">
@@ -210,7 +210,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','open')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>
@@ -269,7 +269,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Payment Line"> 
+                <tree string="Payment Line">
                     <field name="order_id"/>
                     <field name="ml_inv_ref" />
                     <field name="ml_maturity_date"/>

diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index ff144d6..1ed898d 100644 (file)
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -91,7 +91,7 @@
             <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
 
-        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration"/>
+        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration" sequence="20"/>
 
         <record id="view_account_report_tree" model="ir.ui.view">
             <field name="name">account.report.report.tree</field>
@@ -116,7 +116,7 @@
             <field name="view_id" ref="view_account_report_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_reporting"/>
+        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_generic_reporting" sequence="5"/>
 
 
         <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">

diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index cc8a4af..d0f9520 100755 (executable)
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -16,7 +16,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_voucher_form">
             <field name="name">account.voucher.form</field>
             <field name="model">account.voucher</field>
@@ -69,7 +69,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_voucher_list">
             <field name="name">Vouchers</field>
             <field name="res_model">account.voucher</field>
@@ -77,9 +77,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
         </record>
-        <menuitem action="action_voucher_list" id="menu_action_voucher_list" 
-        name="Voucher Entries" parent="account.menu_finance"/>
-        
+        <menuitem action="action_voucher_list" id="menu_action_voucher_list"
+        name="Voucher Entries" parent="account.menu_finance_entries" sequence="60"/>
+
         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
             <field name="name">Receipt Vouchers</field>
@@ -90,9 +90,9 @@
             <field name="domain">[('type','like','rec_voucher')]</field>
             <field name="context">{'type':'rec_voucher'}</field>
         </record>
-        <menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list" 
+        <menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="menu_action_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
             <field name="name">Cash Receipt</field>
             <field name="res_model">account.voucher</field>
@@ -102,9 +102,9 @@
             <field name="domain">[('type','=','rec_voucher')]</field>
             <field name="context">{'type':'rec_voucher'}</field>
         </record>
-        <menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list" 
+        <menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list"
         action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
-                
+
         <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
             <field name="name">Bank Receipt</field>
             <field name="res_model">account.voucher</field>
@@ -114,12 +114,12 @@
             <field name="domain">[('type','=','bank_rec_voucher')]</field>
             <field name="context">{'type':'bank_rec_voucher'}</field>
         </record>
-        <menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list" 
+        <menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list"
         action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
-        
+
         <!--  End Receipt Vouchers -->
-        
-        
+
+
         <!-- Payment Vouchers -->
         <record model="ir.actions.act_window" id="action_payments_voucher_list">
             <field name="name">Payment Vouchers</field>
@@ -130,9 +130,9 @@
             <field name="domain">[('type','like','pay_voucher')]</field>
             <field name="context">{'type':'pay_voucher'}</field>
         </record>
-        <menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list" 
+        <menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list"
         action="action_payments_voucher_list" parent="menu_action_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
             <field name="name">Payment Vouchers</field>
             <field name="res_model">account.voucher</field>
@@ -142,9 +142,9 @@
             <field name="domain">[('type','=','pay_voucher')]</field>
             <field name="context">{'type':'pay_voucher'}</field>
         </record>
-        <menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list" 
+        <menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list"
         action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
             <field name="name">Payment Vouchers</field>
             <field name="res_model">account.voucher</field>
@@ -154,11 +154,11 @@
             <field name="domain">[('type','=','bank_pay_voucher')]</field>
             <field name="context">{'type':'bank_pay_voucher'}</field>
         </record>
-        <menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list" 
+        <menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list"
         action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>
-        
+
         <!-- End Payment Vouchers -->
-        
+
         <!-- Other Voucher Enries -->
         <record model="ir.actions.act_window" id="action_other_voucher_list">
             <field name="name">Other Vouchers</field>
@@ -167,9 +167,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
         </record>
-        <menuitem name="Other Vouchers" id="menu_action_other_voucher_list" 
+        <menuitem name="Other Vouchers" id="menu_action_other_voucher_list"
         action="action_other_voucher_list" parent="menu_action_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_cont_voucher_form">
             <field name="name">Contra Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -179,9 +179,9 @@
             <field name="domain">[('type','=','cont_voucher')]</field>
             <field name="context">{'type':'cont_voucher'}</field>
         </record>
-        <menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form" 
+        <menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form"
         action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
             <field name="name">Journal Sale Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -191,9 +191,9 @@
             <field name="domain">[('type','=','journal_sale_vou')]</field>
             <field name="context">{'type':'journal_sale_vou'}</field>
         </record>
-        <menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" 
+        <menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form"
         action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
             <field name="name">Journal Purchase Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -203,9 +203,9 @@
             <field name="domain">[('type','=','journal_pur_voucher')]</field>
             <field name="context">{'type':'journal_pur_voucher'}</field>
         </record>
-        <menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" 
+        <menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form"
         action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_jour_voucher_form">
             <field name="name">Journal Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -215,8 +215,8 @@
             <field name="domain">[('type','=','journal_voucher')]</field>
             <field name="context">{'type':'journal_voucher'}</field>
         </record>
-        <menuitem 
-            name="Journal Voucher" id="menu_action_view_jour_voucher_form" 
+        <menuitem
+            name="Journal Voucher" id="menu_action_view_jour_voucher_form"
             action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>
 
         </data>