mirror of
https://github.com/OCA/bank-payment.git
synced 2025-02-02 10:37:31 +02:00
[MIG] Consolidated and adapted bank statement views
This commit is contained in:
Stefan Rijnhart
@@ -134,16 +134,7 @@
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_account_banking_imported_line_search" model="ir.ui.view">
|
||||
<field name="name">account.banking.imported.line.search</field>
|
||||
<field name="model">account.bank.imported.line</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Bank Statement files">
|
||||
<field name="company_id" />
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_account_banking_imported_files">
|
||||
<field name="name">Imported Bank Statements Files</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
@@ -193,7 +184,12 @@
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="period_id" position="replace"/>
|
||||
<!-- Remove period from bank statement -->
|
||||
<field name="period_id" position="replace">
|
||||
<!-- Add invisible column for identification of import file
|
||||
-->
|
||||
<field name="banking_id" invisible="True" />
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_banking_bank_statement_form_1" model="ir.ui.view">
|
||||
@@ -204,92 +200,48 @@
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
|
||||
<field name="period_id" position="replace"/>
|
||||
<xpath expr="/form/notebook/page[@string='Transaction']/field/tree" position="attributes">
|
||||
|
||||
<xpath expr="//page[@string='Transactions']/field/tree"
|
||||
position="attributes">
|
||||
<attribute name="colors">black:state == 'confirmed';darkmagenta:match_multi == True;crimson:duplicate == True;grey:state == 'draft';</attribute>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='name']" position="replace">
|
||||
<field name="name" required="1"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page[@string='Transaction']/field/form/field[@name='name']" position="replace">
|
||||
<field name="name" required="1"/>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_banking_bank_statement_form_2" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.form.banking-2</field>
|
||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='ref']" position="after">
|
||||
<field name="period_id"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_banking_bank_statement_form_3" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.form.banking-3</field>
|
||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="/form/notebook/page[@string='Transaction']/field/form/field[@name='ref']" position="after">
|
||||
<field name="period_id"/>
|
||||
<field name="match_type"/>
|
||||
<field name="match_multi"/>
|
||||
<field name="duplicate"/>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Add invisible column on bank statements tree for identification
|
||||
of import file
|
||||
-->
|
||||
<record id="view_banking_bank_statement_tree_2" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.tree.banking-2</field>
|
||||
<field name="inherit_id" ref="account.view_bank_statement_tree" />
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="state" position="after">
|
||||
<field name="banking_id" invisible="True" />
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<xpath expr="//field[@name='line_ids']/tree/field[@name='name']"
|
||||
position="attributes">
|
||||
<attribute name="required">1</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- Add invisible field for identification of import file on bank statements
|
||||
-->
|
||||
<record id="view_banking_bank_statement_form_4" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.form.banking-4</field>
|
||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="balance_end_real" position="after">
|
||||
<field name="banking_id" invisible="True"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<xpath expr="//field[@name='line_ids']/form//field[@name='name']"
|
||||
position="attributes">
|
||||
<attribute name="required">1</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- Show bank accounts in account_bank_statement_line to enable manual
|
||||
coupling of bank account numbers to statement lines and harvest info
|
||||
for future matching in the process.
|
||||
-->
|
||||
<record id="view_banking_bank_statement_form_5" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.form.banking-5</field>
|
||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='partner_id']" position="after">
|
||||
<!-- Add invisible field for identification of import file
|
||||
on bank statements
|
||||
-->
|
||||
<field name="balance_end_real" position="after">
|
||||
<field name="banking_id" invisible="True"/>
|
||||
</field>
|
||||
|
||||
<!-- Show bank accounts in account_bank_statement_line to
|
||||
enable manualcoupling of bank account numbers to
|
||||
statement lines and harvest info for future matching
|
||||
in the process.
|
||||
-->
|
||||
<xpath expr="//field[@name='line_ids']/tree/field[@name='partner_id']"
|
||||
position="after">
|
||||
<!-- TODO set partner_id when partner_bank_id changes -->
|
||||
<field name="partner_bank_id"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
|
||||
<xpath expr="//field[@name='line_ids']/form//field[@name='partner_id']"
|
||||
position="after">
|
||||
<field name="partner_bank_id"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//field[@name='line_ids']/tree/field[@name='amount']"
|
||||
position="after">
|
||||
<field name="match_type"/>
|
||||
<field name="residual"/>
|
||||
<button name="match_wizard" states="draft"
|
||||
@@ -310,7 +262,9 @@
|
||||
<field name="invoice_id"/>
|
||||
<field name="reconcile_id"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
|
||||
|
||||
<xpath expr="//field[@name='line_ids']/form//field[@name='amount']"
|
||||
position="after">
|
||||
<field name="state"/>
|
||||
<field name="invoice_id"/>
|
||||
<field name="reconcile_id"/>
|
||||
@@ -318,30 +272,7 @@
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_banking_bank_statement_form_6" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.form.banking-6</field>
|
||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||
<field name="model">account.bank.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='partner_id']" position="after">
|
||||
<field name="partner_bank_id"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Set trigger on IBAN and acc_number fields in res_partner_bank form -->
|
||||
<!--record id="view_partner_bank_account_banking_form_1" model="ir.ui.view">
|
||||
<field name="name">res.partner.bank.form.banking-1</field>
|
||||
<field name="model">res.partner.bank</field>
|
||||
<field name="inherit_id" ref="base_iban.view_partner_bank_iban_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="iban" position="replace">
|
||||
<field name="iban" on_change="onchange_iban(iban)" />
|
||||
</field>
|
||||
</field>
|
||||
</record-->
|
||||
<record id="view_partner_bank_account_banking_form_2" model="ir.ui.view">
|
||||
<field name="name">res.partner.bank.form.banking-2</field>
|
||||
<field name="model">res.partner.bank</field>
|
||||
@@ -360,53 +291,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Set trigger on IBAN and acc_number field in res_partner form -->
|
||||
<!--record id="view_partner_account_banking_form_1" model="ir.ui.view">
|
||||
<field name="name">res.partner.form.banking-1</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base_iban.view_partner_iban_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="iban" position="replace">
|
||||
<field name="iban" on_change="onchange_iban(iban)" />
|
||||
</field>
|
||||
</field>
|
||||
</record-->
|
||||
<record id="view_partner_account_banking_form_2" model="ir.ui.view">
|
||||
<field name="name">res.partner.form.banking-2</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="account.view_partner_property_form"/>
|
||||
<field name="priority" eval="24"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<field name="acc_number" position="attributes">
|
||||
<attribute name="on_change">onchange_acc_number(acc_number, acc_number_domestic, state, partner_id, country_id)</attribute>
|
||||
</field>
|
||||
<field name="acc_number_domestic" position="attributes">
|
||||
<attribute name="on_change">onchange_domestic(acc_number_domestic, partner_id, country_id)</attribute>
|
||||
</field>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_partner_account_banking_form_3" model="ir.ui.view">
|
||||
<field name="name">res.partner.form.banking-3</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="account.view_partner_property_form"/>
|
||||
<field name="priority" eval="24"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<field name="acc_number" position="attributes">
|
||||
<attribute name="on_change">onchange_acc_number(acc_number, acc_number_domestic, state, partner_id, country_id)</attribute>
|
||||
</field>
|
||||
<field name="acc_number_domestic" position="attributes">
|
||||
<attribute name="on_change">onchange_domestic(acc_number_domestic, partner_id, country_id)</attribute>
|
||||
</field>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Set trigger on BIC in res_bank form -->
|
||||
<record id="view_res_bank_account_banking_form_1" model="ir.ui.view">
|
||||
<field name="name">res.bank.form.banking-1</field>
|
||||
@@ -438,25 +322,25 @@
|
||||
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
|
||||
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
|
||||
<field name="amount"/>
|
||||
<field name="match_type"/>
|
||||
<field name="residual"/>
|
||||
<button name="match_wizard" states="draft"
|
||||
string="Match"
|
||||
icon="terp-gtk-jump-to-ltr"
|
||||
type="object"/>
|
||||
<field name="match_multi" invisible="1"/>
|
||||
<field name="duplicate" invisible="1"/>
|
||||
<field name="state"/>
|
||||
<button name="confirm" states="draft"
|
||||
string="Confirm transaction"
|
||||
icon="gtk-ok"
|
||||
type="object"/>
|
||||
<button name="cancel" states="confirmed"
|
||||
string="Cancel transaction"
|
||||
icon="gtk-cancel"
|
||||
type="object"/>
|
||||
<field name="invoice_id"/>
|
||||
<field name="reconcile_id"/>
|
||||
<field name="match_type"/>
|
||||
<field name="residual"/>
|
||||
<button name="match_wizard" states="draft"
|
||||
string="Match"
|
||||
icon="terp-gtk-jump-to-ltr"
|
||||
type="object"/>
|
||||
<field name="match_multi" invisible="1"/>
|
||||
<field name="duplicate" invisible="1"/>
|
||||
<field name="state"/>
|
||||
<button name="confirm" states="draft"
|
||||
string="Confirm transaction"
|
||||
icon="gtk-ok"
|
||||
type="object"/>
|
||||
<button name="cancel" states="confirmed"
|
||||
string="Cancel transaction"
|
||||
icon="gtk-cancel"
|
||||
type="object"/>
|
||||
<field name="invoice_id"/>
|
||||
<field name="reconcile_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user