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

Proposed by Santi Argüeso(Pexego) on 2014-04-22
Status: Merged
Merged at revision: 10
Proposed branch: lp:~santiago-pexego/sepa-tools/make_payments_6.1
Merge into: lp:sepa-tools/6.1
Diff against target: 22 lines (+3/-4)
2 files modified
.bzrignore (+1/-0)
account_payment_export/model/account_payment.py (+2/-4)
To merge this branch: bzr merge lp:~santiago-pexego/sepa-tools/make_payments_6.1
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve on 2014-06-12
Ana Juaristi Olalde (community) Approve on 2014-06-12
Ignacio Ibeas (www.acysos.com) 2014-04-22 Approve on 2014-04-22
Review via email: mp+216751@code.launchpad.net
To post a comment you must log in.
review: Approve
review: Approve
Pedro Manuel Baeza (pedro.baeza) wrote :

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) wrote :

s/menos/demás

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2014-04-22 15:46:17 +0000
4@@ -0,0 +1,1 @@
5+.idea
6
7=== modified file 'account_payment_export/model/account_payment.py'
8--- account_payment_export/model/account_payment.py 2014-02-11 19:31:29 +0000
9+++ account_payment_export/model/account_payment.py 2014-04-22 15:46:17 +0000
10@@ -69,10 +69,8 @@
11 _('You can only combine payment orders of the same type')
12 )
13 # process manual payments
14- wf_service = netsvc.LocalService('workflow')
15- for order_id in ids:
16- wf_service.trg_validate(uid, 'payment.order', order_id, 'done', cr)
17- return True
18+ return self.set_done(cr, uid, ids, context)
19+ #return super(payment_order, self).set_done(cr, uid, ids, context)
20 return result
21
22 class payment_type(orm.Model):

Subscribers

People subscribed via source and target branches