Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-584984-dhs into lp:openobject-addons/7.0

  1. 7.0-opw-584984-dhs
  2. Merge into 7.0
Proposed by Dhruti Shastri(OpenERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 9207
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-584984-dhs
Merge into: lp:openobject-addons/7.0
Diff against target: 11 lines (+1/-0)
1 file modified
account_payment/wizard/account_payment_order.py (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-584984-dhs
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) (community) Approve
Naresh(OpenERP) (community) Approve
Review via email: mp+146352@code.launchpad.net

Description of the change

This patch includes the solution of the bug : https://bugs.launchpad.net/openobject-addons/+bug/1105067,
courtesy of Niels Huylebroeck , Agaplan nv

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Thansk for the patch, these have been merged into addons 7.0 at revision 9207 (revision-id: <email address hidden>)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_payment/wizard/account_payment_order.py'
--- account_payment/wizard/account_payment_order.py 2012-12-06 14:56:32 +0000
+++ account_payment/wizard/account_payment_order.py 2013-02-04 07:49:21 +0000
@@ -87,6 +87,7 @@
87 'order_id': payment.id,87 'order_id': payment.id,
88 'partner_id': line.partner_id and line.partner_id.id or False,88 'partner_id': line.partner_id and line.partner_id.id or False,
89 'communication': line.ref or '/',89 'communication': line.ref or '/',
90 'state': line.invoice and line.invoice.reference_type != 'none' and 'structured' or 'normal',
90 'date': date_to_pay,91 'date': date_to_pay,
91 'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,92 'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
92 }, context=context)93 }, context=context)