Banking Addons

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

  1. 7.0-fix_post_date_vs_value_date_confusion
  2. Merge into banking-addons-70
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Approved by: Holger Brunn (Therp)
Approved revision: 229
Merged at revision: 241
Proposed branch: lp:~therp-nl/banking-addons/7.0-fix_post_date_vs_value_date_confusion
Merge into: lp:banking-addons
Diff against target: 590 lines (+98/-67)
23 files modified
account_banking/__openerp__.py (+1/-1)
account_banking/banking_import_transaction.py (+6/-6)
account_banking/i18n/account_banking.pot (+3/-3)
account_banking/i18n/da.po (+3/-3)
account_banking/i18n/en.po (+3/-3)
account_banking/i18n/es_ES.po (+3/-3)
account_banking/i18n/hr.po (+3/-3)
account_banking/i18n/hu.po (+3/-3)
account_banking/i18n/nb.po (+3/-3)
account_banking/i18n/nl.po (+5/-5)
account_banking/i18n/pt_BR.po (+3/-3)
account_banking/i18n/ro.po (+3/-3)
account_banking/i18n/tr.po (+3/-3)
account_banking/migrations/7.0.0.3/pre-migration.py (+31/-0)
account_banking/parsers/models.py (+3/-3)
account_banking_camt/camt.py (+1/-1)
account_banking_fi_patu/patu.py (+1/-1)
account_banking_nl_abnamro/abnamro.py (+4/-4)
account_banking_nl_girotel/girotel.py (+2/-2)
account_banking_nl_ing/ing.py (+5/-5)
account_banking_nl_multibank/multibank.py (+4/-4)
account_banking_nl_triodos/triodos.py (+4/-4)
account_banking_uk_hsbc/hsbc_mt940.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/banking-addons/7.0-fix_post_date_vs_value_date_confusion
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Approve
Yannick Vaucher @ Camptocamp code review, no tests Approve
Review via email: mp+206683@code.launchpad.net

Description of the change

Disambiguate the terminology concerning post date and value date. The only import filter that distinguished both dates was HBSC, which assigned value date to 'effective_date'. The recent CAMT filter copied this behaviour but as it turns out, the meaning of the value date (or rather the post date) was not honoured in processing the statement lines.

This branch implements using the post date for basically everything: statement line date, base date for determining statement reference, lookup of reconcilable items. To avoid further confusion, I'm applying the well known 'value date' terminology to the column name (migration included).

A basic fix for 6.1, without the column rename is here: https://code.launchpad.net/~therp-nl/banking-addons/6.1-fix_post_date_vs_value_date_confusion/+merge/206684

To post a comment you must log in.
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

Thanks

review: Approve (code review, no tests)
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

#99, #114... contain the old msgid, I guess you have to rerun msgmerge with the updated pot?
#202 No Capital?

On the column renaming: Is that really necessary? Some google told me that 'value date' indeed seems to be the proper term. That's fine. But so is 'Posted date'. So if we rename columns, why not both?

review: Needs Fixing (code review)
lp:~therp-nl/banking-addons/7.0-fix_post_date_vs_value_date_confusion updated
227. By Stefan Rijnhart (Opener)

[MRG] target branch. Resolved version number conflict

228. By Stefan Rijnhart (Opener)

[FIX] Capitalize Dutch translation string

229. By Stefan Rijnhart (Opener)

[UPD] Update translation msgid

Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

@holger Thanks for the review! I fixed the translations.

Well, the thing with disambiguation is that you only need to clear up one of the terms. Value date has a stronger connotation than the various terminology for date/posted date/execution date. I think the latter are all exchangable. I'm planning on changing the data model in a later proposal so that we only keep the 'value date' next to the standard 'date' field on the bank statement line. Would you be able to live with that for now?

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_banking/__openerp__.py'
--- account_banking/__openerp__.py 2014-03-17 07:38:04 +0000
+++ account_banking/__openerp__.py 2014-03-24 11:46:10 +0000
@@ -26,7 +26,7 @@
2626
27{27{
28 'name': 'Account Banking',28 'name': 'Account Banking',
29 'version': '0.2',29 'version': '0.3',
30 'license': 'AGPL-3',30 'license': 'AGPL-3',
31 'author': 'Banking addons community',31 'author': 'Banking addons community',
32 'website': 'https://launchpad.net/banking-addons',32 'website': 'https://launchpad.net/banking-addons',
3333
=== modified file 'account_banking/banking_import_transaction.py'
--- account_banking/banking_import_transaction.py 2014-01-21 07:55:55 +0000
+++ account_banking/banking_import_transaction.py 2014-03-24 11:46:10 +0000
@@ -74,7 +74,7 @@
74 ('type', '=', 'in_invoice'),74 ('type', '=', 'in_invoice'),
75 ('partner_id', 'child_of', account_info.bank_partner_id.id),75 ('partner_id', 'child_of', account_info.bank_partner_id.id),
76 ('company_id', '=', account_info.company_id.id),76 ('company_id', '=', account_info.company_id.id),
77 ('date_invoice', '=', trans.effective_date),77 ('date_invoice', '=', trans.execution_date),
78 ('reference', '=', reference),78 ('reference', '=', reference),
79 ('amount_total', '=', amount),79 ('amount_total', '=', amount),
80 ]80 ]
@@ -101,7 +101,7 @@
101 period_id = period_id,101 period_id = period_id,
102 journal_id = account_info.invoice_journal_id.id,102 journal_id = account_info.invoice_journal_id.id,
103 account_id = account_info.bank_partner_id.property_account_payable.id,103 account_id = account_info.bank_partner_id.property_account_payable.id,
104 date_invoice = trans.effective_date,104 date_invoice = trans.execution_date,
105 reference_type = 'none',105 reference_type = 'none',
106 reference = reference,106 reference = reference,
107 name = trans.reference or trans.message,107 name = trans.reference or trans.message,
@@ -943,7 +943,7 @@
943943
944 # Link accounting period944 # Link accounting period
945 period_id = banktools.get_period(945 period_id = banktools.get_period(
946 self.pool, cr, uid, transaction.effective_date,946 self.pool, cr, uid, transaction.execution_date,
947 company, results['log'])947 company, results['log'])
948 if not period_id:948 if not period_id:
949 results['trans_skipped_cnt'] += 1949 results['trans_skipped_cnt'] += 1
@@ -959,7 +959,7 @@
959 else:959 else:
960 values = {960 values = {
961 'name': '%s.%s' % (transaction.statement, transaction.transaction),961 'name': '%s.%s' % (transaction.statement, transaction.transaction),
962 'date': transaction.effective_date,962 'date': transaction.execution_date,
963 'amount': transaction.transferred_amount,963 'amount': transaction.transferred_amount,
964 'statement_id': transaction.statement_id.id,964 'statement_id': transaction.statement_id.id,
965 'note': transaction.message,965 'note': transaction.message,
@@ -1290,8 +1290,8 @@
1290 'reference': fields.char('reference', size=1024),1290 'reference': fields.char('reference', size=1024),
1291 'local_account': fields.char('local_account', size=24),1291 'local_account': fields.char('local_account', size=24),
1292 'local_currency': fields.char('local_currency', size=16),1292 'local_currency': fields.char('local_currency', size=16),
1293 'execution_date': fields.date('execution_date'),1293 'execution_date': fields.date('Posted date'),
1294 'effective_date': fields.date('effective_date'),1294 'value_date': fields.date('Value date'),
1295 'remote_account': fields.char('remote_account', size=24),1295 'remote_account': fields.char('remote_account', size=24),
1296 'remote_currency': fields.char('remote_currency', size=16),1296 'remote_currency': fields.char('remote_currency', size=16),
1297 'exchange_rate': fields.float('exchange_rate'),1297 'exchange_rate': fields.float('exchange_rate'),
12981298
=== modified file 'account_banking/i18n/account_banking.pot'
--- account_banking/i18n/account_banking.pot 2013-11-13 08:13:18 +0000
+++ account_banking/i18n/account_banking.pot 2014-03-24 11:46:10 +0000
@@ -288,7 +288,7 @@
288288
289#. module: account_banking289#. module: account_banking
290#: field:banking.import.transaction,execution_date:0290#: field:banking.import.transaction,execution_date:0
291msgid "execution_date"291msgid "Posted date"
292msgstr ""292msgstr ""
293293
294#. module: account_banking294#. module: account_banking
@@ -785,8 +785,8 @@
785msgstr ""785msgstr ""
786786
787#. module: account_banking787#. module: account_banking
788#: field:banking.import.transaction,effective_date:0788#: field:banking.import.transaction,value_date:0
789msgid "effective_date"789msgid "Value date"
790msgstr ""790msgstr ""
791791
792#. module: account_banking792#. module: account_banking
793793
=== modified file 'account_banking/i18n/da.po'
--- account_banking/i18n/da.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/da.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -801,8 +801,8 @@
801msgstr ""801msgstr ""
802802
803#. module: account_banking803#. module: account_banking
804#: field:banking.import.transaction,effective_date:0804#: field:banking.import.transaction,value_date:0
805msgid "effective_date"805msgid "Value date"
806msgstr ""806msgstr ""
807807
808#. module: account_banking808#. module: account_banking
809809
=== modified file 'account_banking/i18n/en.po'
--- account_banking/i18n/en.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/en.po 2014-03-24 11:46:10 +0000
@@ -292,7 +292,7 @@
292292
293#. module: account_banking293#. module: account_banking
294#: field:banking.import.transaction,execution_date:0294#: field:banking.import.transaction,execution_date:0
295msgid "execution_date"295msgid "Posted date"
296msgstr ""296msgstr ""
297297
298#. module: account_banking298#. module: account_banking
@@ -807,8 +807,8 @@
807msgstr ""807msgstr ""
808808
809#. module: account_banking809#. module: account_banking
810#: field:banking.import.transaction,effective_date:0810#: field:banking.import.transaction,value_date:0
811msgid "effective_date"811msgid "Value date"
812msgstr ""812msgstr ""
813813
814#. module: account_banking814#. module: account_banking
815815
=== modified file 'account_banking/i18n/es_ES.po'
--- account_banking/i18n/es_ES.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/es_ES.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -801,8 +801,8 @@
801msgstr ""801msgstr ""
802802
803#. module: account_banking803#. module: account_banking
804#: field:banking.import.transaction,effective_date:0804#: field:banking.import.transaction,value_date:0
805msgid "effective_date"805msgid "Value date"
806msgstr ""806msgstr ""
807807
808#. module: account_banking808#. module: account_banking
809809
=== modified file 'account_banking/i18n/hr.po'
--- account_banking/i18n/hr.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/hr.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -807,8 +807,8 @@
807msgstr ""807msgstr ""
808808
809#. module: account_banking809#. module: account_banking
810#: field:banking.import.transaction,effective_date:0810#: field:banking.import.transaction,value_date:0
811msgid "effective_date"811msgid "Value date"
812msgstr ""812msgstr ""
813813
814#. module: account_banking814#. module: account_banking
815815
=== modified file 'account_banking/i18n/hu.po'
--- account_banking/i18n/hu.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/hu.po 2014-03-24 11:46:10 +0000
@@ -303,7 +303,7 @@
303303
304#. module: account_banking304#. module: account_banking
305#: field:banking.import.transaction,execution_date:0305#: field:banking.import.transaction,execution_date:0
306msgid "execution_date"306msgid "Posted date"
307msgstr "execution_date"307msgstr "execution_date"
308308
309#. module: account_banking309#. module: account_banking
@@ -814,8 +814,8 @@
814msgstr ""814msgstr ""
815815
816#. module: account_banking816#. module: account_banking
817#: field:banking.import.transaction,effective_date:0817#: field:banking.import.transaction,value_date:0
818msgid "effective_date"818msgid "Value date"
819msgstr ""819msgstr ""
820820
821#. module: account_banking821#. module: account_banking
822822
=== modified file 'account_banking/i18n/nb.po'
--- account_banking/i18n/nb.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/nb.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -801,8 +801,8 @@
801msgstr ""801msgstr ""
802802
803#. module: account_banking803#. module: account_banking
804#: field:banking.import.transaction,effective_date:0804#: field:banking.import.transaction,value_date:0
805msgid "effective_date"805msgid "Value date"
806msgstr ""806msgstr ""
807807
808#. module: account_banking808#. module: account_banking
809809
=== modified file 'account_banking/i18n/nl.po'
--- account_banking/i18n/nl.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/nl.po 2014-03-24 11:46:10 +0000
@@ -301,8 +301,8 @@
301301
302#. module: account_banking302#. module: account_banking
303#: field:banking.import.transaction,execution_date:0303#: field:banking.import.transaction,execution_date:0
304msgid "execution_date"304msgid "Posted date"
305msgstr "execution_date"305msgstr "Boekdatum"
306306
307#. module: account_banking307#. module: account_banking
308#: field:banking.import.line,account_id:0308#: field:banking.import.line,account_id:0
@@ -822,9 +822,9 @@
822msgstr "Betaalverschil"822msgstr "Betaalverschil"
823823
824#. module: account_banking824#. module: account_banking
825#: field:banking.import.transaction,effective_date:0825#: field:banking.import.transaction,value_date:0
826msgid "effective_date"826msgid "Value date"
827msgstr "effective_date"827msgstr "Valutadatum"
828828
829#. module: account_banking829#. module: account_banking
830#: view:account.bank.statement.line:0830#: view:account.bank.statement.line:0
831831
=== modified file 'account_banking/i18n/pt_BR.po'
--- account_banking/i18n/pt_BR.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/pt_BR.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -801,8 +801,8 @@
801msgstr ""801msgstr ""
802802
803#. module: account_banking803#. module: account_banking
804#: field:banking.import.transaction,effective_date:0804#: field:banking.import.transaction,value_date:0
805msgid "effective_date"805msgid "Value date"
806msgstr ""806msgstr ""
807807
808#. module: account_banking808#. module: account_banking
809809
=== modified file 'account_banking/i18n/ro.po'
--- account_banking/i18n/ro.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/ro.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -801,8 +801,8 @@
801msgstr ""801msgstr ""
802802
803#. module: account_banking803#. module: account_banking
804#: field:banking.import.transaction,effective_date:0804#: field:banking.import.transaction,value_date:0
805msgid "effective_date"805msgid "Value date"
806msgstr ""806msgstr ""
807807
808#. module: account_banking808#. module: account_banking
809809
=== modified file 'account_banking/i18n/tr.po'
--- account_banking/i18n/tr.po 2014-03-21 06:57:59 +0000
+++ account_banking/i18n/tr.po 2014-03-24 11:46:10 +0000
@@ -293,7 +293,7 @@
293293
294#. module: account_banking294#. module: account_banking
295#: field:banking.import.transaction,execution_date:0295#: field:banking.import.transaction,execution_date:0
296msgid "execution_date"296msgid "Posted date"
297msgstr ""297msgstr ""
298298
299#. module: account_banking299#. module: account_banking
@@ -801,8 +801,8 @@
801msgstr ""801msgstr ""
802802
803#. module: account_banking803#. module: account_banking
804#: field:banking.import.transaction,effective_date:0804#: field:banking.import.transaction,value_date:0
805msgid "effective_date"805msgid "Value date"
806msgstr ""806msgstr ""
807807
808#. module: account_banking808#. module: account_banking
809809
=== added directory 'account_banking/migrations/7.0.0.3'
=== added file 'account_banking/migrations/7.0.0.3/pre-migration.py'
--- account_banking/migrations/7.0.0.3/pre-migration.py 1970-01-01 00:00:00 +0000
+++ account_banking/migrations/7.0.0.3/pre-migration.py 2014-03-24 11:46:10 +0000
@@ -0,0 +1,31 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# Copyright (C) 2014 Therp BV (<http://therp.nl>).
5# All Rights Reserved
6#
7# This program is free software: you can redistribute it and/or modify
8# it under the terms of the GNU Affero General Public License as
9# published by the Free Software Foundation, either version 3 of the
10# License, or (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Affero General Public License for more details.
16#
17# You should have received a copy of the GNU Affero General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20##############################################################################
21
22def migrate(cr, version):
23 if not version:
24 return
25
26 # Rename value date column
27 cr.execute(
28 """
29 ALTER TABLE banking_import_transaction
30 RENAME COLUMN effective_date TO value_date
31 """)
032
=== modified file 'account_banking/parsers/models.py'
--- account_banking/parsers/models.py 2014-01-05 02:07:34 +0000
+++ account_banking/parsers/models.py 2014-03-24 11:46:10 +0000
@@ -86,10 +86,10 @@
86 # The currency the bank used to process the transferred amount86 # The currency the bank used to process the transferred amount
8787
88 'execution_date',88 'execution_date',
89 # The requested execution date of the action - order date if you like89 # The posted date of the action
9090
91 'effective_date',91 'value_date',
92 # The real execution date of the action92 # The value date of the action
9393
94 'remote_account',94 'remote_account',
95 # The account of the other party95 # The account of the other party
9696
=== modified file 'account_banking_camt/camt.py'
--- account_banking_camt/camt.py 2014-03-20 11:03:58 +0000
+++ account_banking_camt/camt.py 2014-03-24 11:46:10 +0000
@@ -182,7 +182,7 @@
182 """182 """
183 entry_details = {183 entry_details = {
184 'execution_date': self.xpath(node, './ns:BookgDt/ns:Dt')[0].text,184 'execution_date': self.xpath(node, './ns:BookgDt/ns:Dt')[0].text,
185 'effective_date': self.xpath(node, './ns:ValDt/ns:Dt')[0].text,185 'value_date': self.xpath(node, './ns:ValDt/ns:Dt')[0].text,
186 'transfer_type': self.get_transfer_type(node),186 'transfer_type': self.get_transfer_type(node),
187 'transferred_amount': self.parse_amount(node)187 'transferred_amount': self.parse_amount(node)
188 }188 }
189189
=== modified file 'account_banking_fi_patu/patu.py'
--- account_banking_fi_patu/patu.py 2013-04-15 13:59:50 +0000
+++ account_banking_fi_patu/patu.py 2014-03-24 11:46:10 +0000
@@ -39,7 +39,7 @@
39 "remote_currency": "currency",39 "remote_currency": "currency",
40 "transferred_amount": "amount",40 "transferred_amount": "amount",
41 "execution_date": "recorddate",41 "execution_date": "recorddate",
42 "effective_date": "paymentdate",42 "value_date": "paymentdate",
43 "transfer_type": "eventtype",43 "transfer_type": "eventtype",
44 "reference": "refnr",44 "reference": "refnr",
45 "eventcode": "eventcode",45 "eventcode": "eventcode",
4646
=== modified file 'account_banking_nl_abnamro/abnamro.py'
--- account_banking_nl_abnamro/abnamro.py 2013-10-02 08:56:55 +0000
+++ account_banking_nl_abnamro/abnamro.py 2014-03-24 11:46:10 +0000
@@ -67,9 +67,9 @@
67 self.transferred_amount = float(67 self.transferred_amount = float(
68 self.transferred_amount.replace(',', '.'))68 self.transferred_amount.replace(',', '.'))
69 self.execution_date = str2date(self.date, '%Y%m%d')69 self.execution_date = str2date(self.date, '%Y%m%d')
70 self.effective_date = str2date(self.date, '%Y%m%d')70 self.value_date = str2date(self.date, '%Y%m%d')
71 # Set statement_id based on week number71 # Set statement_id based on week number
72 self.statement_id = self.effective_date.strftime('%Yw%W')72 self.statement_id = self.execution_date.strftime('%Yw%W')
73 self.id = str(subno).zfill(4)73 self.id = str(subno).zfill(4)
7474
75class transaction(models.mem_bank_transaction):75class transaction(models.mem_bank_transaction):
@@ -77,7 +77,7 @@
77 Implementation of transaction communication class for account_banking.77 Implementation of transaction communication class for account_banking.
78 '''78 '''
79 attrnames = ['local_account', 'local_currency', 'transferred_amount',79 attrnames = ['local_account', 'local_currency', 'transferred_amount',
80 'blob', 'execution_date', 'effective_date', 'id',80 'blob', 'execution_date', 'value_date', 'id',
81 ]81 ]
8282
83 type_map = {83 type_map = {
@@ -369,7 +369,7 @@
369 msg = transaction_message(line, subno)369 msg = transaction_message(line, subno)
370 if not statement_id:370 if not statement_id:
371 statement_id = self.get_unique_statement_id(371 statement_id = self.get_unique_statement_id(
372 cr, msg.effective_date.strftime('%Yw%W'))372 cr, msg.execution_date.strftime('%Yw%W'))
373 msg.statement_id = statement_id373 msg.statement_id = statement_id
374 if stmnt:374 if stmnt:
375 stmnt.import_transaction(msg)375 stmnt.import_transaction(msg)
376376
=== modified file 'account_banking_nl_girotel/girotel.py'
--- account_banking_nl_girotel/girotel.py 2013-08-02 12:51:00 +0000
+++ account_banking_nl_girotel/girotel.py 2014-03-24 11:46:10 +0000
@@ -120,7 +120,7 @@
120 self.remote_account = self.remote_account.zfill(10)120 self.remote_account = self.remote_account.zfill(10)
121 else:121 else:
122 self.remote_account = False122 self.remote_account = False
123 self.execution_date = self.effective_date = self.date123 self.execution_date = self.value_date = self.date
124 self.remote_owner = self.remote_owner.rstrip()124 self.remote_owner = self.remote_owner.rstrip()
125 self.message = self.message.rstrip()125 self.message = self.message.rstrip()
126 self.genid()126 self.genid()
@@ -137,7 +137,7 @@
137 '''137 '''
138 attrnames = [ 'statement_id', 'remote_account', 'remote_owner',138 attrnames = [ 'statement_id', 'remote_account', 'remote_owner',
139 'remote_currency', 'transferred_amount', 'execution_date',139 'remote_currency', 'transferred_amount', 'execution_date',
140 'effective_date', 'transfer_type', 'message',140 'value_date', 'transfer_type', 'message',
141 ]141 ]
142142
143 type_map = {143 type_map = {
144144
=== modified file 'account_banking_nl_ing/ing.py'
--- account_banking_nl_ing/ing.py 2013-06-05 12:30:03 +0000
+++ account_banking_nl_ing/ing.py 2014-03-24 11:46:10 +0000
@@ -68,10 +68,10 @@
68 if self.debcred == 'Af':68 if self.debcred == 'Af':
69 self.transferred_amount = -self.transferred_amount69 self.transferred_amount = -self.transferred_amount
70 try:70 try:
71 self.execution_date = self.effective_date = str2date(self.date, '%Y%m%d')71 self.execution_date = self.value_date = str2date(self.date, '%Y%m%d')
72 except ValueError:72 except ValueError:
73 self.execution_date = self.effective_date = str2date(self.date, '%d-%m-%Y')73 self.execution_date = self.value_date = str2date(self.date, '%d-%m-%Y')
74 self.statement_id = '' #self.effective_date.strftime('%Yw%W')74 self.statement_id = '' #self.value_date.strftime('%Yw%W')
75 self.id = str(subno).zfill(4)75 self.id = str(subno).zfill(4)
76 self.reference = ''76 self.reference = ''
77 # Normalize basic account numbers77 # Normalize basic account numbers
@@ -85,7 +85,7 @@
85 '''85 '''
86 attrnames = ['local_account', 'remote_account',86 attrnames = ['local_account', 'remote_account',
87 'remote_owner', 'transferred_amount',87 'remote_owner', 'transferred_amount',
88 'execution_date', 'effective_date', 'transfer_type',88 'execution_date', 'value_date', 'transfer_type',
89 'id', 'reference', 'statement_id', 'message',89 'id', 'reference', 'statement_id', 'message',
90 ]90 ]
9191
@@ -279,7 +279,7 @@
279 msg = transaction_message(line, subno)279 msg = transaction_message(line, subno)
280 if not statement_id:280 if not statement_id:
281 statement_id = self.get_unique_statement_id(281 statement_id = self.get_unique_statement_id(
282 cr, msg.effective_date.strftime('%Yw%W'))282 cr, msg.execution_date.strftime('%Yw%W'))
283 msg.statement_id = statement_id283 msg.statement_id = statement_id
284 if stmnt:284 if stmnt:
285 stmnt.import_transaction(msg)285 stmnt.import_transaction(msg)
286286
=== modified file 'account_banking_nl_multibank/multibank.py'
--- account_banking_nl_multibank/multibank.py 2013-04-15 13:59:50 +0000
+++ account_banking_nl_multibank/multibank.py 2014-03-24 11:46:10 +0000
@@ -44,7 +44,7 @@
44 attrnames = [44 attrnames = [
45 'date', 'local_account', 'remote_account', 'remote_owner', 'u1', 'u2',45 'date', 'local_account', 'remote_account', 'remote_owner', 'u1', 'u2',
46 'u3', 'local_currency', 'start_balance', 'remote_currency',46 'u3', 'local_currency', 'start_balance', 'remote_currency',
47 'transferred_amount', 'execution_date', 'effective_date', 'nr1',47 'transferred_amount', 'execution_date', 'value_date', 'nr1',
48 'transfer_type', 'nr2', 'reference', 'message', 'statement_id'48 'transfer_type', 'nr2', 'reference', 'message', 'statement_id'
49 ]49 ]
5050
@@ -82,7 +82,7 @@
82 self.start_balance = float(self.start_balance)82 self.start_balance = float(self.start_balance)
83 self.transferred_amount = float(self.transferred_amount)83 self.transferred_amount = float(self.transferred_amount)
84 self.execution_date = str2date(self.execution_date, '%d-%m-%Y')84 self.execution_date = str2date(self.execution_date, '%d-%m-%Y')
85 self.effective_date = str2date(self.effective_date, '%d-%m-%Y')85 self.value_date = str2date(self.value_date, '%d-%m-%Y')
86 self.id = str(subno).zfill(4)86 self.id = str(subno).zfill(4)
8787
88class transaction(models.mem_bank_transaction):88class transaction(models.mem_bank_transaction):
@@ -91,7 +91,7 @@
91 '''91 '''
92 attrnames = ['local_account', 'local_currency', 'remote_account',92 attrnames = ['local_account', 'local_currency', 'remote_account',
93 'remote_owner', 'remote_currency', 'transferred_amount',93 'remote_owner', 'remote_currency', 'transferred_amount',
94 'execution_date', 'effective_date', 'transfer_type',94 'execution_date', 'value_date', 'transfer_type',
95 'reference', 'message', 'statement_id', 'id',95 'reference', 'message', 'statement_id', 'id',
96 ]96 ]
9797
@@ -152,7 +152,7 @@
152 have their transfer_type set to 'OPN'.152 have their transfer_type set to 'OPN'.
153 '''153 '''
154 return (self.transferred_amount and self.execution_date and154 return (self.transferred_amount and self.execution_date and
155 self.effective_date) and (155 self.value_date) and (
156 self.remote_account or156 self.remote_account or
157 self.transfer_type in [157 self.transfer_type in [
158 'KST', 'PRV', 'BTL', 'BEA', 'OPN', 'KNT', 'DIV',158 'KST', 'PRV', 'BTL', 'BEA', 'OPN', 'KNT', 'DIV',
159159
=== modified file 'account_banking_nl_triodos/triodos.py'
--- account_banking_nl_triodos/triodos.py 2013-11-17 19:15:43 +0000
+++ account_banking_nl_triodos/triodos.py 2014-03-24 11:46:10 +0000
@@ -65,8 +65,8 @@
65 if self.debcred == 'Debet':65 if self.debcred == 'Debet':
66 self.transferred_amount = -self.transferred_amount66 self.transferred_amount = -self.transferred_amount
67 self.execution_date = str2date(self.date, '%d-%m-%Y')67 self.execution_date = str2date(self.date, '%d-%m-%Y')
68 self.effective_date = str2date(self.date, '%d-%m-%Y')68 self.value_date = str2date(self.date, '%d-%m-%Y')
69 self.statement_id = '' # self.effective_date.strftime('%Yw%W') # Set statement_id based on week number69 self.statement_id = ''
70 self.id = str(subno).zfill(4)70 self.id = str(subno).zfill(4)
71 # Normalize basic account numbers71 # Normalize basic account numbers
72 self.remote_account = self.remote_account.replace('.', '').zfill(10)72 self.remote_account = self.remote_account.replace('.', '').zfill(10)
@@ -78,7 +78,7 @@
78 '''78 '''
79 attrnames = ['local_account', 'remote_account',79 attrnames = ['local_account', 'remote_account',
80 'remote_owner', 'transferred_amount',80 'remote_owner', 'transferred_amount',
81 'execution_date', 'effective_date', 'transfer_type',81 'execution_date', 'value_date', 'transfer_type',
82 'reference', 'id',82 'reference', 'id',
83 ]83 ]
8484
@@ -212,7 +212,7 @@
212 msg = transaction_message(line, subno)212 msg = transaction_message(line, subno)
213 if not statement_id:213 if not statement_id:
214 statement_id = self.get_unique_statement_id(214 statement_id = self.get_unique_statement_id(
215 cr, msg.effective_date.strftime('%Yw%W'))215 cr, msg.execution_date.strftime('%Yw%W'))
216 msg.statement_id = statement_id216 msg.statement_id = statement_id
217 if stmnt:217 if stmnt:
218 stmnt.import_transaction(msg)218 stmnt.import_transaction(msg)
219219
=== modified file 'account_banking_uk_hsbc/hsbc_mt940.py'
--- account_banking_uk_hsbc/hsbc_mt940.py 2012-04-30 17:11:56 +0000
+++ account_banking_uk_hsbc/hsbc_mt940.py 2014-03-24 11:46:10 +0000
@@ -40,7 +40,7 @@
4040
41 mapping = {41 mapping = {
42 'execution_date' : 'valuedate',42 'execution_date' : 'valuedate',
43 'effective_date' : 'valuedate',43 'value_date' : 'valuedate',
44 'local_currency' : 'currency',44 'local_currency' : 'currency',
45 'transfer_type' : 'bookingcode',45 'transfer_type' : 'bookingcode',
46 'reference' : 'custrefno',46 'reference' : 'custrefno',

Subscribers

People subscribed via source and target branches

to status/vote changes: