Merge lp:~akretion-team/aeroo/aeroo-v6-fix-892866 into lp:aeroo/openerp6

Proposed by Alexis de Lattre
Status: Merged
Merge reported by: sraps (Alistek)
Merged at revision: not available
Proposed branch: lp:~akretion-team/aeroo/aeroo-v6-fix-892866
Merge into: lp:aeroo/openerp6
Diff against target: 25 lines (+2/-2)
2 files modified
report_aeroo/wizard/report_actions.py (+1/-1)
report_aeroo/wizard/report_actions_remove.py (+1/-1)
To merge this branch: bzr merge lp:~akretion-team/aeroo/aeroo-v6-fix-892866
Reviewer Review Type Date Requested Status
Alistek developers - http://www.alistek.com Pending
Review via email: mp+93959@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Alexis de Lattre (alexis-via) wrote :

Dear friends,

Could we have a merge for this simple fix ?

Thanks in advance !

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_aeroo/wizard/report_actions.py'
2--- report_aeroo/wizard/report_actions.py 2011-11-15 11:01:45 +0000
3+++ report_aeroo/wizard/report_actions.py 2012-02-21 10:41:58 +0000
4@@ -73,7 +73,7 @@
5 def _do_action(self, cr, uid, data, context):
6 pool = pooler.get_pool(cr.dbname)
7 report = pool.get(data['model']).browse(cr, uid, data['id'], context=context)
8- res = ir.ir_set(cr, uid, 'action', 'client_print_multi', report.report_name, [report.model], 'ir.actions.report.xml,%d' % data['id'], isobject=True)
9+ res = ir_set(cr, uid, 'action', 'client_print_multi', report.report_name, [report.model], 'ir.actions.report.xml,%d' % data['id'], isobject=True)
10 if report.report_wizard:
11 report._set_report_wizard()
12 return {'value_id':res[0]}
13
14=== modified file 'report_aeroo/wizard/report_actions_remove.py'
15--- report_aeroo/wizard/report_actions_remove.py 2011-11-15 11:01:45 +0000
16+++ report_aeroo/wizard/report_actions_remove.py 2012-02-21 10:41:58 +0000
17@@ -63,7 +63,7 @@
18 pool.get('ir.actions.act_window').unlink(cr, uid, data['report_action_id'], context=context)
19 else:
20 event_id = pool.get('ir.values').search(cr, uid, [('value','=','ir.actions.report.xml,%d' % data['id'])])[0]
21- res = ir.ir_del(cr, uid, event_id)
22+ res = ir_del(cr, uid, event_id)
23 return {}
24
25 def _check(self, cr, uid, data, context):