From 349b2a270776954c6274e9f347ba1c735f9bd509 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 7 Jun 2012 15:45:16 +0530
Subject: [IMP] correct the link of thunderbird plugin xpi file and outlook msi
 file configuration

bzr revid: nco@tinyerp.com-20120607101516-uwvenu14iwreubt8
---
 addons/plugin_outlook/plugin_outlook.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 676540dc63a..ac63e0a0d23 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -22,29 +22,30 @@
 from osv import fields
 from osv import osv
 import addons
-
 import base64
 
 class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
-
     _columns = {
         'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'name2':fields.char('Outlook Plug-in 64bits', 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 = {
-        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi',
-        'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi',
-        'description' : """
+    
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        plugin_32bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+        plugin_64bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
+        description = """
 Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
 
 System requirements:
     1.  MS Outlook 2005 or above.
     2.  MS .Net Framework 3.5 or above.
 """
-        }
-
+        res['name'] = plugin_32bit_url
+        res['name2'] = plugin_64bit_url
+        res['description'] = description
+        return res
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From ec238c4da1668c0d1275dcb70984081de3a10a0b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 13 Jun 2012 15:51:08 +0530
Subject: [FIX]:fix for outlook button

bzr revid: atp@tinyerp.com-20120613102108-z7zjgfnue55iswwx
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c4791ee153c..ada4aa2981e 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -53,7 +53,7 @@
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
-                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                    <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_outlook','=',False)]}">
                         <button name="%(action_outlook_installer)d" type="action"
                             string="Configure Outlook Plugin" icon="gtk-execute"/>
                     </group>
-- 
cgit v1.2.3


From ea65a49a94e51b9bc92b7541f5b7ab1bf19dd856 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 11:49:40 +0200
Subject: [IMP] base_setup: move all res_config wizards to res_config files,
 and change xml id of sale.config.settings view

bzr revid: rco@openerp.com-20120622094940-jacovvqfyym0zjov
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index ada4aa2981e..c66f90b27d9 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -50,7 +50,7 @@
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
                     <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_outlook','=',False)]}">
-- 
cgit v1.2.3


From 8d3206eda60c8aadf1ad1caa8412eb6be96e9202 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 14:47:31 +0200
Subject: [IMP] crm, crm_claim, plugin_outlook, plugin_thunderbird: improve
 sales settings form

bzr revid: rco@openerp.com-20120622124731-u1adqcpkbwm21pso
---
 addons/plugin_outlook/plugin_outlook.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c66f90b27d9..c1e97fd7d53 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -52,11 +52,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_outlook" position="after">
-                    <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_outlook','=',False)]}">
-                        <button name="%(action_outlook_installer)d" type="action"
-                            string="Configure Outlook Plugin" icon="gtk-execute"/>
-                    </group>
+                <field name="module_plugin_outlook" version="7.0" position="replace">
+                    <label for="module_plugin_outlook"/>
+                    <div>
+                        <field name="module_plugin_outlook"/>
+                        <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
+                    </div>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From 2979554b40e51aed414636e9bc6e34f7a8dcebdd Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 12:32:35 +0200
Subject: [IMP] plugin_outlook, plugin_thunderbird: simplify wizards

bzr revid: rco@openerp.com-20120625103235-111al037cqvpaitr
---
 addons/plugin_outlook/plugin_outlook.py  | 25 ++++++++-----------------
 addons/plugin_outlook/plugin_outlook.xml | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 24 deletions(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 2b05282163f..9da90f3839c 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -28,24 +28,15 @@ class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
     _columns = {
-        'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'name2':fields.char('Outlook Plug-in 64bits', 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)
+        'plugin32': fields.char('Outlook Plug-in 32bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
+        'plugin64': fields.char('Outlook Plug-in 64bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
     }
-    
+
     def default_get(self, cr, uid, fields, context=None):
-        res = {}
-        plugin_32bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
-        plugin_64bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
-        description = """
-            Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
-            
-            System requirements:
-                1.  MS Outlook 2005 or above.
-                2.  MS .Net Framework 3.5 or above.
-            """
-        res['name'] = plugin_32bit_url
-        res['name2'] = plugin_64bit_url
-        res['description'] = description
+        res = super(outlook_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+         res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
         return res
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c1e97fd7d53..13c1e6f32c4 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,14 +19,18 @@
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
-                   <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
-                            <field name="name" widget="url" colspan="4"/>
-                            <field name="name2" widget="url" colspan="4"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                    <xpath expr="//separator[@string='title']" position="after" version="7.0">
+                        <group>
+                            <field name="plugin32" widget="url"/>
+                            <field name="plugin64" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
+                        <p>System requirements:</p>
+                        <ul>
+                            <li>1. MS Outlook 2005 or above.</li>
+                            <li>2. MS .Net Framework 3.5 or above.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
-- 
cgit v1.2.3


From 991323c4664b751e79f0c7e32a355d3a59e9d592 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 14:40:37 +0200
Subject: [FIX] plugin_outlook: wrong indentation in code

bzr revid: rco@openerp.com-20120625124037-18rg0a4rum9vroml
---
 addons/plugin_outlook/plugin_outlook.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 9da90f3839c..4fc1f391fab 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -36,7 +36,7 @@ class outlook_installer(osv.osv_memory):
         res = super(outlook_installer, self).default_get(cr, uid, fields, context)
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
-         res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
+        res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
         return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From b999a061d835a5e1695fa1b3883346a76e64a49b Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 12:07:29 +0530
Subject: [IMP]improve code where needed and replace res.partner instead of
 res.partner.address

bzr revid: sgo@tinyerp.com-20120628063729-1ccb8c45pxa31025
---
 .../OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
index b5bc2fc4472..b057201b8d1 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
@@ -1,4 +1,4 @@
-/*
+/*
 
     OpenERP, Open Source Business Applications
     Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
@@ -105,7 +105,7 @@ namespace OpenERPOutlookPlugin
             /*
              
              * Will Redirect to the web-browser and open partner.
-             * If it will not found partner in res.partner.address (in contact) then 
+             * If it will not found partner in res.partner (in contact) then 
                it will open the contact form to create a partner.
                :Param outlook.MailItem mailItem : Outlook Mail item
              */
@@ -189,7 +189,7 @@ namespace OpenERPOutlookPlugin
         {
             /*
              
-            * Creates a Contact record in the res.partner.address as per the details given in the 
+            * Creates a Contact record in the res.partner as per the details given in the 
               plugin form of openERP outlook Plugin.
               :Param string partner_id : Partner id for which it creates a contact
               :Param string name : Contact name 
-- 
cgit v1.2.3


From 76f17eb48094ee1dc86c9f804a163e7f96a3b154 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:46:03 +0200
Subject: [IMP] in form views, remove useless colspans on buttons in headers

bzr revid: rco@openerp.com-20120629084603-yz0hdnvtjy1fplp1
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 13c1e6f32c4..192f771e14e 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -15,7 +15,7 @@
                         <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
+                        <button icon="gtk-close" special="cancel" string="_Close"/>
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
-- 
cgit v1.2.3


From 7416e2443fb3b45900c787959bff354e4bfe66bd Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 11:32:56 +0200
Subject: [IMP] small form view improvements

bzr revid: rco@openerp.com-20120629093256-np0ver7xyzam2qzm
---
 addons/plugin_outlook/plugin_outlook.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'addons/plugin_outlook')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 192f771e14e..0340a7c502f 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -14,11 +14,7 @@
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace">
-                    </xpath>
+                    <xpath expr="//header" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
-- 
cgit v1.2.3