Merge lp:~etsinko/aeroo/bug1194290 into lp:aeroo

[Egor Tsinko]

Unmerged revisions

6. By Egor Tsinko on 2013-07-05

[FIX] Swapped parameters back

=== modified file 'report_aeroo/report_aeroo.py'
--- report_aeroo/report_aeroo.py	2013-05-16 15:53:25 +0000
+++ report_aeroo/report_aeroo.py	2013-07-05 21:32:30 +0000
@@ -500,7 +500,7 @@
 
         aeroo_ooo = context.get('aeroo_ooo', False)
         oo_parser.localcontext['include_subreport'] = self._subreport(cr, uid, aeroo_print, output='odt', aeroo_ooo=aeroo_ooo, context=context)
-        oo_parser.localcontext['include_document'] = self._include_document(aeroo_ooo, print_id)
+        oo_parser.localcontext['include_document'] = self._include_document(print_id, aeroo_ooo)
         deferred = context.get('deferred_process')
         oo_parser.localcontext['progress_update'] = deferred and deferred.progress_update or (lambda:True)
         ####### Add counter functons to localcontext #######