Merge lp:~santiago-pexego/sepa-tools/make_payments_6.1 into lp:sepa-tools/6.1

[Santi Argüeso(Pexego)]

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

review: Approve

[Ana Juaristi Olalde (ajuaristio)]

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Cuando se haga el merge, mejor quitar el cambio en el .bzrignore y la línea comentada, pero por lo menos, me parece bien.

Un saludo.

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

s/menos/demás

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-04-22 15:46:17 +0000
@@ -0,0 +1,1 @@
+.idea

=== modified file 'account_payment_export/model/account_payment.py'
--- account_payment_export/model/account_payment.py	2014-02-11 19:31:29 +0000
+++ account_payment_export/model/account_payment.py	2014-04-22 15:46:17 +0000
@@ -69,10 +69,8 @@
                         _('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 super(payment_order, self).set_done(cr, uid, ids, context)
         return result
     
 class payment_type(orm.Model):