From 0068c09358226c78b2e779749818bb38855bf640 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 24 Aug 2012 19:01:11 +0200
Subject: [PATCH] [IMP] web_linkedin: put the wizard into the sales wizard

bzr revid: nicolas.vanhoren@openerp.com-20120824170111-j64d4l8xc6403a2m
---
 addons/web_linkedin/__openerp__.py        |  2 +-
 addons/web_linkedin/web_linkedin.py       |  3 +-
 addons/web_linkedin/web_linkedin_view.xml | 64 +++++++++--------------
 3 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py
index 0e9503ac579..6ce78cfca47 100644
--- a/addons/web_linkedin/__openerp__.py
+++ b/addons/web_linkedin/__openerp__.py
@@ -10,7 +10,7 @@ OpenERP Web LinkedIn module.
 This module provides the Integration of the LinkedIn with OpenERP.
         """,
     'data': ['web_linkedin_view.xml'],
-    'depends' : ['base'],
+    'depends' : ['crm'],
     'js': ['static/src/js/*.js'],
     'css': ['static/src/css/*.css'],
     'qweb': ['static/src/xml/*.xml'],
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index c398ad17f3b..ea94329f8b1 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -39,8 +39,7 @@ class Binary(openerpweb.Controller):
         return base64.b64encode(bfile.read())
     
 class web_linkedin_settings(osv.osv_memory):
-    _name = 'web_linkedin.settings'
-    _inherit = 'res.config.settings'
+    _inherit = 'sale.config.settings'
     _columns = {
         'api_key': fields.char(string="API Key", size=50),
         'server_domain': fields.char(size=100),
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index 463bfd49d21..8b4fa617bf3 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -15,48 +15,34 @@
         
         <record id="view_linkedin_config_settings" model="ir.ui.view">
             <field name="name">linkedin_settings</field>
-            <field name="model">web_linkedin.settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <form string="Configure Linkedin" version="7.0" class="oe_form_configuration">
-                    <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-                    </header>
-                    <p>
-                        To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
-                    </p>
-                    <ul>
-                        <li>Go to this URL: 
-                            <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
-                        </li>
-                        <li>Log into LinkedIn.</li>
-                        <li>Add a new application and fill the form:
-                            <ul>
-                                <li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li>
-                                <li>The programming tool is Javascript</li>
-                            </ul>
-                        </li>
-                        <li>Copy the API key down here:</li>
-                    </ul>
-                    <group>
-                        <field name="api_key"/>
-                    </group>
-                </form>
+                <div name="linkedin" position="inside">
+                    <form string="Configure Linkedin" version="7.0" class="oe_form_configuration">
+                        <p>
+                            To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
+                        </p>
+                        <ul>
+                            <li>Go to this URL: 
+                                <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
+                            </li>
+                            <li>Log into LinkedIn.</li>
+                            <li>Add a new application and fill the form:
+                                <ul>
+                                    <li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li>
+                                    <li>The programming tool is Javascript</li>
+                                </ul>
+                            </li>
+                            <li>Copy the API key down here:</li>
+                        </ul>
+                        <group>
+                            <field name="api_key"/>
+                        </group>
+                    </form>
+                </div>
             </field>
         </record>
-
-        <record id="action_linkedin_config_settings" model="ir.actions.act_window">
-            <field name="name">Configure Linkedin</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">web_linkedin.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <menuitem id="menu_linkedin_config_settings" name="Linkedin" parent="base.menu_config"
-            sequence="10" action="action_linkedin_config_settings"/>
-
         
    </data>
 </openerp>