Merge lp:~factorlibre/sepa-tools/sepa-tools into lp:sepa-tools/6.1

Proposed by Alberto Garcia (Factor Libre) on 2014-02-28
Status: Merged
Merged at revision: 7
Proposed branch: lp:~factorlibre/sepa-tools/sepa-tools
Merge into: lp:sepa-tools/6.1
Diff against target: 99 lines (+10/-0)
5 files modified
account_payment_sepa_direct_debit/account_banking_sdd_view.xml (+2/-0)
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/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
Reviewer Review Type Date Requested Status
Ignacio Ibeas (www.acysos.com) 2014-02-28 Approve on 2014-02-28
Review via email: mp+208746@code.launchpad.net

Description of the change

Add type view in mandate

To post a comment you must log in.

El bug proviene de banking-addons que lo tienen así, aunque en la ramas OCB no da ese fallo, es más correcto especificarlo como has indicado.

Recomiendo que avises de este bug a banking-addons.

Aprobado el merge.

Saludos

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_banking_sdd_view.xml'
2--- account_payment_sepa_direct_debit/account_banking_sdd_view.xml 2014-02-09 15:05:50 +0000
3+++ account_payment_sepa_direct_debit/account_banking_sdd_view.xml 2014-02-28 08:45:21 +0000
4@@ -10,6 +10,7 @@
5 <record id="view_banking_export_sdd_form" model="ir.ui.view">
6 <field name="name">account.banking.export.sdd.form</field>
7 <field name="model">banking.export.sdd</field>
8+ <field name="type">form</field>
9 <field name="arch" type="xml">
10 <form string="SEPA Direct Debit">
11 <notebook>
12@@ -43,6 +44,7 @@
13 <record id="view_banking_export_sdd_tree" model="ir.ui.view">
14 <field name="name">account.banking.export.sdd.tree</field>
15 <field name="model">banking.export.sdd</field>
16+ <field name="type">tree</field>
17 <field name="arch" type="xml">
18 <tree string="SEPA Direct Debit">
19 <field name="filename"/>
20
21=== modified file 'account_payment_sepa_direct_debit/account_invoice_view.xml'
22--- account_payment_sepa_direct_debit/account_invoice_view.xml 2014-02-09 15:05:50 +0000
23+++ account_payment_sepa_direct_debit/account_invoice_view.xml 2014-02-28 08:45:21 +0000
24@@ -11,6 +11,7 @@
25 <field name="name">add.sdd.mandate.on.customer.invoice.form</field>
26 <field name="model">account.invoice</field>
27 <field name="inherit_id" ref="account.invoice_form"/>
28+ <field name="type">form</field>
29 <field name="arch" type="xml">
30 <field name="partner_bank_id" position="after">
31 <field name="sdd_mandate_id" domain="[('partner_id', '=', partner_id), ('state', '=', 'valid')]" attrs="{'invisible': [('type', '=', 'out_refund')]}"/>
32
33=== modified file 'account_payment_sepa_direct_debit/account_payment_view.xml'
34--- account_payment_sepa_direct_debit/account_payment_view.xml 2014-02-09 15:05:50 +0000
35+++ account_payment_sepa_direct_debit/account_payment_view.xml 2014-02-28 08:45:21 +0000
36@@ -11,6 +11,7 @@
37 <field name="name">sdd.payment.order.form</field>
38 <field name="model">payment.order</field>
39 <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
40+ <field name="type">form</field>
41 <field name="arch" type="xml">
42 <xpath expr="//field[@name='line_ids']/form/notebook/page/field[@name='bank_id']" position="after">
43 <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}"/>
44
45=== modified file 'account_payment_sepa_direct_debit/res_partner_bank_view.xml'
46--- account_payment_sepa_direct_debit/res_partner_bank_view.xml 2014-02-09 15:05:50 +0000
47+++ account_payment_sepa_direct_debit/res_partner_bank_view.xml 2014-02-28 08:45:21 +0000
48@@ -11,6 +11,7 @@
49 <field name="name">sdd.mandate.res.partner.bank.form</field>
50 <field name="model">res.partner.bank</field>
51 <field name="inherit_id" ref="base.view_partner_bank_form"/>
52+ <field name="type">form</field>
53 <field name="arch" type="xml">
54 <field name="bank_bic" position="after">
55 <separator string="SEPA Direct Debit Mandates" colspan="4" />
56@@ -23,6 +24,7 @@
57 <field name="name">sdd.mandate.res.partner.bank.tree</field>
58 <field name="model">res.partner.bank</field>
59 <field name="inherit_id" ref="base.view_partner_bank_tree"/>
60+ <field name="type">tree</field>
61 <field name="arch" type="xml">
62 <field name="partner_id" position="after">
63 <field name="sdd_mandate_ids" string="SDD Mandates"/>
64@@ -36,6 +38,7 @@
65 <field name="name">sdd.mandate.partner.form</field>
66 <field name="model">res.partner</field>
67 <field name="inherit_id" ref="account.view_partner_property_form"/>
68+ <field name="type">form</field>
69 <field name="arch" type="xml">
70 <xpath expr="//field[@name='bank_ids']/form/group/field[@name='bank_bic']" position="after">
71 <separator string="SEPA Direct Debit Mandates" colspan="4" />
72
73=== modified file 'account_payment_sepa_direct_debit/sdd_mandate_view.xml'
74--- account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-09 15:05:50 +0000
75+++ account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-28 08:45:21 +0000
76@@ -10,6 +10,7 @@
77 <record id="sdd_mandate_form" model="ir.ui.view">
78 <field name="name">sdd.mandate.form</field>
79 <field name="model">sdd.mandate</field>
80+ <field name="type">form</field>
81 <field name="arch" type="xml">
82 <form string="SEPA Direct Debit Mandate">
83 <group colspan="4">
84@@ -45,6 +46,7 @@
85 <record id="sdd_mandate_tree" model="ir.ui.view">
86 <field name="name">sdd.mandate.tree</field>
87 <field name="model">sdd.mandate</field>
88+ <field name="type">tree</field>
89 <field name="arch" type="xml">
90 <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
91 <field name="company_id" groups="base.group_multi_company"/>
92@@ -61,6 +63,7 @@
93 <record id="sdd_mandate_search" model="ir.ui.view">
94 <field name="name">sdd.mandate.search</field>
95 <field name="model">sdd.mandate</field>
96+ <field name="type">search</field>
97 <field name="arch" type="xml">
98 <search string="Search SEPA Direct Debit Mandates">
99 <field name="partner_id"/>

Subscribers

People subscribed via source and target branches