<openerp>
<data>
- <!--
- Fiscal Year
- -->
-
+ <!-- Fiscal Year -->
<record id="view_account_fiscalyear_form" model="ir.ui.view">
<field name="name">account.fiscalyear.form</field>
<field name="model">account.fiscalyear</field>
</search>
</field>
</record>
- <record id="action_account_fiscalyear_form" model="ir.actions.act_window">
+ <record id="action_account_fiscalyear" model="ir.actions.act_window">
<field name="name">Fiscal Years</field>
<field name="res_model">account.fiscalyear</field>
<field name="view_type">form</field>
</field>
</record>
<menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
- <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
-
- <!--
- Period
- -->
+ <menuitem id="menu_action_account_fiscalyear" action="action_account_fiscalyear" parent="next_id_23"/>
+ <!-- Period -->
<record id="view_account_period_form" model="ir.ui.view">
<field name="name">account.period.form</field>
<field name="model">account.period</field>
<form string="Account Period" version="7.0">
<header>
<button string="Close Period" name="%(account.action_account_period_close)d" type="action" class="oe_highlight" states="draft"/>
- <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
+ <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
<field name="state" widget="statusbar" nolabel="1"/>
</header>
<sheet>
</tree>
</field>
</record>
-
<record id="view_account_period_search" model="ir.ui.view">
<field name="name">account.period.search</field>
<field name="model">account.period</field>
</search>
</field>
</record>
-
- <record id="action_account_period_form" model="ir.actions.act_window">
+ <record id="action_account_period" model="ir.actions.act_window">
<field name="name">Periods</field>
<field name="res_model">account.period</field>
<field name="view_type">form</field>
</p>
</field>
</record>
- <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23" groups="base.group_no_one"/>
+ <menuitem id="menu_action_account_period" action="action_account_period" parent="account.next_id_23"/>
-
- <!--
- Accounts
- -->
+ <!-- Accounts -->
<record id="view_account_form" model="ir.ui.view">
<field name="name">account.account.form</field>
<field name="model">account.account</field>
</form>
</field>
</record>
-
- <record id="view_account_search" model="ir.ui.view">
- <field name="name">account.account.search</field>
- <field name="model">account.account</field>
- <field name="arch" type="xml">
- <search string="Accounts">
- <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
- <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
- <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
- <field name="user_type"/>
- <group expand="0" string="Group By...">
- <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
- <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
- <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
- </group>
- </search>
- </field>
- </record>
-
<record id="view_account_list" model="ir.ui.view">
<field name="name">account.account.list</field>
<field name="model">account.account</field>
</tree>
</field>
</record>
+ <record id="view_account_search" model="ir.ui.view">
+ <field name="name">account.account.search</field>
+ <field name="model">account.account</field>
+ <field name="arch" type="xml">
+ <search string="Accounts">
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+ <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
+ <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+ <field name="user_type"/>
+ <group expand="0" string="Group By...">
+ <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+ <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
+ <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
<record id="action_account_form" model="ir.actions.act_window">
<field name="name">Accounts</field>
<field name="res_model">account.account</field>
<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"/>
+ <act_window
+ id="act_account_acount_move_line_open_unreconciled"
+ name="Unreconciled Entries"
+ res_model="account.move.line"
+ context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
+ src_model="account.account"/>
+
<record id="view_account_tree" model="ir.ui.view">
<field name="name">account.account.tree</field>
<field name="model">account.account</field>
<field name="view_id" ref="view_account_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
-
<record id="view_account_gain_loss_tree" model="ir.ui.view">
<field name="name">Unrealized Gain or Loss</field>
<field name="model">account.account</field>
</tree>
</field>
</record>
-
<record id="action_account_gain_loss" model="ir.actions.act_window">
<field name="name">Unrealized Gain or Loss</field>
<field name="res_model">account.account</field>
</p>
</field>
</record>
-
<menuitem
name="Unrealized Gain or Loss"
action="action_account_gain_loss"
id="menu_unrealized_gains_losses"
parent="account.menu_multi_currency"/>
- <!--
- # Account Journal
- -->
+ <act_window
+ id="action_move_line_select"
+ name="Journal Items"
+ context="{'search_default_account_id': [active_id]}"
+ res_model="account.move.line"
+ src_model="account.account"/>
+
+ <!-- Enable drill-down from Chart Of Accounts tree view -->
+ <act_window
+ id="action_account_items"
+ name="Journal Items"
+ context="{'search_default_account_id': [active_id]}"
+ res_model="account.move.line"
+ src_model="account.account"
+ key2="tree_but_open"/>
+ <!-- Account Journal -->
<record id="view_account_journal_tree" model="ir.ui.view">
<field name="name">account.journal.tree</field>
<field name="model">account.journal</field>
</search>
</field>
</record>
-
<record id="view_account_journal_form" model="ir.ui.view">
<field name="name">account.journal.form</field>
<field name="model">account.journal</field>
<group string="Accounts">
<field name="profit_account_id" domain="[('type','!=','view')]"/>
<field name="loss_account_id" domain="[('type','!=','view')]"/>
- <field name="internal_account_id"/>
+ <field name="internal_account_id" domain="[('type','!=','view')]"/>
</group>
<group string="Miscellaneous">
<field name="with_last_closing_balance"/>
- <field name="cash_control"/>
+ <field name="cash_control" attrs="{'invisible':[('type','not in', ('cash',))]}"/>
</group>
</group>
- <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
- <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
+ <separator string="Available Coins" colspan="4" attrs="{'invisible' : ['|',('cash_control', '=', False),('type','not in', ('cash',))] }"/>
+ <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : ['|',('cash_control', '=', False),('type','not in', ('cash',))]}">
<tree string="CashBox Lines" editable="bottom">
<field name="pieces" />
</tree>
</form>
</field>
</record>
-
<record id="action_account_journal_form" model="ir.actions.act_window">
<field name="name">Journals</field>
<field name="res_model">account.journal</field>
</record>
<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_journals"/>
+ <act_window
+ id="act_account_journal_2_account_bank_statement"
+ name="Bank statements"
+ context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+ res_model="account.bank.statement"
+ src_model="account.journal"/>
+
+ <act_window
+ id="act_account_journal_2_account_move_line"
+ name="Journal Items"
+ context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+ res_model="account.move.line"
+ src_model="account.journal"/>
+
+ <!-- Bank statement -->
<record id="view_account_bank_statement_filter" model="ir.ui.view">
<field name="name">account.cash.statement.select</field>
<field name="model">account.bank.statement</field>
<record id="view_bank_statement_form" model="ir.ui.view">
<field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field>
+ <field name="priority">1</field>
<field name="arch" type="xml">
<form string="Bank Statement" version="7.0">
<header>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_highlight"/>
<button name="button_dummy" states="draft" string="Compute" type="object" class="oe_highlight"/>
- <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
+ <button name="button_cancel" states="confirm" string="Cancel Statement" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
<div class="oe_right oe_button_box" name="import_buttons">
<!-- Put here related buttons -->
</div>
- <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
- <h1>
- <field name="name" attrs="{'invisible':[('name','=','/')]}"/>
- </h1>
+ <label for="name" class="oe_edit_only"/>
+ <h1><field name="name"/></h1>
<group>
<group>
<field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
<field name="date"/>
<field name="name"/>
<field name="ref"/>
- <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="['|',('parent_id','=',False),('is_company','=',True)]"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
<field name="filter" eval="True"/>
</record>
- <!--
- Account Types
- -->
+ <!-- Account Types -->
<record id="view_account_type_search" model="ir.ui.view">
<field name="name">account.account.type.search</field>
<field name="model">account.account.type</field>
</search>
</field>
</record>
-
<record id="view_account_type_tree" model="ir.ui.view">
<field name="name">account.account.type.tree</field>
<field name="model">account.account.type</field>
</tree>
</field>
</record>
-
<record id="view_account_type_form" model="ir.ui.view">
<field name="name">account.account.type.form</field>
<field name="model">account.account.type</field>
</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"/>
- <!--
- Entries
- -->
+
+ <!-- Entries -->
<record id="view_account_move_tree" model="ir.ui.view">
<field name="name">account.move.tree</field>
<field name="model">account.move</field>
</field>
</record>
- <!--
- Reconcile
- -->
-
+ <!-- Reconcile -->
<record id="view_move_reconcile_form" model="ir.ui.view">
<field name="name">account.move.reconcile.form</field>
<field name="model">account.move.reconcile</field>
</field>
</record>
- <!--
- Tax Codes
- -->
+ <!-- Tax Codes -->
<record id="view_tax_code_search" model="ir.ui.view">
<field name="name">account.tax.code.search</field>
<field name="model">account.tax.code</field>
</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="20"/>
+ <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
+
+ <act_window
+ id="action_tax_code_line_open"
+ name="Journal Items"
+ domain="[('tax_code_id','child_of',active_id),('state','<>','draft')]"
+ res_model="account.move.line"
+ src_model="account.tax.code"/>
+
+ <!-- Enable drill-down from Chart Of Taxes tree view -->
+ <act_window
+ id="action_tax_code_items"
+ name="Journal Items"
+ domain="[('tax_code_id','child_of',active_id),('state','!=','draft')]"
+ res_model="account.move.line"
+ src_model="account.tax.code"
+ key2="tree_but_open"/>
- <!--
- Tax
- -->
+ <!-- Tax -->
<record id="view_tax_tree" model="ir.ui.view">
<field name="name">account.tax.tree</field>
<field name="model">account.tax</field>
</group>
<group string="Invoices">
<field name="account_collected_id" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="account_analytic_collected_id" domain="[('type','<>','view'), ('company_id', '=', company_id), ('parent_id', '<>', False)]" groups="analytic.group_analytic_accounting"/>
+ <field name="account_analytic_collected_id" domain="[('type','<>','view'), ('company_id', '=', company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="base_code_id"/>
<field name="base_sign"/>
</group>
<group string="Refunds">
<field name="account_paid_id" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="account_analytic_paid_id" domain="[('type','<>','view'), ('company_id', '=', company_id), ('parent_id', '<>', False)]" groups="analytic.group_analytic_accounting"/>
+ <field name="account_analytic_paid_id" domain="[('type','<>','view'), ('company_id', '=', company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="ref_base_code_id"/>
<field name="ref_base_sign"/>
<field name="view_id" ref="view_tax_code_tree"/>
</record>
- <!--
- Entries lines
- -->
-
- <record id="view_move_line_tree_reconcile" model="ir.ui.view">
- <field name="model">account.move.line</field>
- <field eval="24" name="priority"/>
- <field name="arch" type="xml">
- <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
- <field name="date"/>
- <field name="move_id"/>
- <field name="ref"/>
- <field name="name"/>
- <field name="partner_id"/>
- <field name="account_id"/>
- <field name="reconcile_partial_id"/>
- <field name="state" invisible="1"/>
- <field name="debit" sum="Total debit"/>
- <field name="credit" sum="Total credit"/>
- </tree_account_reconciliation>
- </field>
- </record>
-
- <record id="view_move_line_tree" model="ir.ui.view">
- <field name="name">account.move.line.tree</field>
- <field name="model">account.move.line</field>
- <field eval="4" name="priority"/>
- <field name="arch" type="xml">
- <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
- <field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
- <field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
- <field name="date"/>
- <field name="name"/>
- <field name="ref"/>
- <field name="statement_id" invisible="1"/>
- <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
- <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id)"/>
- <field name="date_maturity" invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund']"/>
- <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
- <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
- <field name="move_id" required="0"/>
- <field name="debit" sum="Total Debit"/>
- <field name="credit" sum="Total Credit"/>
- <field name="reconcile"/>
- <field name="invoice" invisible="1"/>
- <field name="amount_currency" readonly="True" invisible="not context.get('currency',False)"/>
- <field name="currency_id" readonly="True" invisible="not context.get('currency',False)" />
- <field name="state" />
- <field name="company_id" invisible="1"/>
- </tree>
- </field>
- </record>
-
+ <!-- Journal Items -->
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account.move.line.form</field>
<field name="model">account.move.line</field>
<field name="blocked"/>
</group>
<group groups="analytic.group_analytic_accounting" string="Analytic">
- <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+ <field name="analytic_account_id" domain="[('type','in',('normal','contract'))]"/>
</group>
</group>
<field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
</form>
</field>
</record>
-
<record id="view_move_line_form2" model="ir.ui.view">
<field name="name">account.move.line.form2</field>
<field name="model">account.move.line</field>
<field name="blocked"/>
<newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/>
- <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<separator colspan="4" string="Status"/>
<newline/>
<field name="reconcile_id"/>
</form>
</field>
</record>
-
+ <record id="view_move_line_tree" model="ir.ui.view">
+ <field name="name">account.move.line.tree</field>
+ <field name="model">account.move.line</field>
+ <field eval="1" name="priority"/>
+ <field name="arch" type="xml">
+ <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
+ <field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
+ <field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
+ <field name="date"/>
+ <field name="name"/>
+ <field name="ref"/>
+ <field name="statement_id" invisible="1"/>
+ <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+ <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id)"/>
+ <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
+ <field name="move_id" required="0"/>
+ <field name="debit" sum="Total Debit"/>
+ <field name="credit" sum="Total Credit"/>
+ <field name="date_maturity" invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund']"/>
+ <field name="reconcile"/>
+ <field name="invoice" invisible="1"/>
+ <field name="amount_currency" readonly="True" invisible="not context.get('currency',False)"/>
+ <field name="currency_id" readonly="True" invisible="not context.get('currency',False)" />
+ <field name="state" invisible="1"/>
+ <field name="company_id" invisible="1"/>
+ </tree>
+ </field>
+ </record>
<record id="account_move_line_graph" model="ir.ui.view">
<field name="name">account.move.line.graph</field>
<field name="model">account.move.line</field>
</graph>
</field>
</record>
-
<record id="view_account_move_line_filter" model="ir.ui.view">
<field name="name">Journal Items</field>
<field name="model">account.move.line</field>
<field name="arch" type="xml">
<search string="Search Journal Items">
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
<field name="date"/>
<filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
<separator/>
</search>
</field>
</record>
-
<record id="action_account_moves_all_a" model="ir.actions.act_window">
<field name="context">{'journal_type':'general'}</field>
<field name="name">Journal Items</field>
<field name="res_model">account.move.line</field>
<field name="view_id" ref="view_move_line_tree"/>
- <field name="view_mode">tree_account_move_line_quickadd</field>
- <field name="search_view_id" ref="view_account_move_line_filter"/>
+ <field name="view_mode">tree_account_move_line_quickadd,form</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Select the period and the journal you want to fill.
</p>
</field>
</record>
-
<menuitem
action="action_account_moves_all_a"
icon="STOCK_JUSTIFY_FILL"
groups="group_account_user"
/>
- <record id="action_view_move_line" model="ir.actions.act_window">
- <field name="name">Lines to reconcile</field>
- <field name="res_model">account.move.line</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('account_id.reconcile', '=', True),('reconcile_id','=',False)]</field>
- <field eval="False" name="view_id"/>
- <field eval="True" name="filter"/>
- <field name="search_view_id" ref="view_account_move_line_filter"/>
+ <record id="view_move_line_tree_reconcile" model="ir.ui.view">
+ <field name="model">account.move.line</field>
+ <field eval="24" name="priority"/>
+ <field name="arch" type="xml">
+ <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+ <field name="date"/>
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="name"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="period_id" invisible="1"/>
+ <field name="journal_id" invisible="1"/>
+ <field name="reconcile_partial_id"/>
+ <field name="state" invisible="1"/>
+ <field name="debit" sum="Total debit"/>
+ <field name="credit" sum="Total credit"/>
+ </tree_account_reconciliation>
+ </field>
</record>
-
- <record id="action_move_line_select" model="ir.actions.act_window">
- <field name="name">Journal Items</field>
+ <record id="action_account_manual_reconcile" model="ir.actions.act_window">
+ <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
+ <field name="name">Journal Items to Reconcile</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="context">{'search_default_account_id': [active_id]}</field>
- </record>
-
- <record id="ir_account_move_line_select" model="ir.values">
- <field name="key2">tree_but_open</field>
- <field name="model">account.account</field>
- <field name="name">Open Journal Items</field>
- <field eval="'ir.actions.act_window,%d'%action_move_line_select" name="value"/>
+ <field name="view_id" ref="view_move_line_tree_reconcile"/>
+ <field name="view_mode">tree_account_reconciliation</field>
+ <field name="help" type="html">
+ <p>
+ No journal items found.
+ </p>
+ </field>
</record>
- <!--
- Account.Entry Edition
- -->
+ <menuitem
+ name="Manual Reconciliation"
+ action="action_account_manual_reconcile"
+ id="menu_manual_reconcile"
+ parent="account.periodical_processing_reconciliation"/>
+ <!-- Account.Entry Edition -->
<record id="view_move_tree" model="ir.ui.view">
<field name="name">account.move.tree</field>
<field name="model">account.move</field>
<form string="Account Entry" version="7.0">
<header>
<button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
- <button name="button_cancel" states="posted" string="Cancel" type="object" groups="account.group_account_invoice"/>
+ <button name="button_cancel" states="posted" string="Cancel Entry" type="object" groups="account.group_account_invoice"/>
<field name="state" widget="statusbar"/>
</header>
<sheet string="Journal Entries" >
</group>
<group groups="analytic.group_analytic_accounting" string="Analytic">
- <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+ <field name="analytic_account_id"/>
</group>
</group>
<separator string="Internal Note"/>
<field name="date_maturity"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
- <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="amount_currency"/>
<field name="currency_id" groups="base.group_multi_currency"/>
<field name="tax_code_id"/>
</form>
</field>
</record>
-
<record id="view_account_move_filter" model="ir.ui.view">
<field name="name">account.move.select</field>
<field name="model">account.move</field>
</search>
</field>
</record>
-
<record id="action_move_journal_line" model="ir.actions.act_window">
<field name="name">Journal Entries</field>
<field name="res_model">account.move</field>
</p>
</field>
</record>
-
<menuitem
icon="STOCK_JUSTIFY_FILL"
action="action_move_journal_line"
<act_window
id="act_account_move_to_account_move_line_open"
name="Journal Items"
- context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
+ context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
res_model="account.move.line"
src_model="account.move"/>
-
- <record id="action_account_manual_reconcile" model="ir.actions.act_window">
- <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
- <field name="name">Journal Items to Reconcile</field>
- <field name="res_model">account.move.line</field>
- <field name="view_id" ref="view_move_line_tree_reconcile"/>
- <field name="view_mode">tree_account_reconciliation</field>
- <field name="help" type="html">
- <p>
- No journal items found.
- </p>
- </field>
- </record>
-
- <menuitem
- name="Journal Items to Reconcile"
- action="action_account_manual_reconcile"
- id="menu_manual_reconcile_bank"
- sequence="20"
- parent="account.menu_finance_bank_and_cash"/>
-
- <menuitem
- name="Manual Reconciliation"
- action="action_account_manual_reconcile"
- id="menu_manual_reconcile"
- parent="account.periodical_processing_reconciliation"/>
-
-
- <act_window
- id="act_account_acount_move_line_open"
- name="Entries"
- context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
- res_model="account.move.line"
- src_model="account.account"/>
-
- <act_window
- id="act_account_acount_move_line_open_unreconciled"
- name="Unreconciled Entries"
- res_model="account.move.line"
- context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
- src_model="account.account"/>
-
<act_window
domain="[('reconcile_id', '=', active_id)]"
id="act_account_acount_move_line_reconcile_open"
res_model="account.move.line"
src_model="account.move.reconcile"/>
-
- <!--
- TODO:
- Print Journal (and change state)
- Close Journal (and verify that there is no draft Entry Lines)
--->
-
+ <!-- TODO: Print Journal (and change state), Close Journal (and verify that there is no draft Entry Lines) -->
<record id="view_journal_period_tree" model="ir.ui.view">
<field name="name">account.journal.period.tree</field>
<field name="model">account.journal.period</field>
<field name="view_type">tree</field>
</record>
- <!--
- # Account Models
- -->
-
+ <!-- Account Models -->
<record id="view_model_line_tree" model="ir.ui.view">
<field name="name">account.model.line.tree</field>
<field name="model">account.model.line</field>
</tree>
</field>
</record>
-
-
<record id="view_model_line_form" model="ir.ui.view">
<field name="name">account.model.line.form</field>
<field name="model">account.model.line</field>
</form>
</field>
</record>
-
<record id="view_model_form" model="ir.ui.view">
<field name="name">account.model.form</field>
<field name="model">account.model</field>
</form>
</field>
</record>
-
<record id="view_model_tree" model="ir.ui.view">
<field name="name">account.model.tree</field>
<field name="model">account.model</field>
</tree>
</field>
</record>
-
<record id="view_model_search" model="ir.ui.view">
<field name="name">account.model.search</field>
<field name="model">account.model</field>
<field name="search_view_id" ref="view_model_search"/>
</record>
<menuitem
- action="action_model_form" id="menu_action_model_form" sequence="5"
- parent="account.menu_configuration_misc"/>
-
- <!--
- # Payment Terms
- -->
+ action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
+ parent="account.menu_finance_recurrent_entries"/>
+ <!-- Payment Terms -->
<record id="view_payment_term_line_tree" model="ir.ui.view">
<field name="name">account.payment.term.line.tree</field>
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<tree string="Payment Term">
- <field name="sequence"/>
- <field name="name"/>
<field name="value"/>
- <field name="value_amount"/>
+ <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
<field name="days"/>
<field name="days2"/>
</tree>
</field>
</record>
-
-
<record id="view_payment_term_line_form" model="ir.ui.view">
<field name="name">account.payment.term.line.form</field>
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<form string="Payment Term" version="7.0">
<group>
- <field name="name"/>
- <field name="sequence"/>
- </group>
- <group>
<group string="Amount Computation">
- <field name="value"/>
- <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
+ <field name="value"/>
+ <label for="value_amount" string="Amount To Pay" attrs="{'invisible':[('value','=','balance')]}"/>
+ <div attrs="{'invisible':[('value','=','balance')]}">
+ <field name="value_amount" class="oe_inline"/>
+ <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
+ </div>
</group>
<group string="Due Date Computation">
<field name="days"/>
<field name="days2"/>
</group>
</group>
-
- <separator string="Example"/>
- <label string="At 14 net days 2 percent, remaining amount at 30 days end of month."/>
- <group>
- <label string="Line 1:" colspan="2"/>
- <label string=" Valuation: Percent"/>
- <label string=" Number of Days: 14"/>
- <label string=" Value amount: 0.02"/>
- <label string=" Day of the Month: 0"/>
- </group>
- <group>
- <label string="Line 2:" colspan="2"/>
- <label string=" Valuation: Balance"/>
- <label string=" Number of Days: 30"/>
- <label string=" Value amount: n.a"/>
- <label string=" Day of the Month= -1"/>
- </group>
</form>
</field>
</record>
-
<record id="view_payment_term_search" model="ir.ui.view">
<field name="name">account.payment.term.search</field>
<field name="model">account.payment.term</field>
</search>
</field>
</record>
-
<record id="view_payment_term_form" model="ir.ui.view">
<field name="name">account.payment.term.form</field>
<field name="model">account.payment.term</field>
<field name="name"/>
<field name="active"/>
</group>
- <field name="note" placeholder="Note for the invoice..."/>
+ <field name="note" placeholder="Payment term explanation for the customer..."/>
<separator string="Computation"/>
<field name="line_ids"/>
</form>
</field>
</record>
-
<record id="action_payment_term_form" model="ir.actions.act_window">
<field name="name">Payment Terms</field>
<field name="res_model">account.payment.term</field>
<menuitem action="action_payment_term_form"
id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
- <!--
- # Account Subscriptions
- -->
-
+ <!-- Account Subscriptions -->
<record id="view_subscription_line_form" model="ir.ui.view">
<field name="name">account.subscription.line.form</field>
<field name="model">account.subscription.line</field>
</form>
</field>
</record>
-
<record id="view_subscription_line_tree" model="ir.ui.view">
<field name="name">account.subscription.line.tree</field>
<field name="model">account.subscription.line</field>
</tree>
</field>
</record>
-
<record id="view_subscription_tree" model="ir.ui.view">
<field name="name">account.subscription.tree</field>
<field name="model">account.subscription</field>
</tree>
</field>
</record>
-
<record id="view_subscription_search" model="ir.ui.view">
<field name="name">account.subscription.search</field>
<field name="model">account.subscription</field>
</search>
</field>
</record>
-
<record id="view_subscription_form" model="ir.ui.view">
<field name="name">account.subscription.form</field>
<field name="model">account.subscription</field>
</field>
</record>
- <record id="view_move_line_tax_tree" model="ir.ui.view">
- <field name="name">account.move.line.tax.tree</field>
- <field name="model">account.move.line</field>
- <field eval="4" name="priority"/>
- <field name="arch" type="xml">
- <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items">
- <field name="date"/>
- <field name="move_id"/>
- <field name="statement_id" string="St."/>
- <field name="name"/>
- <field name="partner_id"/>
- <field name="account_id"/>
- <field name="tax_code_id"/>
- <field name="tax_amount"/>
- <field name="debit" sum="Total debit"/>
- <field name="credit" sum="Total credit"/>
- <field name="account_tax_id"/>
- <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
- <field name="state" invisible="1"/>
- </tree>
- </field>
- </record>
-
- <record id="action_tax_code_line_open" model="ir.actions.act_window">
- <field name="name">Journal Items</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_tax_tree"/>
- <field name="domain">[('tax_code_id','child_of',active_id),('state','<>','draft')]</field>
- </record>
- <record id="ir_open_tax_move_line" model="ir.values">
- <field name="key2">tree_but_open</field>
- <field name="model">account.tax.code</field>
- <field name="name">Tax Details</field>
- <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
- </record>
-
-
- <!--
- # Admin config
- -->
-
- <act_window
- id="act_account_journal_2_account_bank_statement"
- name="Bank statements"
- context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
- res_model="account.bank.statement"
- src_model="account.journal"/>
-
- <act_window
- id="act_account_journal_2_account_move_line"
- name="Journal Items"
- context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
- res_model="account.move.line"
- src_model="account.journal"/>
-
+ <!-- res.partner links -->
<act_window
context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
res_model="account.move.line"
src_model="res.partner"/>
- <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
-
- <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
- <field name="name">Create Account</field>
- <field name="model">account.addtmpl.wizard</field>
- <field name="arch" type="xml">
- <form string="Create Account" version="7.0">
- <header>
- <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight" />
- </header>
- <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
- <field name="cparent_id"/>
- </form>
- </field>
- </record>
-
- <act_window domain="[]" id="action_account_addtmpl_wizard_form"
- name="Create Account"
- target="new"
- res_model="account.addtmpl.wizard"
- context="{'tmpl_ids': active_id}"
- src_model="account.account.template"
- view_type="form" view_mode="form"/>
+ <act_window
+ context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+ id="act_account_partner_account_move"
+ name="Journal Items"
+ res_model="account.move.line"
+ src_model="res.partner"
+ groups="account.group_account_user"/>
<!-- Account Templates -->
<menuitem
id="account_template_folder"
name="Templates"
- parent="menu_finance_accounting"
+ parent="account_account_menu"
groups="account.group_account_manager"/>
<menuitem
id="account_template_taxes"
parent="account_template_folder"
sequence="1"/>
-
<record id="view_account_template_form" model="ir.ui.view">
<field name="name">account.account.template.form</field>
<field name="model">account.account.template</field>
<field name="arch" type="xml">
<form string="Account Template" version="7.0">
- <notebook>
- <page string="General Information">
- <group col="4">
- <field name="name"/>
- <field name="code"/>
- <newline/>
- <field name="parent_id"/>
- <field name="shortcut"/>
- <field name="type"/>
- <field name="user_type"/>
-
- <field name="currency_id" groups="base.group_multi_currency"/>
- <field name="reconcile"/>
- <field name="chart_template_id"/>
- </group>
- <separator string="Default Taxes"/>
- <field name="tax_ids"/>
- </page>
- <page string="Notes">
- <field name="note"/>
- </page>
- </notebook>
+ <group col="4">
+ <field name="name"/>
+ <field name="code"/>
+ <newline/>
+ <field name="parent_id"/>
+ <field name="shortcut"/>
+ <field name="type"/>
+ <field name="user_type"/>
+
+ <field name="currency_id" groups="base.group_multi_currency"/>
+ <field name="reconcile"/>
+ <field name="chart_template_id"/>
+ </group>
+ <separator string="Default Taxes"/>
+ <field name="tax_ids"/>
+ <separator string="Notes"/>
+ <field name="note" placeholder="Internal notes..."/>
</form>
</field>
</record>
-
<record id="view_account_template_tree" model="ir.ui.view">
<field name="name">account.account.template.tree</field>
<field name="model">account.account.template</field>
</tree>
</field>
</record>
-
<record id="view_account_template_search" model="ir.ui.view">
<field name="name">account.account.template.search</field>
<field name="model">account.account.template</field>
</search>
</field>
</record>
-
<record id="action_account_template_form" model="ir.actions.act_window">
<field name="name">Account Templates</field>
<field name="res_model">account.account.template</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"/>
- <!-- Chart of Accounts Templates -->
+ <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
+ <field name="name">Create Account</field>
+ <field name="model">account.addtmpl.wizard</field>
+ <field name="arch" type="xml">
+ <form string="Create Account" version="7.0">
+ <header>
+ <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight" />
+ </header>
+ <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
+ <field name="cparent_id"/>
+ </form>
+ </field>
+ </record>
+ <act_window domain="[]" id="action_account_addtmpl_wizard_form"
+ name="Create Account"
+ target="new"
+ res_model="account.addtmpl.wizard"
+ context="{'tmpl_ids': active_id}"
+ src_model="account.account.template"
+ view_type="form" view_mode="form"/>
+
+
+ <!-- Chart of Accounts Templates -->
<record id="view_account_chart_template_form" model="ir.ui.view">
<field name="name">account.chart.template.form</field>
<field name="model">account.chart.template</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"/>
<!-- Account Tax Templates -->
-
<record id="view_account_tax_template_form" model="ir.ui.view">
<field name="name">account.tax.template.form</field>
<field name="model">account.tax.template</field>
</search>
</field>
</record>
-
<record id="action_account_tax_template_form" model="ir.actions.act_window">
<field name="name">Tax Templates</field>
<field name="res_model">account.tax.template</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_account_tax_template_search"/>
</record>
-
<menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
<!-- Account Tax Code Templates -->
</tree>
</field>
</record>
-
<record id="view_tax_code_template_search" model="ir.ui.view">
<field name="name">account.tax.code.template.search</field>
<field name="model">account.tax.code.template</field>
</search>
</field>
</record>
-
<record id="view_tax_code_template_form" model="ir.ui.view">
<field name="name">account.tax.code.template.form</field>
<field name="model">account.tax.code.template</field>
</form>
</field>
</record>
-
<record id="action_account_tax_code_template_form" model="ir.actions.act_window">
<field name="name">Tax Code Templates</field>
<field name="res_model">account.tax.code.template</field>
<!-- Wizard for Multi Charts of Accounts -->
-
<record id="view_wizard_multi_chart" model="ir.ui.view">
<field name="name">Set Your Accounting Options</field>
<field name="model">wizard.multi.charts.accounts</field>
</group>
</field>
</record>
-
<record id="action_wizard_multi_chart" model="ir.actions.act_window">
<field name="name">Set Your Accounting Options</field>
<field name="type">ir.actions.act_window</field>
</tree>
</field>
</record>
-
<record id="view_bank_statement_form2" model="ir.ui.view">
<field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field>
+ <field name="priority">2</field>
<field name="arch" type="xml">
<form string="Statement" version="7.0">
<header>
<button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
<button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
- <button name="button_cancel" states="confirm,open" string="Cancel" type="object"/>
+ <button name="button_cancel" states="confirm,open" string="Cancel CashBox" type="object"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
</header>
<sheet string="Statement">
</p>
</field>
</record>
+
<record model="ir.actions.act_window.view" id="act_cash_statement1_all">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
parent="menu_finance_payables"
action="base.action_partner_supplier_form" sequence="100"/>
- <!--
- Account Reports
- -->
-
+ <!-- Account Reports -->
<record id="view_account_financial_report_form" model="ir.ui.view">
<field name="name">account.financial.report.form</field>
<field name="model">account.financial.report</field>
</form>
</field>
</record>
-
<record id="view_account_financial_report_tree" model="ir.ui.view">
<field name="name">account.financial.report.tree</field>
<field name="model">account.financial.report</field>
</tree>
</field>
</record>
-
<record id="view_account_financial_report_search" model="ir.ui.view">
<field name="name">account.financial.report.search</field>
<field name="model">account.financial.report</field>
</search>
</field>
</record>
-
<record id="action_account_financial_report_tree" model="ir.actions.act_window">
<field name="name">Financial Reports</field>
<field name="type">ir.actions.act_window</field>
<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"/>
<record id="view_account_report_tree_hierarchy" model="ir.ui.view">
<field name="view_id" ref="view_account_report_tree_hierarchy"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
-
<menuitem id="menu_account_report_tree_hierarchy" name="Account Reports Hierarchy"
parent="menu_account_reports" action="action_account_report_tree_hierarchy"/>
projects / odoo / odoo.git / blobdiff