Merge lp:~openerp-dev/openobject-server/6.0-bug-798765-xrg into lp:openobject-server/6.0

Proposed by xrg
Status: Merged
Approved by: Jay Vora (Serpent Consulting Services)
Approved revision: 3444
Merged at revision: 3449
Proposed branch: lp:~openerp-dev/openobject-server/6.0-bug-798765-xrg
Merge into: lp:openobject-server/6.0
Diff against target: 19 lines (+2/-2)
1 file modified
bin/report/printscreen/ps_form.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-bug-798765-xrg
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+65014@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/report/printscreen/ps_form.py'
2--- bin/report/printscreen/ps_form.py 2010-09-06 08:11:04 +0000
3+++ bin/report/printscreen/ps_form.py 2011-06-17 15:24:19 +0000
4@@ -54,15 +54,15 @@
5 if not context:
6 context={}
7 datas['ids'] = ids
8+ pool = pooler.get_pool(cr.dbname)
9 model = pool.get(datas['model'])
10- pool = pooler.get_pool(cr.dbname)
11 # title come from description of model which are specified in py file.
12 self.title = model._description
13 result = model.fields_view_get(cr, uid, view_type='form', context=context)
14
15 fields_order = self._parse_string(result['arch'])
16 rows = model.read(cr, uid, datas['ids'], result['fields'].keys() )
17- res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description)
18+ self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description)
19 return (self.obj.get(), 'pdf')
20
21