Merge lp:~therp-nl/account-banking/5.0-lp1037543-cursor_not_cr into lp:account-banking

Proposed by Stefan Rijnhart (Opener)
Status: Needs review
Proposed branch: lp:~therp-nl/account-banking/5.0-lp1037543-cursor_not_cr
Merge into: lp:account-banking
Diff against target: 21 lines (+2/-2)
1 file modified
account_banking/account_banking.py (+2/-2)
To merge this branch: bzr merge lp:~therp-nl/account-banking/5.0-lp1037543-cursor_not_cr
Reviewer Review Type Date Requested Status
Pieter J. Kersten (EduSense BV) Pending
Review via email: mp+119908@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

68. By Stefan Rijnhart (Opener)

[FIX] Refer to 'cursor' instead of unknown 'cr'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_banking/account_banking.py'
--- account_banking/account_banking.py 2011-11-08 13:10:34 +0000
+++ account_banking/account_banking.py 2012-08-16 12:23:22 +0000
@@ -375,7 +375,7 @@
375 company_currency_id, move.amount, context=context,375 company_currency_id, move.amount, context=context,
376 account=acc_cur)376 account=acc_cur)
377 if st.currency.id != company_currency_id:377 if st.currency.id != company_currency_id:
378 amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,378 amount_cur = res_currency_obj.compute(cursor, uid, company_currency_id,
379 st.currency.id, amount, context=context,379 st.currency.id, amount, context=context,
380 account=acc_cur)380 account=acc_cur)
381 val['amount_currency'] = -amount_cur381 val['amount_currency'] = -amount_cur
@@ -460,7 +460,7 @@
460 ## We need to make a partial reconciliation460 ## We need to make a partial reconciliation
461 ## To add this amount to previous paid amount461 ## To add this amount to previous paid amount
462 if previous_partial:462 if previous_partial:
463 account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)463 account_move_line_obj.reconcile_partial(cursor, uid, torec, 'statement', context)
464 ## If it's the first reconciliation, we do a full reconciliation as regular464 ## If it's the first reconciliation, we do a full reconciliation as regular
465 else:465 else:
466 account_move_line_obj.reconcile(466 account_move_line_obj.reconcile(

Subscribers

People subscribed via source and target branches