Merge lp:~openerp-dev/openobject-addons/6.1-opw-586959-pna into lp:openobject-addons/6.1

Proposed by Pinakin Nayi (OpenERP)
Status: Rejected
Rejected by: Chris Biersbach (OpenERP)
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-586959-pna
Merge into: lp:openobject-addons/6.1
Diff against target: 13 lines (+2/-1)
1 file modified
account_voucher/account_voucher.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-586959-pna
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+152089@code.launchpad.net

Description of the change

Hello ,

I fixed issue in account.voucher.
Its forward ported from : https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-573404-nep
Steps to Reproduce :
1) Create invoice.
2) Validate the invoice.
3) From the invoice screen, make payment for "0".
4) The payment is processed and can be verified from the journal
entries.
5) Notice that the Invoice continues to remain in "Open" state.

Result Observed :
The "0" invoices remains in "Open" state even after payment.

Result Expected : expects invoices to be marked done for 0 invoices.

Thanks,
pna

To post a comment you must log in.
Revision history for this message
Chris Biersbach (OpenERP) (cbi-openerp) wrote :

I am rejecting this because 6.1 is not an LTS and we thus no longer merge in it.

Unmerged revisions

7177. By Pinakin Nayi (OpenERP)

[FIX]account_voucher: Allow to close payment voucher with 0.00 amount

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_voucher/account_voucher.py'
2--- account_voucher/account_voucher.py 2012-12-05 17:57:01 +0000
3+++ account_voucher/account_voucher.py 2013-03-07 05:23:22 +0000
4@@ -1017,7 +1017,8 @@
5 for line in voucher_brw.line_ids:
6 #create one move line per voucher line where amount is not 0.0
7 if not line.amount:
8- continue
9+ if line.amount != line_total:
10+ continue
11 # convert the amount set on the voucher line into the currency of the voucher's company
12 amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
13 # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the