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

[Javier Sancho]

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

[Omar (Pexego) (omar7r)]

review: Approve (test)

[lp:~jsancho/sepa-tools/xml-mandate-views-6.0]

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

=== modified file 'account_payment_export/model/account_payment.py'
--- account_payment_export/model/account_payment.py	2014-02-11 19:36:54 +0000
+++ account_payment_export/model/account_payment.py	2014-06-02 14:43:40 +0000
@@ -69,10 +69,7 @@
                         _('You can only combine payment orders of the same type')
                         )
             # process manual payments
-            wf_service = netsvc.LocalService('workflow')
-            for order_id in ids:
-                wf_service.trg_validate(uid, 'payment.order', order_id, 'done', cr)
-	    return True
+            return self.set_done(cr, uid, ids, context)
         return result
     
 payment_order()
 
=== modified file 'account_payment_sepa_direct_debit/sdd_mandate_view.xml'
--- account_payment_sepa_direct_debit/sdd_mandate_view.xml	2014-02-11 18:29:05 +0000
+++ account_payment_sepa_direct_debit/sdd_mandate_view.xml	2014-06-02 14:43:40 +0000
@@ -10,6 +10,7 @@
 <record id="sdd_mandate_form" model="ir.ui.view">
     <field name="name">sdd.mandate.form</field>
     <field name="model">sdd.mandate</field>
+    <field name="type">form</field>
     <field name="arch" type="xml">
         <form string="SEPA Direct Debit Mandate">
             <group colspan="4">
@@ -45,6 +46,7 @@
 <record id="sdd_mandate_tree" model="ir.ui.view">
     <field name="name">sdd.mandate.tree</field>
     <field name="model">sdd.mandate</field>
+    <field name="type">tree</field>
     <field name="arch" type="xml">
         <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
             <field name="company_id" groups="base.group_multi_company"/>
@@ -61,6 +63,7 @@
 <record id="sdd_mandate_search" model="ir.ui.view">
     <field name="name">sdd.mandate.search</field>
     <field name="model">sdd.mandate</field>
+    <field name="type">search</field>
     <field name="arch" type="xml">
         <search string="Search SEPA Direct Debit Mandates">
             <field name="partner_id"/>
@@ -76,9 +79,11 @@
 
 <record id="sdd_mandate_action" model="ir.actions.act_window">
     <field name="name">SEPA Direct Debit Mandates</field>
+    <field name="type">ir.actions.act_window</field>
     <field name="res_model">sdd.mandate</field>
     <field name="view_type">form</field>
     <field name="view_mode">tree,form</field>
+    <field name="search_view_id" ref="sdd_mandate_search"/>
     <field name="arch" type="xml">
     	<label string="Click to create a new SEPA Direct Debit Mandate.
         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"/>