<data>
<!--
- Fiscal Year
- -->
+ Fiscal Year
+ -->
<record id="view_account_fiscalyear_form" model="ir.ui.view">
<field name="name">account.fiscalyear.form</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscalyear">
- <group>
+ <group>
<field name="name"/>
<field name="code"/>
<field name="date_start"/>
</field>
<separator colspan="4" string="States"/>
<group>
- <field name="state" select="1" readonly="1"/>
+ <field name="state" select="1" readonly="1"/>
<button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="gtk-dnd"/>
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="gtk-dnd"/>
</group>
<field name="model">account.fiscalyear</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Fiscalyear">
+ <tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
<field name="code"/>
<field name="name"/>
<field name="state"/>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Fiscalyear">
- <group>
- <filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
- <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
- <separator orientation="vertical"/>
- <field name="code"/>
- <field name="name"/>
- <field name="state"/>
+ <group>
+ <filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
+ <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+ <separator orientation="vertical"/>
+ <field name="code"/>
+ <field name="name"/>
+ <field name="state"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+ <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
</group>
</search>
</field>
<menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
<!--
- Period
- -->
+ Period
+ -->
+
<record id="res_role_period" model="res.roles">
<field eval=""""Period"""" name="name"/>
</record>
<field name="model">account.period</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Period">
+ <tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
<field name="code"/>
<field name="name"/>
<field name="date_start"/>
<!--
- Accounts
- -->
-
+ Accounts
+ -->
<record id="view_account_form" model="ir.ui.view">
<field name="name">account.account.form</field>
<field name="model">account.account</field>
<field name="arch" type="xml">
<form string="Account">
<group col="6" colspan="4">
- <field name="name" select="1" colspan="4"/>
+ <field name="name" select="1"/>
<field name="code" select="1"/>
- <field name="parent_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <newline/>
+ <field name="parent_id"/>
+ <field name="type" select="1"/>
<field name="user_type" select="1"/>
</group>
<notebook colspan="4">
<page string="General Information">
<newline/>
<field name="currency_id"/>
+ <field name="active"/>
<field name="currency_mode"/>
<field name="reconcile"/>
- <field name="active"/>
- <field name="check_history"/>
- <field name="type" select="1"/>
<newline/>
<separator string="Default Taxes" colspan="4"/>
<field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Accounts">
- <group col="10" colspan="4">
+ <group col="10" colspan="4">
<filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
<filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/>
<separator orientation="vertical"/>
- <field name="code"/>
- <field name="name"/>
- <field name="user_type"/>
- <field name="type"/>
+ <field name="code"/>
+ <field name="name"/>
+ <field name="user_type"/>
+ <field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
- <separator orientation="vertical"/>
- <filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
- <filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
+ <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
+ <filter string="Internal Type" icon="terp-folder-yellow" 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>
+ <field name="type">tree</field>
+ <field name="field_parent">child_id</field>
+ <field name="arch" type="xml">
+ <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+ <field name="code"/>
+ <field name="name"/>
+ <field name="user_type" invisible="1"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="balance"/>
+ <field name="type"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="company_currency_id"/>
+ </tree>
+ </field>
+ </record>
<record id="action_account_form" model="ir.actions.act_window">
<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"/>
+ <field name="view_id" ref="view_account_list"/>
</record>
<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"/>
<field name="type">tree</field>
<field name="field_parent">child_id</field>
<field name="arch" type="xml">
- <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
+ <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
<field name="code"/>
<field name="name"/>
- <field name="parent_id" invisible="1"/>
- <field name="user_type" invisible="1"/>
<field name="debit"/>
<field name="credit"/>
<field name="balance"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_currency_id"/>
- <field name="type" invisible="1"/>
+ <field name="type"/>
</tree>
</field>
</record>
<!-- <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
<!--
- Journal
+ Journal
- Account Journal Columns
- -->
+ Account Journal Columns
+ -->
<record id="view_journal_column_form" model="ir.ui.view">
<field name="name">account.journal.column.form</field>
<field colspan="4" name="name" select="1"/>
<field name="field" select="1"/>
<field name="sequence"/>
- <newline/>
- <field name="readonly"/>
- <field name="required"/>
+<!-- <newline/>-->
+<!-- <field name="readonly"/>-->
+<!-- <field name="required"/>-->
</form>
</field>
</record>
<tree string="Journal Column">
<field name="sequence"/>
<field name="name"/>
- <field name="required"/>
- <field name="readonly"/>
+<!-- <field name="required"/>-->
+<!-- <field name="readonly"/>-->
</tree>
</field>
</record>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Journal View">
- <field colspan="4" name="name" select="1"/>
+ <field name="name" select="1"/>
<field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
</form>
</field>
</record>
+ <record id="action_account_journal_view" model="ir.actions.act_window">
+ <field name="name">Journal Views</field>
+ <field name="res_model">account.journal.view</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
+ <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_low_level"/>
<!--
# Account Journal
<field name="type">search</field>
<field name="arch" type="xml">
<tree string="Search Account Journal">
- <group>
- <filter domain="[('type', '=', 'sale')]" string="Sale Journals" icon="terp-sale"/>
- <filter domain="[('type', '=', 'purchase')]" string="Purchase Journals" icon="terp-purchase"/>
- <filter domain="[('centralisation', '=', 'True')]" string="Centralized Journals" icon="terp-stock"/>
- <separator orientation="vertical"/>
+ <group>
+ <filter domain="[('type', '=', 'sale')]" string="Sale Journals" icon="terp-sale"/>
+ <filter domain="[('type', '=', 'purchase')]" string="Purchase Journals" icon="terp-purchase"/>
+ <filter domain="[('centralisation', '=', 'True')]" string="Centralized Journals" icon="terp-stock"/>
+ <separator orientation="vertical"/>
<field name="code"/>
<field name="name"/>
</group>
<field name="arch" type="xml">
<form string="Account Journal">
<group colspan="4" col="6">
- <field name="name" select="1" colspan="4"/>
+ <field name="name" select="1"/>
<field name="code" select="1"/>
- <field name="type" on_change="onchange_type(type)"/>
- <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
+ <field name="type" on_change="onchange_type(type, currency)"/>
</group>
<notebook colspan="4">
<page string="General Information">
- <group colspan="2" col="2">
- <separator string="Journal View" colspan="4"/>
- <field name="view_id" widget="selection"/>
+ <group col="2" colspan="2">
+ <group colspan="2" col="2">
+ <separator string="Accounts" colspan="4"/>
+ <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ </group>
+ <group colspan="2" col="2">
+ <separator string="Journal View" colspan="4"/>
+ <field name="view_id" widget="selection"/>
+ </group>
</group>
<group colspan="2" col="2">
- <separator string="Sequence" colspan="4"/>
- <field name="sequence_id"/>
+ <separator string="Company" colspan="4"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="user_id" groups="base.group_extended"/>
+ <field name="currency"/>
</group>
-
<group colspan="2" col="2">
- <separator string="Accounts" colspan="4"/>
- <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <separator string="Validations" colspan="4"/>
+ <field name="allow_date" groups="base.group_extended"/>
</group>
-
<group colspan="2" col="2">
- <separator string="Invoicing Data" colspan="4"/>
- <field name="invoice_sequence_id"/>
- <field name="group_invoice_lines"/>
+ <separator string="Other Configuration" colspan="4"/>
+ <field name="centralisation" groups="base.group_extended"/>
+ <field name="entry_posted"/>
</group>
-
- <group colspan="2" col="2">
- <separator string="Company" colspan="4"/>
- <field name="company_id" groups="base.group_multi_company"/>
- <field name="user_id" groups="base.group_extended"/>
- <field name="currency"/>
+ <group colspan="2" col="2" groups="base.group_extended">
+ <separator string="Sequence" colspan="4"/>
+ <field name="sequence_id"/>
</group>
- <group col="2" colspan="2">
- <group colspan="2" col="2">
- <separator string="Validations" colspan="4"/>
- <field name="allow_date" groups="base.group_extended"/>
- </group>
-
- <group colspan="2" col="2">
- <separator string="Other Configuration" colspan="4"/>
- <field name="centralisation" groups="base.group_extended"/>
- <field name="entry_posted"/>
- <field name="update_posted"/>
- </group>
+ <group colspan="2" col="2">
+ <separator string="Invoicing Data" colspan="4"/>
+ <field name="group_invoice_lines"/>
</group>
</page>
<page string="Entry Controls" groups="base.group_extended">
<field name="model">account.bank.statement</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Search Statement">
- <group col="10" colspan="4">
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
- <filter icon="terp-check" string="Poster" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+ <search string="Search Bank Statements">
+ <group col="8" colspan="4">
+ <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+ <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<separator orientation="vertical"/>
- <field name="name"/>
<field name="date"/>
+ <field name="name"/>
<field name="journal_id"/>
</group>
+ <newline/>
+ <group expand="0" string="Group By...">
+ <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+ <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+ <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+ </group>
</search>
</field>
</record>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="red:balance_end_real!=balance_end and state=='draft';blue:state=='draft' and (balance_end_real==balance_end);black:state=='confirm'" string="Statement">
- <field name="date"/>
<field name="name"/>
- <field name="journal_id"/>
+ <field name="date"/>
<field name="period_id"/>
+ <field name="journal_id"/>
<field name="balance_start"/>
<field name="balance_end_real"/>
<field name="balance_end"/>
<field name="state"/>
+ <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
+ <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
+ <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
</tree>
</field>
</record>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Bank Statements">
- <group>
- <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
- <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <field name="name"/>
- <field name="journal_id"/>
+ <group col="8" colspan="4">
+ <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+ <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+ <separator orientation="vertical"/>
+ <field name="journal_id" widget="selection"/>
+ <field name="date"/>
+ <field name="name"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
- <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
- <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+ <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+ <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+ <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
</group>
</search>
</field>
<form string="Bank Statement">
<group col="6" colspan="4">
<field name="name" select="1"/>
- <field name="date" select="1"/>
- <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-<!-- <field name="currency"/>-->
+ <field name="date" select="1" on_change="onchange_date(date)"/>
+ <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1"/>
<field name="period_id"/>
-<!-- <group colspan="2" col="3">-->
- <!-- <button name="%(action_view_account_statement_from_invoice)d"-->
- <!-- string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-<!-- <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>-->
-<!-- </group>-->
<field name="balance_start"/>
- <field name="balance_end_real"/>
+ <field name="balance_end_real"/>
+ </group>
<notebook colspan="4">
<page string="Transaction">
<field colspan="4" name="line_ids" nolabel="1">
<field name="state"/>
<field name="balance_end"/>
<button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
- <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
+ <button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
</group>
</form>
<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>
+ <field name="view_mode">tree,form,graph</field>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
</record>
+ <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="view_bank_statement_tree"/>
+ <field name="act_window_id" ref="action_bank_statement_tree"/>
+ </record>
+ <record model="ir.actions.act_window.view" id="action_bank_statement_form_bank">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="view_bank_statement_form"/>
+ <field name="act_window_id" ref="action_bank_statement_tree"/>
+ </record>
<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="filter" eval="True"/>
</record>
- <record id="action_bank_statement_tree2" model="ir.actions.act_window">
- <field name="name">New Statement</field>
- <field name="res_model">account.bank.statement</field>
- <field name="view_type">form</field>
- <field name="view_mode">form,tree</field>
- </record>
+<!-- <record id="action_bank_statement_tree2" model="ir.actions.act_window">-->
+<!-- <field name="name">New Statement</field>-->
+<!-- <field name="res_model">account.bank.statement</field>-->
+<!-- <field name="view_type">form</field>-->
+<!-- <field name="view_mode">form,tree</field>-->
+<!-- </record>-->
<record id="view_bank_statement_reconcile" model="ir.ui.view">
<field name="name">account.bank.statement.reconcile.form</field>
<field name="arch" type="xml">
<form string="Account Type">
<group col="6" colspan="4">
- <field name="name" select="1" colspan="4"/>
+ <field name="name" select="1"/>
<field name="code" select="1"/>
<field name="sequence"/>
<field name="parent_id"/>
- <field name="partner_account"/>
</group>
<group col="2" colspan="2">
<separator string="Reporting Configuration" colspan="4"/>
<field name="model">account.move</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Accounting Entries">
+ <tree colors="blue:state in ('draft');black:state in ('posted')" string="Accounting Entries">
<field name="name"/>
<field name="date"/>
<field name="ref"/>
<field name="period_id"/>
<field name="journal_id"/>
<field name="partner_id"/>
- <field name="amount"/>
+ <field name="amount" sum="Total Amount"/>
<field name="state"/>
</tree>
</field>
<field groups="base.group_extended" name="price_include"/>
<field name="type_tax_use"/>
<newline/>
- <field colspan="4" groups="base.group_extended" name="child_ids"/>
+ <field colspan="4" groups="base.group_extended" name="child_ids" nolabel="1"/>
</page>
<page string="Tax Declaration">
<separator colspan="4" string="Invoices"/>
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_tax_code_tree"/>
+ <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
</record>
<menuitem
action="action_tax_code_tree"
<field name="type">tree</field>
<field eval="4" name="priority"/>
<field name="arch" type="xml">
- <tree string="Account Entry Line" editable="top" on_write="on_create_write">
+ <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line" editable="top" on_write="on_create_write">
<field name="date"/>
<field name="period_id"/>
<field name="move_id"/>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<form string="Account Entry Line">
- <notebook>
+ <group col="6" colspan="4">
+ <field name="name" select="1"/>
+ <field name="ref"/>
+ <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+
+ <field name="journal_id"/>
+ <field name="period_id"/>
+ <field name="company_id" required="1" groups="base.group_multi_company"/>
+ </group>
+ <notebook colspan="4">
<page string="Information">
- <separator colspan="4" string="General Information"/>
- <field name="name" select="1"/>
- <field name="date" select="1"/>
- <field name="ref"/>
- <field name="invoice"/>
- <field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Amount"/>
+ <field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="quantity"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Accounting Documents"/>
+ <field name="invoice"/>
+ <field name="move_id" required="False"/>
+ <field name="statement_id"/>
+ </group>
- <field name="debit"/>
- <field name="credit"/>
- <field name="company_id" required="1" groups="base.group_multi_company"/>
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Dates"/>
+ <field name="date" select="1"/>
+ <field name="date_maturity"/>
+ <field name="date_created"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Taxes"/>
+ <field name="tax_code_id"/>
+ <field name="tax_amount"/>
+ <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Currency"/>
+ <field name="currency_id"/>
+ <field name="amount_currency"/>
+ </group>
- <separator colspan="4" string="Optional Information"/>
- <field name="currency_id"/>
- <field name="amount_currency"/>
- <field name="quantity"/>
- <field name="move_id" required="False"/>
- <newline/>
- <field name="statement_id"/>
- <field name="blocked"/>
- <field name="date_maturity"/>
- <field name="date_created"/>
- <newline/>
- <field name="tax_code_id"/>
- <field name="tax_amount"/>
- <newline/>
- <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
- <field name="analytic_account_id"/>
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Reconciliation"/>
+ <field name="reconcile_id"/>
+ <field name="reconcile_partial_id"/>
+ </group>
- <separator colspan="4" string="State"/>
- <field name="journal_id"/>
- <field name="period_id"/>
- <field name="reconcile_id"/>
- <field name="reconcile_partial_id"/>
- <field name="state"/>
+ <group col="2" colspan="2">
+ <separator colspan="2" string="States"/>
+ <field name="state"/>
+ <field name="blocked"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Analytic"/>
+ <field name="analytic_account_id"/>
+ </group>
+ <separator string="Narration" colspan="4"/>
+ <field name="narration" colspan="4" nolabel="1"/>
</page>
<page string="Analytic Lines">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
</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 eval="9" name="priority"/>
<field name="arch" type="xml">
<form string="Account Entry Line">
- <notebook>
+ <notebook colspan="4">
<page string="Information">
<separator colspan="4" string="General Information"/>
<field name="name" select="1"/>
</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>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <graph string="Account Statistics" type="bar">
+ <field name="account_id"/>
+ <field name="debit" operator="+"/>
+ <field name="credit" operator="+"/>
+ </graph>
+ </field>
+ </record>
+
<record id="view_account_move_line_filter" model="ir.ui.view">
<field name="name">Entry Lines</field>
<field name="model">account.move.line</field>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
<separator orientation="vertical"/>
- <field name="date" select='1'/>
+ <filter icon="terp-stock_symbol-selection" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Entry Lines"/>
+ <filter icon="terp-stock_symbol-selection" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Entry Lines"/>
+ <separator orientation="vertical"/>
+ <field name="ref" select="1" string="Reference"/>
+ <field name="move_id" select="1" string="Number (Move)"/>
+ <field name="name" select="1"/>
<field name="account_id" select='1'/>
<field name="partner_id" select='1'>
<filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
</field>
- <field name="balance" string="Debit/Credit" select='1'/>
</group>
<newline/>
<group col="10" colspan="4">
- <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
- <field name="period_id" widget="selection" context="{'period_id':self}"/>
+ <field name="journal_id" required="1" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+ <field name="period_id" required="1" widget="selection" context="{'period_id':self}"/>
+ <separator orientation="vertical"/>
+ <field name="narration" select="1"/>
+ <field name="date" select='1'/>
+ <field name="balance" string="Debit/Credit" select='1'/>
</group>
</search>
</field>
<field name="search_view_id" ref="view_account_move_line_filter"/>
</record>
+ <record id="action_move_line_select" 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_tree"/>
+ <field name="search_view_id" ref="view_account_move_line_filter"/>
+ <field name="domain">[('account_id', 'child_of', 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 eval="True" name="object"/>
+ </record>
<!--
Account.Entry Edition
-->
+ <record id="account_move_graph" model="ir.ui.view">
+ <field name="name">account.move.graph</field>
+ <field name="model">account.move</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <graph string="Account Statistics" type="bar">
+ <field name="period_id"/>
+ <field name="amount" operator="+"/>
+ </graph>
+ </field>
+ </record>
<record id="view_move_tree" model="ir.ui.view">
<field name="name">account.move.tree</field>
<field name="model">account.move</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Account Entry">
+ <tree colors="blue:state in ('draft');black:state in ('posted')" string="Account Entry">
<field name="name"/>
<field name="date"/>
<field name="ref"/>
<field name="journal_id"/>
<field name="period_id"/>
- <field name="type" invisible=" not context.get('set_visible',True)"/>
<field name="partner_id"/>
<field name="line_id"/>
<field name="to_check" groups="base.group_extended"/>
- <field name="amount"/>
+ <field name="amount" sum="Total Amount"/>
<field name="state"/>
- <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+ <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
</tree>
</field>
</record>
<form string="Journal Entries">
<group colspan="4" col="6">
<field name="name" select="1" readonly="True"/>
+ <field name="ref" select="1"/>
+ <field name="to_check" groups="base.group_extended"/>
<field name="journal_id" select="1"/>
<field name="period_id"/>
- <field name="type"/>
- <field name="ref" select="1"/>
<field name="date" select="1"/>
+ <field name="company_id" required="1" groups="base.group_multi_company"/>
+ <field name="partner_id" invisible="1" select="1"/>
+ <field name="amount" invisible="1" select="1"/>
</group>
<notebook colspan="4">
<page string="Journal Entries Lines">
- <field colspan="4" height="200" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+ <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
<form string="Account Entry Line">
- <separator colspan="4" string="General Information"/>
- <field name="name" select="1"/>
- <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
- <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-
- <field name="debit" select="1"/>
- <field name="credit" select="1"/>
- <field name="date" select="1"/>
-
- <separator colspan="4" string="Optional Information"/>
- <field name="currency_id"/>
- <field name="amount_currency"/>
- <field name="quantity" select="1"/>
- <newline/>
- <field name="date_maturity"/>
- <field name="date_created"/>
-
- <separator colspan="4" string="State"/>
- <field name="reconcile_id"/>
- <field name="reconcile_partial_id"/>
- <field name="statement_id"/>
- <field name="state"/>
+ <group col="6" colspan="4">
+ <field name="name" select="1"/>
+ <field name="ref"/>
+ <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+
+ <field name="journal_id"/>
+ <field name="period_id"/>
+ <field name="company_id" required="1" groups="base.group_multi_company"/>
+ </group>
+ <notebook colspan="4">
+ <page string="Information">
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Amount"/>
+ <field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="quantity"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Accounting Documents"/>
+ <field name="invoice"/>
+ <field name="move_id" required="False"/>
+ <field name="statement_id"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Dates"/>
+ <field name="date" select="1"/>
+ <field name="date_maturity"/>
+ <field name="date_created"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Taxes"/>
+ <field name="tax_code_id"/>
+ <field name="tax_amount"/>
+ <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Currency"/>
+ <field name="currency_id"/>
+ <field name="amount_currency"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Reconciliation"/>
+ <field name="reconcile_id"/>
+ <field name="reconcile_partial_id"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="States"/>
+ <field name="state"/>
+ <field name="blocked"/>
+ </group>
+
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Analytic"/>
+ <field name="analytic_account_id"/>
+ </group>
+ <separator string="Narration" colspan="4"/>
+ <field name="narration" colspan="4" nolabel="1"/>
+ </page>
+ <page string="Analytic Lines">
+ <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+ </page>
+ </notebook>
</form>
- <tree editable="top" string="Account Entry Line">
+ <tree colors="blue:state in ('draft');black:state in ('posted')" editable="top" string="Account Entry Line">
<field name="ref"/>
<field name="invoice"/>
<field name="name"/>
</tree>
</field>
<separator colspan="4" string="Narration"/>
- <field name="narration" colspan="4" nolabel="1"/>
- <field name="state" select="1"/>
- <group col="2" colspan="2">
- <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+ <field name="narration" colspan="4" nolabel="1" height="50"/>
+ <group col="4" colspan="4">
+ <field name="state" select="1"/>
+ <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
</group>
</page>
- <page string="Other Information">
- <field name="company_id" required="1" groups="base.group_multi_company"/>
- <field name="date" select="1" groups="base.group_extended"/>
- <field name="to_check" groups="base.group_extended"/>
- <field name="partner_id" invisible="1" select="1"/>
- <field name="amount" invisible="1" select="1"/>
- </page>
</notebook>
</form>
</field>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
<separator orientation="vertical"/>
- <filter icon="terp-camera_test" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+ <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+ <separator orientation="vertical"/>
+ <field name="ref" select="1"/>
+ <field name="name" select="1"/>
+ <field name="partner_id" select='1'/>
<field name="date" select='1'/>
- <field name="name" select='1'/>
- <field name="journal_id" select='1'/>
- <field name="partner_id" select='1'/>
+ <field name="narration" select="1"/>
</group>
<newline/>
- <group col="10" colspan="4">
- <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
- <field name="period_id" widget="selection" context="{'period_id':self}"/>
+ <group col='8' colspan='4'>
+ <field name="journal_id" widget="selection" select='1'/>
+ <field name="period_id" select='1'/>
</group>
+ <newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
- <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+
+ <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+ <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group>
</search>
</field>
</record>
-
- <record id="action_move_journal_line" model="ir.actions.act_window">
+ <record id="action_move_journal_line" model="ir.actions.act_window">
<field name="name">Journal Entries</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
+ <field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
</record>
res_model="account.move.line"
src_model="account.move"/>
- <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"/>
+<!-- <record id="action_move_to_review" model="ir.actions.act_window">-->
+<!-- <field name="name">Journal Entries</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), ('state','=','draft')]</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 Vouchers</field>
+ <!-- <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
+ <field name="name">Journal Entries</field>
<field name="res_model">account.move</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_account_move_filter"/>
</record>
- <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
+ <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.line</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
+ <field name="view_mode">tree,form,graph</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', 'in', ['sale', 'sale_refund'])]</field>
+ <field name="domain">[('journal_id.type', 'in', ['sale', 'purchase_refund'])]</field>
</record>
<menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
<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_mode">tree,form,graph</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', 'in', ['purchase', 'purchase_refund'])]</field>
- <field name="context">{'journal_id':1}</field>
+ <field name="domain">[('journal_id.type', 'in', ['purchase', 'sale_refund'])]</field>
</record>
<menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_move_line_search"/>
</record>
- <record id="action_move_line_search_view4" model="ir.actions.act_window">
- <field name="name">Check Registers</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_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
+<!-- <record id="action_move_line_search_view4" model="ir.actions.act_window">-->
+<!-- <field name="name">Cheque 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_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"/>-->
<field name="model">account.journal.period</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Journals">
+ <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('printed')" string="Journals">
<field icon="icon" name="fiscalyear_id"/>
<field name="period_id"/>
<field name="journal_id"/>
<field name="name">Journals</field>
<field name="res_model">account.journal.period</field>
<field name="view_type">tree</field>
+ <field name="help">You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line.</field>
</record>
<menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
</field>
</record>
<record id="action_model_form" model="ir.actions.act_window">
- <field name="name">Define Recurring</field>
+ <field name="name">Recurring Models</field>
<field name="res_model">account.model</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<!-- <field name="date" select='1'/>-->
<!-- <field name="account_id" select='1'/>-->
<!-- <field name="partner_id" select='1'>-->
-<!-- <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>-->
+<!-- <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>-->
<!-- </field>-->
<!-- <field name="balance" string="Debit/Credit" select='1'/>-->
<!-- </group>-->
<field name="model">account.subscription</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Entry Subscription">
+ <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('running')" string="Entry Subscription">
<field name="ref"/>
<field name="name"/>
<field name="date_start"/>
<field name="type">tree</field>
<field eval="4" name="priority"/>
<field name="arch" type="xml">
- <tree string="Account Entry Line">
+ <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line">
<field name="date"/>
<field name="move_id"/>
<field name="statement_id" string="St."/>
<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','=',active_id),('state','<>','draft')]</field>
+ <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>
<act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
- <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
+ <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Journal Items" res_model="account.move.line" src_model="account.journal"/>
- <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables & Payables" res_model="account.move.line" src_model="res.partner"/>
+ <act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables & Payables" res_model="account.move.line" src_model="res.partner"/>
- <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+ <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
<record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
<field name="name">Create Account</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Account Templates">
- <group>
- <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
- <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
- <separator orientation="vertical"/>
- <field name="code"/>
+ <group>
+ <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+ <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+ <separator orientation="vertical"/>
+ <field name="code"/>
<field name="parent_id"/>
<field name="type"/>
<field name="user_type"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
+ </group>
+ <newline/>
+ <group expand="0" string="Group By...">
<filter string="Internal Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
<filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
</group>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Chart of Accounts Template">
- <group>
+ <group>
<field name="name"/>
<field name="account_root_id"/>
<field name="bank_account_view_id"/>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Chart of Account Templates">
- <group>
- <field name="name"/>
- <field name="account_root_id"/>
- <field name="bank_account_view_id"/>
- </group>
- <newline/>
+ <group>
+ <field name="name"/>
+ <field name="account_root_id"/>
+ <field name="bank_account_view_id"/>
+ </group>
+ <newline/>
<group expand="0" string="Group By...">
<filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
<filter string="Bank Account" icon="terp-folder-blue" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
<separator orientation="vertical"/>
<filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
<filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
- <separator orientation="vertical"/>
+ <separator orientation="vertical"/>
<filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
<filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
</group>
</field>
</record>
- <record id="view_tax_code_template_search" model="ir.ui.view">
+ <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>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search tax template">
- <group>
- <field name="name"/>
- <field name="code"/>
- <field name="parent_id"/>
+ <group>
+ <field name="name"/>
+ <field name="code"/>
+ <field name="parent_id"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+ <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
</group>
</search>
</field>
id="menu_action_account_fiscal_position_form_template"
parent="account_template_folder" sequence="20"/>
- <record id="action_move_journal_line" model="ir.actions.act_window">
- <field name="name">Journal Entries</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"/>
- </record>
-
- <menuitem
- icon="STOCK_JUSTIFY_FILL"
- action="action_move_journal_line"
- id="menu_action_move_journal_line_form"
- parent="account.menu_finance_entries"
- sequence="5"/>
-
<record id="action_account_moves_all" 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_mode">tree,form,graph</field>
<field name="view_id" ref="view_move_line_tree"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
</record>
/>
<!-- Cash Statement -->
- <record id="view_bank_statement_tree" model="ir.ui.view">
+ <record id="view_cash_statement_tree" model="ir.ui.view">
<field name="name">account.bank.statement.tree</field>
<field name="model">account.bank.statement</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
- <field name="date"/>
+ <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open')" string="Statement">
<field name="name"/>
- <field name="journal_id"/>
+ <field name="date"/>
<field name="period_id"/>
+ <field name="journal_id"/>
<field name="balance_start"/>
<field name="balance_end_real"/>
<field name="balance_end"/>
- <field name="user_id" select="1"/>
<field name="state"/>
<button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
- <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
+ <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
</tree>
</field>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" />
<field name="user_id" select="1" readonly="1"/>
<field name="period_id" select="1"/>
- <field name="balance_end_real"/>
</group>
<notebook colspan="4">
<field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
<field invisible="1" name="reconcile_amount"/>
</tree>
+ <form string="Statement lines">
+ <field name="date"/>
+ <field name="name"/>
+ <field name="type"/>
+ <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+ <field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/>
+ <field name="amount"/>
+ <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
+ <field name="ref"/>
+ <field name="sequence"/>
+ <separator colspan="4" string="Notes"/>
+ <field colspan="4" name="note" nolabel="1"/>
+ </form>
</field>
</page>
- <page string="Cash Box">
+ <page string="CashBox">
<group col="2" colspan="2" expand="1">
- <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+ <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}">
<tree string = "Opening Balance" editable="bottom">
<field name="pieces"/>
<field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
</field>
</group>
<group col="2" colspan="2" expand="1">
- <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+ <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','open')]}">
<tree string = "Closing Balance" editable="bottom">
<field name="pieces"/>
<field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
</group>
</page>
<page string="Accounting Entries" attrs="{'invisible': [('state','!=','confirm')]}">
- <field colspan="4" name="move_line_ids" nolabel="1"/>
+ <field colspan="4" name="move_line_ids" nolabel="1" string="Accounting Entries"/>
</page>
</notebook>
<group col="6" colspan="4">
<group col="2" colspan="2">
<separator string="Dates" colspan="4"/>
- <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+ <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_date(date)"/>
<field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
</group>
<group col="2" colspan="2">
<separator string="Opening Balance" colspan="4"/>
- <field name="balance_start"/>
+ <field name="balance_start" readonly="1" string="Opening Balance"/>
<field name="total_entry_encoding"/>
</group>
<group col="2" colspan="2">
<separator string="Closing Balance" colspan="4"/>
- <field name="balance_end" string="Approx"/>
- <field name="balance_end_cash" string="Cash Balance"/>
+ <field name="balance_end" string="Calculated Balance"/>
+ <field name="balance_end_cash" string="CashBox Balance"/>
</group>
</group>
<group col="8" colspan="4">
<field name="state" colspan="4"/>
- <button name="button_confirm" states="open" string="Close CashBox" icon="terp-check" type="object"/>
+ <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-check" type="object"/>
<button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
</group>
</form>
</field>
</record>
+ <record id="account_cash_statement_graph" model="ir.ui.view">
+ <field name="name">account.bank.statement.graph</field>
+ <field name="model">account.bank.statement</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <graph string="Account Statistics" type="bar">
+ <field name="date"/>
+ <field name="balance_start" operator="+"/>
+ <field name="balance_end" operator="+"/>
+ </graph>
+ </field>
+ </record>
<record id="action_view_bank_statement_tree" model="ir.actions.act_window">
<field name="name">Cash Register</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_bank_statement_tree"/>
+ <field name="view_mode">tree,form,graph</field>
+ <field name="view_id" ref="view_cash_statement_tree"/>
<field name="search_view_id" ref="view_account_bank_statement_filter"/>
<field name="domain">[('journal_id.type', '=', 'cash')]</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>
- <field name="view_id" ref="view_bank_statement_tree"/>
+ <field name="view_id" ref="view_cash_statement_tree"/>
<field name="act_window_id" ref="action_view_bank_statement_tree"/>
</record>
<record model="ir.actions.act_window.view" id="act_cash_statement2_all">
<field name="view_id" ref="view_bank_statement_form2"/>
<field name="act_window_id" ref="action_view_bank_statement_tree"/>
</record>
+ <record model="ir.actions.act_window.view" id="act_cash_statement3_all">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">graph</field>
+ <field name="view_id" ref="account_cash_statement_graph"/>
+ <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+ </record>
<menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
</data>
projects / odoo / odoo.git / blobdiff