Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-734588-mtr into lp:openobject-addons

  1. trunk-bug-734588-mtr
  2. Merge into trunk
Proposed by Meera Trambadia (OpenERP)
Status: Merged
Merge reported by: Meera Trambadia (OpenERP)
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-734588-mtr
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
point_of_sale/wizard/pos_box_entries.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-734588-mtr
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+77284@code.launchpad.net

Description of the change

POS:The users defined on the journal can now finish the payments,irrespective of who opened the journal --fixes-734588

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-bug-734588-mtr updated
4727. By Meera Trambadia (OpenERP)

[IMP] pos:minor change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'point_of_sale/wizard/pos_box_entries.py'
2--- point_of_sale/wizard/pos_box_entries.py 2011-09-25 21:54:57 +0000
3+++ point_of_sale/wizard/pos_box_entries.py 2011-09-28 06:47:28 +0000
4@@ -39,7 +39,7 @@
5 statement_obj = self.pool.get('account.bank.statement')
6
7 j_ids = journal_obj.search(cr, uid, [('journal_user','=',1)], context=context)
8- obj_ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', j_ids)], context=context)
9+ obj_ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('journal_id', 'in', j_ids)], context=context)
10 res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context)
11 res = [(r['journal_id']) for r in res]
12 if not len(res):

Subscribers

People subscribed via source and target branches

to all changes: