From 912d45de5162f1d66e58537d13b09c390a5dc1c8 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 17 Apr 2013 10:05:50 +0200
Subject: [PATCH] [FIX]base-report-designer-plugin: when downloading plugin,
 file didn't have .zip extension, move zip file to static folder

bzr revid: csn@openerp.com-20130417080550-duen03d70s4tryr1
---
 .../base_report_designer_installer.xml              |   2 +-
 addons/base_report_designer/installer.py            |   8 ++++----
 .../openerp_report_designer.zip                     | Bin
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename addons/base_report_designer/{plugin => static/base-report-designer-plugin}/openerp_report_designer.zip (100%)

diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 657eae8fd63..99898f5a703 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -20,7 +20,7 @@
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>
-                            <field name="plugin_file" filename="name"/>
+                            <field name="plugin_file" filename="name" widget="url"/>
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
index a21b6655af7..c75e13d662c 100644
--- a/addons/base_report_designer/installer.py
+++ b/addons/base_report_designer/installer.py
@@ -23,7 +23,6 @@ from openerp.osv import fields
 from openerp.osv import osv
 import base64
 from openerp.tools.translate import _
-from openerp.modules.module import get_module_resource
 
 class base_report_designer_installer(osv.osv_memory):
     _name = 'base_report_designer.installer'
@@ -31,13 +30,13 @@ class base_report_designer_installer(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context=None):
         data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context=context)
-        plugin_file = open(get_module_resource('base_report_designer','plugin', 'openerp_report_designer.zip'),'rb')
-        data['plugin_file'] = base64.encodestring(plugin_file.read())
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        data['plugin_file'] = base_url + '/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip'
         return data
 
     _columns = {
         'name':fields.char('File name', size=34),
-        'plugin_file':fields.binary('OpenObject Report Designer Plug-in', readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
+        'plugin_file':fields.char('OpenObject Report Designer Plug-in', size=256, readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
         'description':fields.text('Description', readonly=True)
     }
 
@@ -58,5 +57,6 @@ class base_report_designer_installer(osv.osv_memory):
             4. if your connection success, A message appears like 'You can start creating your report in current document.'.
         """
     }
+base_report_designer_installer()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
similarity index 100%
rename from addons/base_report_designer/plugin/openerp_report_designer.zip
rename to addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip