Rifakat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-581296-rha into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
Related bugs:
Bug #1054052 in OpenERP Addons: "[6.1]can't reconcile a customer refund
against more than one invoice"
https://bugs.launchpad.net/openobject-addons/+bug/1054052
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-581296-rha/+merge/132522
Hello,
Currently it is not possible to reconcile invoices againt any credit note.
Credit
line does not getting displayed if it has partial reconcile tag.
lp:1054052 describes detail steps.
After this fix, it is possible to see the credit notes lines on any invoice
payment
voucher, so that one could pay the invoice transaction against that credit.
Please review this fix.
Regards,
Rifakat Haradwala
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-581296-rha/+merge/132522
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-581296-rha.
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2012-08-28 10:58:11 +0000
+++ account_voucher/account_voucher.py 2012-11-01 11:44:23 +0000
@@ -600,7 +600,7 @@
account_type = 'receivable'
if not context.get('move_line_ids', False):
- ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
+ ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id), ('journal_id.type', 'not in', ('bank', 'cash'))], context=context)
else:
ids = context['move_line_ids']
invoice_id = context.get('invoice_id', False)
@@ -612,10 +612,6 @@
account_move_lines = move_line_pool.browse(cr, uid, ids, context=context)
for line in account_move_lines:
- if line.credit and line.reconcile_partial_id and ttype == 'receipt':
- continue
- if line.debit and line.reconcile_partial_id and ttype == 'payment':
- continue
if invoice_id:
if line.invoice.id == invoice_id:
#if the invoice linked to the voucher line is equal to the invoice_id in context
@@ -641,10 +637,6 @@
#voucher line creation
for line in account_move_lines:
- if line.credit and line.reconcile_partial_id and ttype == 'receipt':
- continue
- if line.debit and line.reconcile_partial_id and ttype == 'payment':
- continue
if line.currency_id and currency_id==line.currency_id.id:
amount_original = abs(line.amount_currency)
amount_unreconciled = abs(line.amount_residual_currency)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
