diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index 765f22f6187..7e6aac6f8c1 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -29,32 +29,20 @@ class thunderbird_installer(osv.osv_memory): _name = 'thunderbird.installer' _inherit = 'res.config.installer' - def process_plugin(self, cr, uid, ids, context): - """ - Default Attach Thunderbird Plug-in File. - """ - data = {} - file = open(config['addons_path'] + "/thunderbird/plugin/tiny_plugin-2.0.xpi", 'r') - data['plugin_file'] = base64.encodestring(file.read()) - self.write(cr, uid, ids, data) - return False - - def process_pdf_file(self, cr, uid, ids, context): - """ - Default Attach Thunderbird Plug-in Installation File. - """ - data = {} + def default_get(self, cr, uid, fields, context={}): + data = super(thunderbird_installer, self).default_get(cr, uid, fields, context) pdf_file = open(config['addons_path'] + "/thunderbird/doc/Installation Guide to OpenERP Thunderbid Plug-in.pdf", 'r') data['pdf_file'] = base64.encodestring(pdf_file.read()) - self.write(cr, uid, ids, data) - return False + file = open(config['addons_path'] + "/thunderbird/plugin/tiny_plugin-2.0.xpi", 'r') + data['plugin_file'] = base64.encodestring(file.read()) + return data _columns = { 'name':fields.char('File name', size=34), 'pdf_name':fields.char('File name', size=64), 'thunderbird':fields.boolean('Thunderbird Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."), 'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbir."), - 'pdf_file':fields.binary('Thunderbird Plug-in Installation File', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True), + 'pdf_file':fields.binary('Installation Manual', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True), 'description':fields.text('Description', readonly=True) } diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi index 68aa5d2ea4c..ffb25365525 100644 Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml index 63359a830ab..6ee1f50e095 100644 --- a/addons/thunderbird/thunderbird_installer.xml +++ b/addons/thunderbird/thunderbird_installer.xml @@ -25,10 +25,8 @@ -