Merge lp:~therp-nl/aeroo/stefan_therp-lp910759 into lp:aeroo/openerp6.1.x

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merge reported by: sraps (Alistek)
Merged at revision: not available
Proposed branch: lp:~therp-nl/aeroo/stefan_therp-lp910759
Merge into: lp:aeroo/openerp6.1.x
Diff against target: 11 lines (+1/-0)
1 file modified
report_aeroo/report_aeroo.py (+1/-0)
To merge this branch: bzr merge lp:~therp-nl/aeroo/stefan_therp-lp910759
Reviewer Review Type Date Requested Status
Aeroo Reports Team Pending
Review via email: mp+87241@code.launchpad.net

Description of the change

The 6.1 web client does not pass the model attribute in the data argument when calling the report. Instead, the model is available as context['active_model'].

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
=== modified file 'report_aeroo/report_aeroo.py'
--- report_aeroo/report_aeroo.py 2011-11-15 10:00:56 +0000
+++ report_aeroo/report_aeroo.py 2012-01-02 11:20:29 +0000
@@ -626,6 +626,7 @@
626626
627 # override needed to intercept the call to the proper 'create' method627 # override needed to intercept the call to the proper 'create' method
628 def create(self, cr, uid, ids, data, context=None):628 def create(self, cr, uid, ids, data, context=None):
629 data['model'] = context['active_model']
629 pool = pooler.get_pool(cr.dbname)630 pool = pooler.get_pool(cr.dbname)
630 ir_obj = pool.get('ir.actions.report.xml')631 ir_obj = pool.get('ir.actions.report.xml')
631 name = self.name.startswith('report.') and self.name[7:] or self.name632 name = self.name.startswith('report.') and self.name[7:] or self.name

Subscribers

People subscribed via source and target branches