audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[RFR] Sort out view changes between debit and payment modules

Browse Source
This commit is contained in:
Stefan Rijnhart
2013-05-28 16:42:13 +02:00
parent 3c5fdecf37
commit 4b998a263e
3 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
account_banking_payment/view/account_payment.xml
View File

@@ -41,5 +41,26 @@
</field>
</record>
<!-- Add transfer settings -->
<record model="ir.ui.view" id="view_payment_mode_form">
<field name="name">payment.mode.form add transfer account</field>
<field name="model">payment.mode</field>
<field name="inherit_id" ref="account_banking.view_payment_mode_form_inherit"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="type" position="after">
<field name="transfer_account_id"
domain="[('type', '=', 'other'),
('reconcile', '=', True),
('company_id', '=', company_id)]"
/>
<field name="transfer_journal_id"
domain="[('company_id', '=', company_id)]"
/>
<field name="payment_term_ids"/>
</field>
</field>
</record>
</data>
</openerp>

14
account_direct_debit/view/account_invoice.xml
View File

@@ -16,14 +16,6 @@
<!-- button name="invoice_open" position="attributes">
<attribute name="states">draft,proforma2,debit_denied</attribute>
</button -->
<button string='Re-Open' position="attributes">
<attribute name="states">paid,debit_denied</attribute>
<!--
unintentional fix of
https://bugs.launchpad.net/openobject-addons/+bug/807543
-->
<attribute name="groups"/>
</button>
<button name="invoice_open" position="after">
<button name="invoice_debit_denied" states="paid"
string="Debit Denied" icon="gtk-cancel"/>
@@ -38,7 +30,11 @@
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
<field name="arch" type="xml">
<filter name="invoices" position="after">
<filter name="debit_denied" icon="terp-dolar_ok!" string="Debit denied" domain="[('state','=','debit_denied')]" help="Show only invoices with state Debit denied"/>
<filter name="debit_denied" icon="terp-dolar_ok!"
string="Debit denied"
domain="[('state','=','debit_denied')]"
help="Show only invoices with state Debit denied"
/>
</filter>
</field>
</record>

28
account_direct_debit/view/account_payment.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- distinguish between payment orders and debit orders in the menu -->
<record id="account_payment.action_payment_order_tree" model="ir.actions.act_window">
<field name="domain">[('payment_order_type', '=', 'payment')]</field>
@@ -46,36 +47,10 @@
icon="gtk-find"
/>
</xpath>
<!-- the attrs do not work like this, apparently
<xpath expr="//tree[@string='Payment Line']" position="inside">
<field name="storno" attrs="{'invisible': [(parent.payment_order_type, '!=', 'debit')]}"/>
</xpath>
-->
</data>
</field>
</record>
<!-- Add transfer account for debit type modes -->
<record model="ir.ui.view" id="view_payment_mode_form">
<field name="name">payment.mode.form add transfer account</field>
<field name="model">payment.mode</field>
<field name="inherit_id" ref="account_banking.view_payment_mode_form_inherit"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="type" position="after">
<field name="transfer_account_id"
domain="[('type', '=', 'other'),
('reconcile', '=', True),
('company_id', '=', company_id)]"
/>
<field name="transfer_journal_id"
domain="[('company_id', '=', company_id)]"
/>
<field name="payment_term_ids"/>
</field>
</field>
</record>
<record id="view_payment_line_tree" model="ir.ui.view">
<field name="name">Payment Lines</field>
<field name="model">payment.line</field>
@@ -88,5 +63,6 @@
</field>
</field>
</record>
</data>
</openerp>