Merge lp:~factorlibre/sepa-tools/sepa-tools-type-view-7.0 into lp:sepa-tools

Proposed by Alberto Garcia (Factor Libre) on 2014-02-28
Status: Merged
Merged at revision: 6
Proposed branch: lp:~factorlibre/sepa-tools/sepa-tools-type-view-7.0
Merge into: lp:sepa-tools
Diff against target: 91 lines (+9/-0)
5 files modified
account_payment_sepa_direct_debit/account_invoice_view.xml (+1/-0)
account_payment_sepa_direct_debit/account_payment_view.xml (+1/-0)
account_payment_sepa_direct_debit/company_view.xml (+1/-0)
account_payment_sepa_direct_debit/res_partner_bank_view.xml (+3/-0)
account_payment_sepa_direct_debit/sdd_mandate_view.xml (+3/-0)
To merge this branch: bzr merge lp:~factorlibre/sepa-tools/sepa-tools-type-view-7.0
Reviewer Review Type Date Requested Status
Alberto Garcia (Factor Libre) Approve on 2014-03-04
Ignacio Ibeas (www.acysos.com) Approve on 2014-03-04
Review via email: mp+208881@code.launchpad.net

This proposal supersedes a proposal from 2014-02-28.

Description of the change

Add type view

To post a comment you must log in.
review: Approve
Alberto Garcia (Factor Libre) (agarcia-flibre) : Posted in a previous version of this proposal
review: Approve
Alberto Garcia (Factor Libre) (agarcia-flibre) : Posted in a previous version of this proposal
review: Disapprove
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_payment_sepa_direct_debit/account_invoice_view.xml'
2--- account_payment_sepa_direct_debit/account_invoice_view.xml 2014-02-09 12:20:04 +0000
3+++ account_payment_sepa_direct_debit/account_invoice_view.xml 2014-02-28 20:40:29 +0000
4@@ -11,6 +11,7 @@
5 <field name="name">add.sdd.mandate.on.customer.invoice.form</field>
6 <field name="model">account.invoice</field>
7 <field name="inherit_id" ref="account.invoice_form"/>
8+ <field name="type">form</field>
9 <field name="arch" type="xml">
10 <field name="partner_bank_id" position="after">
11 <field name="sdd_mandate_id" domain="[('partner_id', '=', partner_id), ('state', '=', 'valid')]" attrs="{'invisible': [('type', '=', 'out_refund')]}"/>
12
13=== modified file 'account_payment_sepa_direct_debit/account_payment_view.xml'
14--- account_payment_sepa_direct_debit/account_payment_view.xml 2014-02-09 12:20:04 +0000
15+++ account_payment_sepa_direct_debit/account_payment_view.xml 2014-02-28 20:40:29 +0000
16@@ -11,6 +11,7 @@
17 <field name="name">sdd.payment.order.form</field>
18 <field name="model">payment.order</field>
19 <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
20+ <field name="type">form</field>
21 <field name="arch" type="xml">
22 <xpath expr="//field[@name='line_ids']/form/notebook/page/group/field[@name='bank_id']" position="after">
23 <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_type')!='receivable'" context="{'default_partner_bank_id': bank_id}"/>
24
25=== modified file 'account_payment_sepa_direct_debit/company_view.xml'
26--- account_payment_sepa_direct_debit/company_view.xml 2014-02-09 12:20:04 +0000
27+++ account_payment_sepa_direct_debit/company_view.xml 2014-02-28 20:40:29 +0000
28@@ -11,6 +11,7 @@
29 <field name="name">sepa_direct_debit.res.company.form</field>
30 <field name="model">res.company</field>
31 <field name="inherit_id" ref="account_payment_pain_base.view_company_form"/>
32+ <field name="type">form</field>
33 <field name="arch" type="xml">
34 <group name="pain" position="inside">
35 <field name="sepa_creditor_identifier"/>
36
37=== modified file 'account_payment_sepa_direct_debit/res_partner_bank_view.xml'
38--- account_payment_sepa_direct_debit/res_partner_bank_view.xml 2014-02-09 12:20:04 +0000
39+++ account_payment_sepa_direct_debit/res_partner_bank_view.xml 2014-02-28 20:40:29 +0000
40@@ -11,6 +11,7 @@
41 <field name="name">sdd.mandate.res.partner.bank.form</field>
42 <field name="model">res.partner.bank</field>
43 <field name="inherit_id" ref="base.view_partner_bank_form"/>
44+ <field name="type">form</field>
45 <field name="arch" type="xml">
46 <group name="bank" position="after">
47 <group name="sdd_mandates" string="SEPA Direct Debit Mandates" colspan="4">
48@@ -24,6 +25,7 @@
49 <field name="name">sdd.mandate.res.partner.bank.tree</field>
50 <field name="model">res.partner.bank</field>
51 <field name="inherit_id" ref="base.view_partner_bank_tree"/>
52+ <field name="type">tree</field>
53 <field name="arch" type="xml">
54 <field name="partner_id" position="after">
55 <field name="sdd_mandate_ids" string="SDD Mandates"/>
56@@ -37,6 +39,7 @@
57 <field name="name">sdd.mandate.partner.form</field>
58 <field name="model">res.partner</field>
59 <field name="inherit_id" ref="account.view_partner_property_form"/>
60+ <field name="type">form</field>
61 <field name="arch" type="xml">
62 <xpath expr="//field[@name='bank_ids']/tree/field[@name='owner_name']" position="after">
63 <field name="sdd_mandate_ids" string="SDD Mandates"/>
64
65=== modified file 'account_payment_sepa_direct_debit/sdd_mandate_view.xml'
66--- account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-09 12:20:04 +0000
67+++ account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-28 20:40:29 +0000
68@@ -10,6 +10,7 @@
69 <record id="sdd_mandate_form" model="ir.ui.view">
70 <field name="name">sdd.mandate.form</field>
71 <field name="model">sdd.mandate</field>
72+ <field name="type">form</field>
73 <field name="arch" type="xml">
74 <form string="SEPA Direct Debit Mandate" version="7.0">
75 <header>
76@@ -53,6 +54,7 @@
77 <record id="sdd_mandate_tree" model="ir.ui.view">
78 <field name="name">sdd.mandate.tree</field>
79 <field name="model">sdd.mandate</field>
80+ <field name="type">tree</field>
81 <field name="arch" type="xml">
82 <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
83 <field name="company_id" groups="base.group_multi_company"/>
84@@ -69,6 +71,7 @@
85 <record id="sdd_mandate_search" model="ir.ui.view">
86 <field name="name">sdd.mandate.search</field>
87 <field name="model">sdd.mandate</field>
88+ <field name="type">search</field>
89 <field name="arch" type="xml">
90 <search string="Search SEPA Direct Debit Mandates">
91 <field name="partner_id"/>

Subscribers

People subscribed via source and target branches