Merge lp:~openerp-dev/openobject-addons/trunk-bug-1206167-bde into lp:openobject-addons

Proposed by Bharat Devnani (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1206167-bde
Merge into: lp:openobject-addons
Diff against target: 16 lines (+5/-1)
1 file modified
account_payment/wizard/account_payment_order.py (+5/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1206167-bde
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+200051@code.launchpad.net

Description of the change

I have checked and applied code of Yannick Vaucher
which fixes the issue of account_payment_order - search of move line should ignore
payment move lines with journal type bank.

Thanks & Regards,
Devnani Bharat R.

To post a comment you must log in.

Unmerged revisions

9028. By Yannick Vaucher @ Camptocamp

[FIX] account_payment_order - search of move line should ignore payment move lines with journal type bank

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_payment/wizard/account_payment_order.py'
2--- account_payment/wizard/account_payment_order.py 2013-11-27 15:32:57 +0000
3+++ account_payment/wizard/account_payment_order.py 2013-12-26 08:42:51 +0000
4@@ -104,7 +104,11 @@
5 # payment = self.pool.get('payment.order').browse(cr, uid, context['active_id'], context=context)
6
7 # Search for move line to pay:
8- domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('credit', '>', 0), ('account_id.reconcile', '=', True)]
9+ domain = [('reconcile_id', '=', False),
10+ ('account_id.type', '=', 'payable'),
11+ ('credit', '>', 0),
12+ ('account_id.reconcile', '=', True),
13+ ('journal_id.type','<>','bank')]
14 domain = domain + ['|', ('date_maturity', '<=', search_due_date), ('date_maturity', '=', False)]
15 line_ids = line_obj.search(cr, uid, domain, context=context)
16 context.update({'line_ids': line_ids})

Subscribers

People subscribed via source and target branches

to all changes: