menus changes for Financial management

bzr revid: mra@tinyerp.com-20080903065635-wpwpcfj1cthisgmo
This commit is contained in:
Mustufa Rangwala 2008-09-03 12:26:35 +05:30
parent d79a9838e7
commit 2b8dc94f9c
6 changed files with 63 additions and 53 deletions

View File

@ -7,7 +7,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"/>
<record id="view_account_fiscalyear_form" model="ir.ui.view">
<field name="name">account.fiscalyear.form</field>
<field name="model">account.fiscalyear</field>
@ -56,7 +57,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration"/><menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
<menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting"/><menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
<!--
Period
@ -144,7 +145,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_configuration"/>
<menuitem id="account_account_menu" name="Financial Accounts" parent="account.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">
@ -274,7 +275,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="next_id_25" name="Journal" parent="account.menu_finance_configuration"/>
<menuitem id="next_id_25" name="Financial Journals" parent="account.menu_finance_accounting"/>
<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="next_id_25"/>
<record id="view_bank_statement_tree" model="ir.ui.view">
@ -352,7 +353,7 @@
</field>
</record>
<record id="action_bank_statement_tree" model="ir.actions.act_window">
<field name="name">Statements</field>
<field name="name">Entries by Statements</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -524,7 +525,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_tax_code_tree"/>
</record>
<menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration"/>
<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"/>
@ -852,7 +853,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/>
</record>
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries"/><menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_accounting"/><menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
<record id="action_move_line_search" model="ir.actions.act_window">
<field name="name">Entry lines</field>
@ -1050,7 +1051,7 @@
<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_configuration"/><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_accounting"/><menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
<!--
@ -1131,7 +1132,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="next_id_32" name="Models" parent="account.menu_finance_configuration"/><menuitem action="action_model_form" id="menu_action_model_form" parent="next_id_32"/>
<menuitem id="next_id_32" name="Models" parent="account.menu_finance_accounting"/><menuitem action="action_model_form" id="menu_action_model_form" parent="next_id_32"/>
<!--
@ -1193,7 +1194,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="next_id_33" name="Payment Terms" parent="account.menu_finance_configuration"/><menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="next_id_33"/>
<menuitem id="next_id_33" name="Payment Terms" parent="account.menu_finance_accounting"/><menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="next_id_33"/>
<!--
# Account Subscriptions
@ -1501,7 +1502,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="account_account_template_menu" name="Templates" parent="account.menu_finance_configuration"/>
<menuitem id="account_account_template_menu" name="Templates of Accounts" parent="account.menu_finance_accounting"/>
<menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_account_template_menu"/>
<!-- Chart of Accounts Templates -->

View File

@ -4,9 +4,9 @@
<menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
<menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance" sequence="20"/>
<menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
<menuitem id="menu_finance_entries" name="Entries" parent="account.menu_finance" sequence="2"/>
<menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"/>
<wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Refund invoice"/>

View File

@ -75,8 +75,8 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
</record>
<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_finance_configuration"/>
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_account"/>
<!--<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"/>
<record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
<field name="name">Analytic Chart of Accounts</field>
@ -89,9 +89,18 @@
<menuitem
action="action_account_analytic_account_tree2"
id="account_analytic_def_chart"
parent="account.menu_analytic_account"/>
parent="account.account_analytic_def_account"/>
<menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
<record id="analytic_account_form" model="ir.actions.act_window">
<field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field eval="view_account_analytic_account_form" name="view_id"/>
</record>
<menuitem action="analytic_account_form" id="account_analytic_form" parent="account.account_analytic_def_account"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><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">

View File

@ -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_account"/>
<menuitem
action="action_analytic_default_form"
id="menu_analytic_defaul_form"
parent="account.account_analytic_def_account"/>
</data>
</terp>

View File

@ -184,7 +184,7 @@
</record>
<menuitem
parent="account.menu_analytic_account"
parent="account.account_analytic_def_account"
id="menu_account_analytic_plan_action"
action="account_analytic_plan_form_action"/>

View File

@ -17,7 +17,7 @@
</field>
</field>
</record>
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
@ -30,7 +30,7 @@
</field>
</field>
</record>
<record id="hr_timesheet_line_form2" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form2</field>
<field name="model">hr.analytic.timesheet</field>
@ -42,7 +42,7 @@
</field>
</field>
</record>
<record id="hr_timesheet_line_tree" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.tree</field>
<field name="model">hr.analytic.timesheet</field>
@ -54,22 +54,22 @@
</field>
</field>
</record>
<record id="hr_timesheet_line_tree2" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.tree2</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
<field name="account_id" position="replace">
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
</field>
</field>
</record>
<!-- Inherits for account analytic lines -->
<record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
<field name="name">account.analytic.line.tree.to_invoice</field>
<field name="model">account.analytic.line</field>
@ -81,7 +81,7 @@
</field>
</field>
</record>
<record id="view_account_analytic_line_form_inherit" model="ir.ui.view">
<field name="name">account.analytic.line.form.to_invoice</field>
<field name="model">account.analytic.line</field>
@ -93,7 +93,7 @@
</field>
</field>
</record>
<!-- Menus -->
<record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
<field name="name">Entries to invoice</field>
@ -103,9 +103,9 @@
<field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
</record>
<menuitem action="action_hr_analytic_timesheet_open_tree" id="menu_hr_analytic_timesheet_tree" parent="account.menu_finance_periodical_processing"/>
<record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
<field name="name">Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
@ -114,9 +114,9 @@
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
</record>
<menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="menu_hr_analytic_timesheet_tree"/>
<record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
<field name="name">My Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
@ -125,8 +125,8 @@
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
</record>
<menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="menu_hr_analytic_timesheet_tree"/>
<record id="action_open_analytic_accounts" model="ir.actions.act_window">
<field name="name">Open Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
@ -135,8 +135,8 @@
<field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view')]</field>
</record>
<menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="account.account_analytic_def_chart"/>
<record id="action_open_invoice_analytic_accounts" model="ir.actions.act_window">
<field name="name">Unclosed Invoiceable Accounts</field>
<field name="res_model">account.analytic.account</field>
@ -145,9 +145,9 @@
<field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view'),('pricelist_id','&lt;&gt;',False)]</field>
</record>
<menuitem action="action_open_invoice_analytic_accounts" id="menu_action_open_invoice_analytic_accounts" parent="hr_timesheet_invoice.menu_action_open_analytic_accounts"/>
<record id="action_draft_analytic_accounts" model="ir.actions.act_window">
<field name="name">Draft Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
@ -156,9 +156,9 @@
<field name="domain">[('state','=','draft'),('type','&lt;&gt;','view')]</field>
</record>
<menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="account.account_analytic_def_chart"/>
<record id="action_pending_analytic_accounts" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
@ -167,11 +167,11 @@
<field name="domain">[('state','=','pending'),('type','&lt;&gt;','view')]</field>
</record>
<menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="account.account_analytic_def_chart"/>
<record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.form</field>
<field name="model">hr_timesheet_invoice.factor</field>
@ -203,7 +203,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
</record>
<menuitem action="action_hr_timesheet_invoice_factor_form" id="hr_timesheet_invoice_factor_view" parent="account.menu_analytic_account"/>
<menuitem action="action_hr_timesheet_invoice_factor_form" id="hr_timesheet_invoice_factor_view" parent="account.account_analytic_def_account"/>
</data>
</terp>