[MERGE] OPW 383649

[odoo/odoo.git] / addons / outlook / installer.py

diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
old mode 100755 (executable)
new mode 100644 (file)
index 092ff2a..b460f06
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -21,7 +21,7 @@
 
 from osv import fields
 from osv import osv
-from tools import config
+import addons
 
 import base64
 
@@ -29,42 +29,43 @@ class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
 
-    def default_get(self, cr, uid, fields, context={}):
-        data = super(outlook_installer, self).default_get(cr, uid, fields, context)
-        doc_file = open(config['addons_path'] + "/outlook/doc/Installation Guide to OpenERP Outlook Plug-in.doc", 'r')
-        data['doc_file'] = base64.encodestring(doc_file.read())
-        file = open(config['addons_path'] + "/outlook/plugin/openerp-outlook-plugin.zip", 'r')
+    def default_get(self, cr, uid, fields, context=None):
+        data = super(outlook_installer, self).default_get(cr, uid, fields, context=context)
+        data['doc_file'] = 'http://doc.openerp.com/v6.0/book/2/3_CRM_Contacts/communicate.html#managing-your-crm-from-microsoft-outlook'
+        file = open(addons.get_module_resource('outlook','plugin','openerp-outlook-addin.exe'), 'r')
         data['plugin_file'] = base64.encodestring(file.read())
         return data
 
     _columns = {
         'name':fields.char('File name', size=34),
         'doc_name':fields.char('File name', size=64),
-        'outlook':fields.boolean('Outlook Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
+        'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you would like to add to your email and its attachments."),
         'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'doc_file':fields.binary('Installation Manual', help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
+        'doc_file':fields.char('Installation Manual',size="264",help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
         }
 
     _defaults = {
         'outlook' : True,
-        'name' : 'OpenERP-Outlook-PlugIn.zip',
+        'name' : 'Openerp-Outlook-Addin.exe',
         'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
-        'description' : """* Save the Outlook plug­-in.
-* Follow these steps to install outlook plug­in.
+        'description' : """
+* Save the Outlook plug­-in.
+* Follows these steps to install outlook plug­in.
 Pre-requirements :
     1. Python 2.6+ .
     2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
+    3.1 If With MS Outlook 2007 it is required to install externally "Collaboration Data Objects, version 1.2.1".
+          http://www.microsoft.com/downloads/en/details.aspx?FamilyId=2714320D-C997-4DE1-986F-24F081725D36&displaylang=en
+    3.2 With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook.
 
 How to install openerp-outlook plug-in?
-    1. Extract zip file  “openerp-outlook-plugin.zip” .
-    2. Open the folder openerp-outlook-plugin.
-    3. Run “Register-plugin.bat” file.
-    4. Run Outlook and Check addon has been registered.
-    5. Tools->OpenERP Configuration and test your connection.
-    6. See User Guide for more information. 
-    7. Keep All extratced files in some safe places
-        (e.g. python installation Directory "C:\pythonXX\" or Windows installation Directory "C:\Program Files\"  ).
+    1. Save the executable plug-in file.
+    2. Close Outlook Application if Running.
+    3. Run executable plug-in file and the folllow the instruction.
+
+Note :
+    Please refer README file for dependecies external link, openobject-addons/outlook/README.
 """
         }
 outlook_installer()