Merge lp:~therp-nl/banking-addons/6.1-lp1073545-meaningful_dates_in_currency_conversion into lp:banking-addons/6.1

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 146
Proposed branch: lp:~therp-nl/banking-addons/6.1-lp1073545-meaningful_dates_in_currency_conversion
Merge into: lp:banking-addons/6.1
Diff against target: 29 lines (+2/-3)
1 file modified
account_banking/banking_import_transaction.py (+2/-3)
To merge this branch: bzr merge lp:~therp-nl/banking-addons/6.1-lp1073545-meaningful_dates_in_currency_conversion
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+132351@code.launchpad.net
To post a comment you must log in.
142. By Stefan Rijnhart (Opener)

[FIX] Removed unused import

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_banking/banking_import_transaction.py'
2--- account_banking/banking_import_transaction.py 2012-05-07 11:38:26 +0000
3+++ account_banking/banking_import_transaction.py 2012-10-31 15:25:25 +0000
4@@ -25,7 +25,6 @@
5 ##############################################################################
6
7 from osv import osv, fields
8-import time
9 import netsvc
10 import base64
11 import datetime
12@@ -494,7 +493,7 @@
13 if from_curr_id != to_curr_id:
14 amount_currency = statement_line_pool._convert_currency(
15 cr, uid, from_curr_id, to_curr_id, move_line_amount,
16- round=True, date=time.strftime('%Y-%m-%d'),
17+ round=True, date=transaction.move_line_id.date,
18 context=context)
19 else:
20 amount_currency = move_line_amount
21@@ -1560,7 +1559,7 @@
22 from_curr_id = transaction.move_line_id.currency_id and transaction.move_line_id.currency_id.id or transaction.statement_id.company_id.currency_id.id
23 if from_curr_id != to_curr_id:
24 amount_currency = stline_pool._convert_currency(cr, uid, from_curr_id, to_curr_id, move_line_amount, round=True,
25- date=time.strftime('%Y-%m-%d'), context=context)
26+ date=transaction.statement_line_id.date, context=context)
27 else:
28 amount_currency = move_line_amount
29 sign = 1

Subscribers

People subscribed via source and target branches