Merge lp:~factorlibre/sepa-tools/sepa-tools-fix-create-account-moves into lp:sepa-tools/6.1

Proposed by Alberto Garcia (Factor Libre) on 2014-03-10
Status: Merged
Merged at revision: 8
Proposed branch: lp:~factorlibre/sepa-tools/sepa-tools-fix-create-account-moves
Merge into: lp:sepa-tools/6.1
Diff against target: 31 lines (+10/-0)
2 files modified
account_payment_sepa_credit_transfer/wizard/export_sepa.py (+5/-0)
account_payment_sepa_direct_debit/wizard/export_sdd.py (+5/-0)
To merge this branch: bzr merge lp:~factorlibre/sepa-tools/sepa-tools-fix-create-account-moves
Reviewer Review Type Date Requested Status
Ignacio Ibeas (www.acysos.com) 2014-03-10 Approve on 2014-03-12
Review via email: mp+210197@code.launchpad.net

Description of the change

[FIX] Create account moves.

To post a comment you must log in.
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_credit_transfer/wizard/export_sepa.py'
2--- account_payment_sepa_credit_transfer/wizard/export_sepa.py 2014-02-09 15:05:50 +0000
3+++ account_payment_sepa_credit_transfer/wizard/export_sepa.py 2014-03-10 12:53:35 +0000
4@@ -268,6 +268,11 @@
5 nb_of_transactions_1_6.text = str(transactions_count_1_6)
6 control_sum_1_7.text = '%.2f' % amount_control_sum_1_7
7
8+ # Call set_done in payment.order to make payment account moves when
9+ # create_account_moves = 'direct-payment'
10+ payment_order_ids = context.get('active_ids', [])
11+ self.pool.get('payment.order').set_done(cr, uid, payment_order_ids, context)
12+
13 return self.finalize_sepa_file_creation(
14 cr, uid, ids, xml_root, total_amount, transactions_count_1_6,
15 gen_args, context=context)
16
17=== modified file 'account_payment_sepa_direct_debit/wizard/export_sdd.py'
18--- account_payment_sepa_direct_debit/wizard/export_sdd.py 2014-02-09 15:05:50 +0000
19+++ account_payment_sepa_direct_debit/wizard/export_sdd.py 2014-03-10 12:53:35 +0000
20@@ -399,6 +399,11 @@
21 nb_of_transactions_1_6.text = str(transactions_count_1_6)
22 control_sum_1_7.text = '%.2f' % amount_control_sum_1_7
23
24+ # Call set_done in payment.order to make payment account moves when
25+ # create_account_moves = 'direct-payment'
26+ payment_order_ids = context.get('active_ids', [])
27+ self.pool.get('payment.order').set_done(cr, uid, payment_order_ids, context)
28+
29 return self.finalize_sepa_file_creation(
30 cr, uid, ids, xml_root, total_amount, transactions_count_1_6,
31 gen_args, context=context)

Subscribers

People subscribed via source and target branches