Merge lp:~unifield-team/unifield-web/utp-820 into lp:unifield-web

[Quentin THEURET @Amaris]

[lp:~unifield-team/unifield-web/utp-820]

4724. By Quentin THEURET @Amaris on 2013-11-06

UTP-820 [IMP] Add the first letters on report name

4725. By Quentin THEURET @Amaris on 2013-11-06

UTP-820 [IMP] Use a regex to get the first letter of a report name

4726. By Quentin THEURET @Amaris on 2013-11-07

UTP-820 [IMP] Use a parser to get the good filename

4727. By Quentin THEURET @Amaris on 2013-11-19

Merge latest trunk

4728. By Quentin THEURET @Amaris on 2013-11-29

UTP-820 [FIX] If the report has a target_filename, use the target filename

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2013-08-06 09:55:16 +0000
+++ addons/openerp/controllers/actions.py	2013-11-29 08:20:42 +0000
@@ -35,6 +35,7 @@
 from tree import Tree
 from wizard import Wizard
 import urllib
+import re
 
 def execute_window(view_ids, model, res_id=False, domain=None, view_type='form', context=None,
                    mode='form,tree', name=None, target=None, limit=None, search_view=None,
@@ -182,9 +183,18 @@
             proxy = rpc.RPCProxy('ir.actions.report.xml')
             res = proxy.search([('report_name','=', name)])
             if res:
-                report_name = proxy.read(res[0], ['name'])['name']
+                read_ctx = datas.copy()
+                read_ctx.setdefault('context', {}).update(ctx)
+                report_name = proxy.read(res[0], ['filename'], read_ctx)['filename']
 
         report_name = report_name.replace('Print ', '')
+
+        if not ids or not datas.get('id') or not datas.get('model'):
+            if datas.get('target_filename'):
+                report_name = datas['target_filename']
+            elif datas.get('context', {}).get('_terp_view_name'):
+                report_name = datas['context']['_terp_view_name']
+
         cherrypy.response.headers['Content-Disposition'] = 'filename="' + report_name + '.' + report_type + '"'
 
         return _print_data(val)