Merge lp:~openerp-dev/openobject-addons/6.1-opw-574998-rha into lp:openobject-addons/6.1

Proposed by Rifakat Husen (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-574998-rha
Merge into: lp:openobject-addons/6.1
Diff against target: 20 lines (+0/-8)
1 file modified
account/ (+0/-8)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-574998-rha
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email:

Description of the change


I have corrected return type of _invoice() for field invoice on journal items. It was returning
tuple and generating error for Journal Items list view, opened from wizard 'Manual Reconciliation'. Also removed unneccessary code.

Steps to reproduce it,
1. Create bank statement and encode manual statement line
2. Open wizard 'Manual Reconciliation' from Accounting > Periodical Processing > Reconciliation
3. Edit that line, for field 'Invoice', we can only click on 'Open'
4. Receive error while clikcing on Open

Please review this fix.

Rifakat Haradwala

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


This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Naresh Soni

Unmerged revisions

6807. By Rifakat Husen (OpenERP)

[FIX] account: it generates error while opening record for invoice field, wrong return value of function

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/'
2--- account/ 2012-03-06 16:10:40 +0000
3+++ account/ 2012-05-22 11:04:31 +0000
4@@ -383,16 +383,8 @@
5 'WHERE l.move_id = i.move_id ' \
6 'AND IN %s',
7 (tuple(ids),))
8- invoice_ids = []
9 for line_id, invoice_id in cursor.fetchall():
10 res[line_id] = invoice_id
11- invoice_ids.append(invoice_id)
12- invoice_names = {False: ''}
13- for invoice_id, name in invoice_obj.name_get(cursor, user, invoice_ids, context=context):
14- invoice_names[invoice_id] = name
15- for line_id in res.keys():
16- invoice_id = res[line_id]
17- res[line_id] = (invoice_id, invoice_names[invoice_id])
18 return res
20 def name_get(self, cr, uid, ids, context=None):