Merge lp:~therp-nl/banking-addons/7.0-girotel_sepa_payment_batches into lp:banking-addons

Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 254
Proposed branch: lp:~therp-nl/banking-addons/7.0-girotel_sepa_payment_batches
Merge into: lp:banking-addons
Diff against target: 26 lines (+9/-0)
1 file modified
account_banking_nl_girotel/girotel.py (+9/-0)
To merge this branch: bzr merge lp:~therp-nl/banking-addons/7.0-girotel_sepa_payment_batches
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Approve
Review via email: mp+209682@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_banking_nl_girotel/girotel.py'
2--- account_banking_nl_girotel/girotel.py 2013-08-02 12:51:00 +0000
3+++ account_banking_nl_girotel/girotel.py 2014-03-06 13:48:30 +0000
4@@ -106,6 +106,7 @@
5 self.date = str2date(self.date, '%Y%m%d')
6 if self.direction == 'A':
7 self.transferred_amount = -float(self.transferred_amount)
8+ #payment batch done via clieop
9 if (self.transfer_type == 'VZ'
10 and (not self.remote_account or self.remote_account == '0')
11 and (not self.message or re.match('^\s*$', self.message))
12@@ -113,6 +114,14 @@
13 self.transfer_type = 'PB'
14 self.message = self.remote_owner
15 self.remove_owner = False
16+ #payment batch done via sepa
17+ if self.transfer_type == 'VZ'\
18+ and not self.remote_account\
19+ and not self.remote_owner\
20+ and re.match(
21+ '^Verzamel Eurobetaling .* TOTAAL \d+ POSTEN\s*$',
22+ self.message):
23+ self.transfer_type = 'PB'
24 else:
25 self.transferred_amount = float(self.transferred_amount)
26 self.local_account = self.local_account.zfill(10)

Subscribers

People subscribed via source and target branches

to status/vote changes: