Merge lp:~jsancho/sepa-tools/xml-mandate-views-6.0 into lp:sepa-tools/6.0

Proposed by Javier Sancho on 2014-03-05
Status: Needs review
Proposed branch: lp:~jsancho/sepa-tools/xml-mandate-views-6.0
Merge into: lp:sepa-tools/6.0
Diff against target: 55 lines (+6/-4)
2 files modified
account_payment_export/model/account_payment.py (+1/-4)
account_payment_sepa_direct_debit/sdd_mandate_view.xml (+5/-0)
To merge this branch: bzr merge lp:~jsancho/sepa-tools/xml-mandate-views-6.0
Reviewer Review Type Date Requested Status
Omar (Pexego) test Approve on 2014-05-30
OpenERP SEPA Team 2014-03-05 Pending
Review via email: mp+209410@code.launchpad.net

Description of the change

XML views need some extra fields for OpenERP can build them correctly, for example, type of view.

To post a comment you must log in.
Omar (Pexego) (omar7r) :
review: Approve (test)
12. By Javier Sancho <jsancho@bespin> on 2014-06-02

[FIX] account_payment_export: make payments calling parent class

Unmerged revisions

12. By Javier Sancho <jsancho@bespin> on 2014-06-02

[FIX] account_payment_export: make payments calling parent class

11. By Javier Sancho <jsancho@bespin> on 2014-02-28

[FIX] account_payment_export: make payments calling parent class

10. By Javier Sancho <jsancho@bespin> on 2014-02-28

[FIX] account_payment_sepa_direct_debit: fix XML for mandate views

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_payment_export/model/account_payment.py'
2--- account_payment_export/model/account_payment.py 2014-02-11 19:36:54 +0000
3+++ account_payment_export/model/account_payment.py 2014-06-02 14:43:40 +0000
4@@ -69,10 +69,7 @@
5 _('You can only combine payment orders of the same type')
6 )
7 # process manual payments
8- wf_service = netsvc.LocalService('workflow')
9- for order_id in ids:
10- wf_service.trg_validate(uid, 'payment.order', order_id, 'done', cr)
11- return True
12+ return self.set_done(cr, uid, ids, context)
13 return result
14
15 payment_order()
16
17=== modified file 'account_payment_sepa_direct_debit/sdd_mandate_view.xml'
18--- account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-02-11 18:29:05 +0000
19+++ account_payment_sepa_direct_debit/sdd_mandate_view.xml 2014-06-02 14:43:40 +0000
20@@ -10,6 +10,7 @@
21 <record id="sdd_mandate_form" model="ir.ui.view">
22 <field name="name">sdd.mandate.form</field>
23 <field name="model">sdd.mandate</field>
24+ <field name="type">form</field>
25 <field name="arch" type="xml">
26 <form string="SEPA Direct Debit Mandate">
27 <group colspan="4">
28@@ -45,6 +46,7 @@
29 <record id="sdd_mandate_tree" model="ir.ui.view">
30 <field name="name">sdd.mandate.tree</field>
31 <field name="model">sdd.mandate</field>
32+ <field name="type">tree</field>
33 <field name="arch" type="xml">
34 <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
35 <field name="company_id" groups="base.group_multi_company"/>
36@@ -61,6 +63,7 @@
37 <record id="sdd_mandate_search" model="ir.ui.view">
38 <field name="name">sdd.mandate.search</field>
39 <field name="model">sdd.mandate</field>
40+ <field name="type">search</field>
41 <field name="arch" type="xml">
42 <search string="Search SEPA Direct Debit Mandates">
43 <field name="partner_id"/>
44@@ -76,9 +79,11 @@
45
46 <record id="sdd_mandate_action" model="ir.actions.act_window">
47 <field name="name">SEPA Direct Debit Mandates</field>
48+ <field name="type">ir.actions.act_window</field>
49 <field name="res_model">sdd.mandate</field>
50 <field name="view_type">form</field>
51 <field name="view_mode">tree,form</field>
52+ <field name="search_view_id" ref="sdd_mandate_search"/>
53 <field name="arch" type="xml">
54 <label string="Click to create a new SEPA Direct Debit Mandate.
55 A SEPA Direct Debit Mandate is a document signed by your customer that gives you the autorization to do one or several direct debits on his bank account." colspan="4"/>

Subscribers

People subscribed via source and target branches