Merge lp:~openbig/bigconsulting/intermediate_account into lp:bigconsulting

Proposed by gpa(OpenERP)
Status: Merged
Merged at revision: 90
Proposed branch: lp:~openbig/bigconsulting/intermediate_account
Merge into: lp:bigconsulting
Diff against target: 18 lines (+2/-2)
1 file modified
account_payment_discount_extension/wizard/wizard_discount_pay.py (+2/-2)
To merge this branch: bzr merge lp:~openbig/bigconsulting/intermediate_account
Reviewer Review Type Date Requested Status
openbig Pending
Review via email: mp+35390@code.launchpad.net

Description of the change

added changes for intermediate bank journal

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_payment_discount_extension/wizard/wizard_discount_pay.py'
--- account_payment_discount_extension/wizard/wizard_discount_pay.py 2010-08-26 11:41:20 +0000
+++ account_payment_discount_extension/wizard/wizard_discount_pay.py 2010-09-14 11:15:18 +0000
@@ -43,12 +43,12 @@
43 order_ref.set_done(cr,uid,data['id'],context)43 order_ref.set_done(cr,uid,data['id'],context)
44 return {}44 return {}
45 45
46 journal_id = order.mode.journal.id46 journal_id = order.inter_bank_journal.id
47 period_ids = pool.get('account.period').find(cr, uid, context=context)47 period_ids = pool.get('account.period').find(cr, uid, context=context)
4848
49 for pay_line in order.line_ids:49 for pay_line in order.line_ids:
50 invoice_data = invoice_obj.browse(cr, uid, pay_line.move_line_id.invoice.id, context=context)50 invoice_data = invoice_obj.browse(cr, uid, pay_line.move_line_id.invoice.id, context=context)
51 account_id = order.mode.journal.default_credit_account_id and order.mode.journal.default_credit_account_id.id #invoice_data.partner_id.property_account_payable.id51 account_id = order.inter_bank_journal.default_credit_account_id and order.inter_bank_journal.default_credit_account_id.id
52 invoice_obj.pay_and_reconcile(cr, uid, [invoice_data.id],52 invoice_obj.pay_and_reconcile(cr, uid, [invoice_data.id],
53 pay_line.amount_currency, account_id, period_ids[0], journal_id, False,53 pay_line.amount_currency, account_id, period_ids[0], journal_id, False,
54 period_ids[0], journal_id, context, pay_line.name)54 period_ids[0], journal_id, context, pay_line.name)

Subscribers

People subscribed via source and target branches