[MERGE] plugin_outlook

bzr revid: al@openerp.com-20111230153832-18mayr4ail7irsl9

addons/plugin_outlook/__init__.py

@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import installer
+import plugin_outlook
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/plugin_outlook/__openerp__.py

@@ -30,14 +30,14 @@
     'description': '''
 This module provides the Outlook Plug-in.
 =========================================
-Outlook plug-in allows you to select an object that you’d like to add
+Outlook plug-in allows you to select an object that you would like to add
 to your email and its attachments from MS Outlook. You can select a partner, a task,
 a project, an analytical account, or any other object and archive selected
 mail into mail.message with attachments.
       ''',
     'init_xml' : [],
     'demo_xml' : [],
-    'update_xml' : ['outlook_installer.xml'],
+    'update_xml' : ['plugin_outlook.xml'],
     'active': False,
     'installable': True,
     'certificate' : '001278773815818292125',

addons/plugin_outlook/plugin_outlook.py

@@ -29,38 +29,20 @@ class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
 
-    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/book/2/2_6_Comms/2_6_Comms_outlook.html'
-        file = open(addons.get_module_resource('outlook','static','openerp-outlook-plugin','OpenERPOutlookPluginSetup','Release','OpenERPOutlookPluginSetup.msi'), '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 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.char('Installation Manual',size=264,help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
+        'name':fields.char('Outlook Plug-in', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'description':fields.text('Description', readonly=True)
-        }
+    }
 
     _defaults = {
-        'outlook' : True,
-        'name' : 'OpenERPOutlookPlugin.msi',
-        'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
+        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi',
         'description' : """
+Click on icon next to the link above to download the installer and execute it.
+
 System requirements:
     1.  MS Outlook 2005 or above.
     2.  MS .Net Framework 3.5 .
-    
-
-Plugin installation:
-    1.  Save the msi plug-in file.
-    2.  Close the Outlook application if it is open.
-    3.  Run the executable plug-in file (OpenERPOutlookPlugin.msi).
 """
         }
-outlook_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/plugin_outlook/plugin_outlook.xml

@@ -14,9 +14,7 @@
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">This plug-in allows you to create new contact or link contact to an existing partner. 
-Also allows to link your e-mail to OpenERP's documents. 
-You can attach it to any existing one in OpenERP or create a new one.</attribute>
+                        <attribute name="string">This plug-in allows you to create and link outlook emails with openerp objects.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
@@ -29,14 +27,8 @@ You can attach it to any existing one in OpenERP or create a new one.</attribute
                     </xpath>
                     <group colspan="8" position="replace">
                         <group colspan="8" height="450" width="750">
-                            <field name="outlook" invisible="1"/>
-                            <field name="name" invisible="1"/>
-                            <field name="doc_name" invisible="1"/>
-                                <newline/>
-                            <field name="plugin_file" filename="name"/>
-                                <newline/>
-                            <field name="doc_file" filename="doc_name" widget="url"/>
-                                <newline/>
+                            <field name="name" widget="url"/>
+                            <newline/>
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
@@ -54,7 +46,7 @@ You can attach it to any existing one in OpenERP or create a new one.</attribute
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <record id="outlook_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_outlook_installer"/>
             <field name="category_id" ref="base.category_sales_management_config"/>