From d26ed839975e46cd59349c49f33a67fc483abdc4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 16 Aug 2012 14:00:13 +0200
Subject: [PATCH 1/9] add config for signup

bzr revid: al@openerp.com-20120816120013-b3a1sjiqxvvajbs8
---
 addons/base_setup/res_config.py       |  2 ++
 addons/base_setup/res_config_view.xml | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 059a674e5f1..a14b42c97bf 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -32,6 +32,8 @@ class base_config_settings(osv.osv_memory):
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
         'module_share': fields.boolean('allow documents sharing',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
+        'module_auth_signup': fields.boolean('allow new users to sign up'),
+        'module_auth_oauth': fields.boolean('external oauth authentfication (google, facebook, ...)'),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fe0fc7d1254..fd1bd104a3c 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -27,6 +27,16 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Email"/>
+                        <div>
+                            <div>
+                                <button type="action"
+                                    name="%(base.action_ir_mail_server_list)d"
+                                    string="Configure outgoing email servers" class="oe_link"/>
+                            </div>
+                        </div>
+                    </group>
                     <group>
                         <label for="id" string="Share Data"/>
                         <div>
@@ -38,10 +48,18 @@
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Authentification"/>
+                        <div>
                             <div>
-                                <button type="action"
-                                    name="%(base.action_ir_mail_server_list)d"
-                                    string="Configure outgoing email servers" class="oe_link"/>
+                                <field name="module_auth_signup" class="oe_inline"/>
+                                <label for="module_auth_signup"/>
+                            </div>
+                            <div>
+                                <field name="module_auth_oauth" class="oe_inline"/>
+                                <label for="module_auth_oauth"/>
                             </div>
                         </div>
                     </group>

From 761204d6b61be23b0e69d810f7d70e740f558613 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 16 Aug 2012 14:24:21 +0200
Subject: [PATCH 2/9] add config for auth

bzr revid: al@openerp.com-20120816122421-tt79y5bdfdg1fth8
---
 addons/auth_signup/res_config.xml     | 15 +++++----------
 addons/base_setup/res_config_view.xml |  5 +++--
 addons/mail/res_config_view.xml       |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 3bea8dc2aed..43b0c09ea1d 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -7,16 +7,11 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[last()]" position="after">
-                    <group>
-                        <label for="id" string="External Users"/>
-                        <div>
-                            <div>
-                                <label for="auth_signup_template_user_id"/>
-                                <field name="auth_signup_template_user_id" class="oe_inline"/>
-                            </div>
-                        </div>
-                    </group>
+                <xpath expr="//field[@name='module_auth_signup']/.." position="after">
+                    <div attrs="{'invisible':[('module_auth_signup','=',False)]}">
+                        <label for="auth_signup_template_user_id"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline"/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fd1bd104a3c..5e49f6d4c5f 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -27,9 +27,9 @@
                             </div>
                         </div>
                     </group>
-                    <group>
+                    <group name="email">
                         <label for="id" string="Email"/>
-                        <div>
+                        <div name="email">
                             <div>
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
@@ -57,6 +57,7 @@
                                 <field name="module_auth_signup" class="oe_inline"/>
                                 <label for="module_auth_signup"/>
                             </div>
+                            ->
                             <div>
                                 <field name="module_auth_oauth" class="oe_inline"/>
                                 <label for="module_auth_oauth"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index c4bc23c9357..99c19c894b1 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group[last()]/div[last()]/div[last()]" position='after' version="7.0">
+                <xpath expr="//div[@name='email']" position='inside' version="7.0">
                     <div>
                         <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>

From 47b8d4ee97ec14fb99e8e0878c24b541a7c2a9f3 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 16 Aug 2012 17:36:06 +0200
Subject: [PATCH 3/9] [ADD] Added needed files. Still not working as it should

bzr revid: vta@openerp.com-20120816153606-qx5fm6j8tx7d3a0c
---
 addons/auth_oauth/__init__.py         |  1 +
 addons/auth_oauth/__openerp__.py      |  7 ++---
 addons/auth_oauth/auth_oauth_view.xml |  1 +
 addons/auth_oauth/res_config.py       | 38 +++++++++++++++++++++++++++
 addons/auth_oauth/res_config_view.xml | 17 ++++++++++++
 addons/base_setup/res_config_view.xml |  3 +--
 addons/mail/res_config_view.xml       |  5 ++--
 7 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 addons/auth_oauth/res_config.py
 create mode 100644 addons/auth_oauth/res_config_view.xml

diff --git a/addons/auth_oauth/__init__.py b/addons/auth_oauth/__init__.py
index c9acce48a16..a56db75633b 100644
--- a/addons/auth_oauth/__init__.py
+++ b/addons/auth_oauth/__init__.py
@@ -1,3 +1,4 @@
 import controllers
 import auth_oauth
 import res_users
+import res_config
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index 6c79bba2151..c8d9c85c265 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -28,12 +28,13 @@
     'author': 'Victor Tabuenca',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'web'],
+    'depends': ['base', 'web', 'base_setup'],
     'data': [
-        'auth_oauth_data.xml'
+        'auth_oauth_data.xml',
     ],
     'update_xml': [
-        'auth_oauth_view.xml'
+        'auth_oauth_view.xml',
+        'res_config_view.xml',
     ],
     'js': [
         'static/src/js/auth_oauth.js',
diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index 678c347c84d..23e05e7a31f 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -23,6 +23,7 @@
                 </form>
             </field>
         </record>
+        
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py
new file mode 100644
index 00000000000..0c660aa585c
--- /dev/null
+++ b/addons/auth_oauth/res_config.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class project_configuration(osv.TransientModel):
+    _inherit = 'base.config.settings'
+
+    _columns = {
+        'explanation' : fields.text('Deployment Explanation',),
+        'client_id' : fields.char('Client ID'),
+    }
+
+    # def get_default_alias_domain(self, cr, uid, ids, context=None):
+    #     return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)}
+
+    # def set_alias_domain(self, cr, uid, ids, context=None):
+    #     config_parameters = self.pool.get("ir.config_parameter")
+    #     for record in self.browse(cr, uid, ids, context=context):
+    #         config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
\ No newline at end of file
diff --git a/addons/auth_oauth/res_config_view.xml b/addons/auth_oauth/res_config_view.xml
new file mode 100644
index 00000000000..c892c8ac5e4
--- /dev/null
+++ b/addons/auth_oauth/res_config_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>        
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_general_configuration_auth_oauth">
+            <field name="name">base.config.auth.oauth</field>
+            <field name="model">model</field>
+            <field name="type">base.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='module_auth_signup']" position="after">
+                    <label for="explanation" class="oe_inline"/>
+                    <field name="explanation" placeholder="Here goes the explanation" class="oe_inline"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5e49f6d4c5f..91196c7e834 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -27,7 +27,7 @@
                             </div>
                         </div>
                     </group>
-                    <group name="email">
+                    <group>
                         <label for="id" string="Email"/>
                         <div name="email">
                             <div>
@@ -57,7 +57,6 @@
                                 <field name="module_auth_signup" class="oe_inline"/>
                                 <label for="module_auth_signup"/>
                             </div>
-                            ->
                             <div>
                                 <field name="module_auth_oauth" class="oe_inline"/>
                                 <label for="module_auth_oauth"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index 99c19c894b1..2b3784cc15f 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -6,9 +6,10 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='email']" position='inside' version="7.0">
+                <xpath expr="//div[@name='email']" position='inside'>
                     <div>
-                        <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
+                        <label for="alias_domain" class="oe_inline"/>
+                        <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>                        
                     </div>
                 </xpath>
             </field>

From 9f2b498a8a1cce679d5b9078d1d200cdc8c3ea4a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 17 Aug 2012 00:55:37 +0200
Subject: [PATCH 4/9] [FIX] auth_config

bzr revid: al@openerp.com-20120816225537-7ghb97togd1bjidl
---
 addons/auth_oauth/res_config.py       |  7 ++++---
 addons/auth_oauth/res_config_view.xml | 29 +++++++++++++++++++--------
 addons/base_setup/res_config.py       |  4 ++--
 addons/base_setup/res_config_view.xml | 11 +---------
 addons/mail/res_config_view.xml       |  2 +-
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py
index 0c660aa585c..4a218d98165 100644
--- a/addons/auth_oauth/res_config.py
+++ b/addons/auth_oauth/res_config.py
@@ -25,8 +25,9 @@ class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'explanation' : fields.text('Deployment Explanation',),
-        'client_id' : fields.char('Client ID'),
+        'auth_oauth_google_active' : fields.boolean('enable sign in with google'),
+        'auth_oauth_google_client_id' : fields.char('Google client_id'),
+        'auth_oauth_facebook_client_id' : fields.char('Facebook client_id'),
     }
 
     # def get_default_alias_domain(self, cr, uid, ids, context=None):
@@ -35,4 +36,4 @@ class project_configuration(osv.TransientModel):
     # def set_alias_domain(self, cr, uid, ids, context=None):
     #     config_parameters = self.pool.get("ir.config_parameter")
     #     for record in self.browse(cr, uid, ids, context=context):
-    #         config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
\ No newline at end of file
+    #         config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
diff --git a/addons/auth_oauth/res_config_view.xml b/addons/auth_oauth/res_config_view.xml
index c892c8ac5e4..5744dfaa8a2 100644
--- a/addons/auth_oauth/res_config_view.xml
+++ b/addons/auth_oauth/res_config_view.xml
@@ -1,17 +1,30 @@
-<?xml version="1.0"?>        
+<?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_general_configuration_auth_oauth">
+        <record id="view_general_configuration_auth_oauth" model="ir.ui.view">
             <field name="name">base.config.auth.oauth</field>
-            <field name="model">model</field>
-            <field name="type">base.config.settings</field>
+            <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='module_auth_signup']" position="after">
-                    <label for="explanation" class="oe_inline"/>
-                    <field name="explanation" placeholder="Here goes the explanation" class="oe_inline"/>
+                <xpath expr="//label[@for='module_auth_oauth']" position="after">
+                    <div>
+                        <field name="auth_oauth_google_active" class="oe_inline"/>
+                        <label for="auth_oauth_google_active"/>
+                    </div>
+                    <div>
+                        <p attrs="{'invisible': [('auth_oauth_google_active','=',False)]}">
+                            Explanation goes here OpenERP allows to
+                            automatically create leads (or others documents)
+                            from incoming emails. You can automatically
+                            synchronize emails with OpenERP using regular
+                            POP/IMAP accounts, using a direct email integration
+                            script for your email server, or by manually
+                            pushing emails to OpenERP using specific
+                            plugins for your preferred email application.
+                        </p>
+                    </div>
                 </xpath>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index a14b42c97bf..556b1010bf2 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -32,8 +32,8 @@ class base_config_settings(osv.osv_memory):
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
         'module_share': fields.boolean('allow documents sharing',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
-        'module_auth_signup': fields.boolean('allow new users to sign up'),
-        'module_auth_oauth': fields.boolean('external oauth authentfication (google, facebook, ...)'),
+        'module_auth_signup': fields.boolean('allow external users to sign up'),
+        'module_auth_oauth': fields.boolean('external authentication, login with google, facebook, ...'),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 91196c7e834..14c0615d206 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -38,21 +38,12 @@
                         </div>
                     </group>
                     <group>
-                        <label for="id" string="Share Data"/>
+                        <label for="id" string="Access"/>
                         <div>
-                            <div>
-                                <field name="module_share" class="oe_inline"/>
-                                <label for="module_share"/>
-                            </div>
                             <div>
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>
-                        </div>
-                    </group>
-                    <group>
-                        <label for="id" string="Authentification"/>
-                        <div>
                             <div>
                                 <field name="module_auth_signup" class="oe_inline"/>
                                 <label for="module_auth_signup"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index 2b3784cc15f..d3797ba2dcc 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -9,7 +9,7 @@
                 <xpath expr="//div[@name='email']" position='inside'>
                     <div>
                         <label for="alias_domain" class="oe_inline"/>
-                        <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>                        
+                        <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>
                 </xpath>
             </field>

From b441abb3a9890e8324d39efb418146f340676a65 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 17 Aug 2012 01:14:25 +0200
Subject: [PATCH 5/9] improve config

bzr revid: al@openerp.com-20120816231425-elfibnc7wfchzqpw
---
 addons/auth_signup/res_config.xml     |  4 ++--
 addons/base_setup/res_config.py       | 11 ++++++-----
 addons/base_setup/res_config_view.xml | 11 ++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 43b0c09ea1d..f85d173792a 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -7,8 +7,8 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='module_auth_signup']/.." position="after">
-                    <div attrs="{'invisible':[('module_auth_signup','=',False)]}">
+                <xpath expr="//field[@name='module_auth_anonymous']/.." position="after">
+                    <div>
                         <label for="auth_signup_template_user_id"/>
                         <field name="auth_signup_template_user_id" class="oe_inline"/>
                     </div>
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 556b1010bf2..68940216ad6 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,12 +28,13 @@ class base_config_settings(osv.osv_memory):
         'module_multi_company': fields.boolean('manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('activate customer portal',
-            help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
         'module_share': fields.boolean('allow documents sharing',
-            help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
-        'module_auth_signup': fields.boolean('allow external users to sign up'),
-        'module_auth_oauth': fields.boolean('external authentication, login with google, facebook, ...'),
+            help="""Share or embbed any screen of openerp."""),
+        'module_portal': fields.boolean('activate customer portal',
+            help="""Give access your customers and suppliers to their documents."""),
+        'module_auth_anonymous': fields.boolean('public website',
+            help="""Enable the public part of openerp, the public part of openerp are browsable like a website."""),
+        'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 14c0615d206..512c0a3f52e 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -38,16 +38,21 @@
                         </div>
                     </group>
                     <group>
-                        <label for="id" string="Access"/>
+                        <label for="id" string="Portal access"/>
                         <div>
                             <div>
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>
                             <div>
-                                <field name="module_auth_signup" class="oe_inline"/>
-                                <label for="module_auth_signup"/>
+                                <field name="module_auth_anonymous" class="oe_inline"/>
+                                <label for="module_auth_anonymous"/>
                             </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Authentication"/>
+                        <div>
                             <div>
                                 <field name="module_auth_oauth" class="oe_inline"/>
                                 <label for="module_auth_oauth"/>

From 200a0fd5dd8dc03d17aaedb8ba61def2c629bd06 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 17 Aug 2012 15:28:35 +0200
Subject: [PATCH 6/9] [FIX] Fixed settings view, and added some functionality
 to oauth related fields.

bzr revid: vta@openerp.com-20120817132835-l5ne76q7t8lj73yc
---
 addons/auth_oauth/__openerp__.py      |  2 +-
 addons/auth_oauth/auth_oauth.py       | 13 +++---
 addons/auth_oauth/auth_oauth_data.xml | 16 +++-----
 addons/auth_oauth/auth_oauth_view.xml |  7 ++--
 addons/auth_oauth/controllers/main.py |  2 +-
 addons/auth_oauth/res_config.py       | 59 ++++++++++++++++++++++-----
 addons/auth_oauth/res_config.xml      | 52 +++++++++++++++++++++++
 addons/auth_oauth/res_config_view.xml | 30 --------------
 8 files changed, 120 insertions(+), 61 deletions(-)
 create mode 100644 addons/auth_oauth/res_config.xml
 delete mode 100644 addons/auth_oauth/res_config_view.xml

diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index c8d9c85c265..585dc48e11e 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -34,7 +34,7 @@
     ],
     'update_xml': [
         'auth_oauth_view.xml',
-        'res_config_view.xml',
+        'res_config.xml',
     ],
     'js': [
         'static/src/js/auth_oauth.js',
diff --git a/addons/auth_oauth/auth_oauth.py b/addons/auth_oauth/auth_oauth.py
index e258505868d..8a7ba4e6e4d 100644
--- a/addons/auth_oauth/auth_oauth.py
+++ b/addons/auth_oauth/auth_oauth.py
@@ -1,6 +1,6 @@
 from openerp.osv import osv, fields
 
-class auth_oauth_providers(osv.osv):
+class auth_oauth_provider(osv.osv):
     """Class defining the configuration values of an OAuth2 provider"""
 
     _name = 'auth.oauth.provider'
@@ -8,15 +8,18 @@ class auth_oauth_providers(osv.osv):
     _order = 'name'
 
     _columns = {
-        'name' : fields.char('Provider name', required=True),               # Name of the OAuth2 entity, Google, LinkedIn, etc
-        'client_id' : fields.char('Client ID', required=True),              # Our identifier
-        'auth_endpoint' : fields.char('Authentication URL', required=True), # OAuth provider URL to authenticate users
+        'name' : fields.char('Provider name'),               # Name of the OAuth2 entity, Google, LinkedIn, etc
+        'client_id' : fields.char('Client ID'),              # Our identifier
+        'auth_endpoint' : fields.char('Authentication URL'), # OAuth provider URL to authenticate users
         'scope' : fields.char('Scope'),                                     # OAUth user data desired to access
         'validation_endpoint' : fields.char('Validation URL'),              # OAuth provider URL to validate tokens
         'data_endpoint' : fields.char('Data URL'),
+        'enabled' : fields.boolean('Allowed'),
         'css_class' : fields.char('CSS class'),
         'body' : fields.char('Body'),
         'active' : fields.boolean('Active'),
         'sequence' : fields.integer(),
     }
-
+    _defaults = {
+        'enabled' : False,
+    }
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 021a03b2742..7bb95192e5d 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,38 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <data>
+
         <record id="provider_facebook" model="auth.oauth.provider">
             <field name="name">Facebook Graph</field>
-            <field name="client_id">facebook_client_id</field>
             <field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field>
             <field name="scope"></field>
             <field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial facebook</field>
             <field name="body">Sign in with facebook</field>
-            <field name="active">True</field>
         </record>
         <record id="provider_google" model="auth.oauth.provider">
             <field name="name">Google OAuth2</field>
-            <field name="client_id">108010644258-duuhmp6pu7li4tsmnqg7j9rvdeklg0ki.apps.googleusercontent.com</field>
             <field name="auth_endpoint">https://accounts.google.com/o/oauth2/auth</field>
             <field name="scope">https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile</field>
             <field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
             <field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
             <field name="css_class">zocial google</field>
             <field name="body">Sign in with google</field>
-            <field name="active">True</field>
         </record>
-        <record id="provider_twitter" model="auth.oauth.provider">
-            <field name="name">Twitter OAuth2</field>
-            <field name="client_id">108010644258-duuhmp6pu7li4tsmnqg7j9rvdeklg0ki.apps.twitterusercontent.com</field>
+        <!-- <record id="provider_twitter" model="auth.oauth.provider">
+            <field name="name">Twitter OAuth</field>
             <field name="auth_endpoint">https://api.twitter.com/oauth/request_token</field>
             <field name="scope"></field>
             <field name="validation_endpoint">https://api.twitter.com/oauth/authorize</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial twitter</field>
             <field name="body">Sign in with twitter</field>
-            <field name="active">True</field>
-        </record>
+        </record> -->
+        
     </data>
 </openerp>
diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index 23e05e7a31f..475720af9fd 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -11,7 +11,7 @@
                         <group>
                             <field name="name" />
                             <field name="client_id" />
-                            <field name="active" />
+                            <field name="enabled" />
                         </group>
                         <group>
                             <field name="auth_endpoint" />
@@ -22,8 +22,7 @@
                     </sheet>
                 </form>
             </field>
-        </record>
-        
+        </record>        
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
@@ -32,7 +31,7 @@
                 <tree string="arch" version="7.0">
                     <field name="name" />
                     <field name="client_id" />
-                    <field name="active" />
+                    <field name="enabled" />
                 </tree>
             </field>
         </record>
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 28f550b4bda..2959fa45db1 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -18,7 +18,7 @@ class OAuthController(openerpweb.Controller):
         registry = openerp.modules.registry.RegistryManager.get(dbname)
         with registry.cursor() as cr:
             providers = registry.get('auth.oauth.provider')
-            l = providers.read(cr, 1, providers.search(cr, 1, []))
+            l = providers.read(cr, 1, providers.search(cr, 1, [('enabled','=',True)]))
         return l
 
     @openerpweb.httprequest
diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py
index 4a218d98165..52d82b71895 100644
--- a/addons/auth_oauth/res_config.py
+++ b/addons/auth_oauth/res_config.py
@@ -21,19 +21,58 @@
 
 from openerp.osv import osv, fields
 
-class project_configuration(osv.TransientModel):
+import logging
+_logger = logging.getLogger(__name__)
+
+class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_oauth_google_active' : fields.boolean('enable sign in with google'),
-        'auth_oauth_google_client_id' : fields.char('Google client_id'),
-        'auth_oauth_facebook_client_id' : fields.char('Facebook client_id'),
+        'auth_oauth_google_enabled' : fields.boolean('Allow users to login with Google'),
+        'auth_oauth_google_client_id' : fields.char('Client ID'),
+        'auth_oauth_facebook_enabled' : fields.boolean('Allow users to login with Facebook'),
+        'auth_oauth_facebook_client_id' : fields.char('Client ID'),
     }
 
-    # def get_default_alias_domain(self, cr, uid, ids, context=None):
-    #     return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)}
+    def get_default_allow(self, cr, uid, fields, context=None):
+        google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
+        rg = self.pool.get('auth.oauth.provider').read(cr, uid, [google_id], ['enabled'], context=context)
+        facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
+        rf = self.pool.get('auth.oauth.provider').read(cr, uid, [facebook_id], ['enabled'], context=context)
+        return {
+            'auth_oauth_google_enabled': rg[0]['enabled'],
+            'auth_oauth_facebook_enabled': rf[0]['enabled']
+        }
 
-    # def set_alias_domain(self, cr, uid, ids, context=None):
-    #     config_parameters = self.pool.get("ir.config_parameter")
-    #     for record in self.browse(cr, uid, ids, context=context):
-    #         config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
+    def set_allow(self, cr, uid, ids, context=None):
+        google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
+        facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
+        config = self.browse(cr, uid, ids[0], context=context)
+        self.pool.get('auth.oauth.provider').write(cr, uid, [google_id], {'enabled':config.auth_oauth_google_enabled})
+        self.pool.get('auth.oauth.provider').write(cr, uid, [facebook_id], {'enabled':config.auth_oauth_facebook_enabled})
+
+    # def get_default_client_ids(self, cr, uid, fields, context=None):
+    #     google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
+    #     facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
+    #     return {
+    #         'auth_oauth_google_client_id': icp.get_param(cr, uid, 'auth.auth_oauth_google_client_id', "Set by the user") or False
+    #     }
+
+    # def set_client_ids(self, cr, uid, ids, context=None):
+    #     provider_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_goole')
+
+
+    #     config = self.browse(cr, uid, ids[0], context=context)
+    #     icp = self.pool.get('ir.config_parameter')
+    #     icp.set_param(cr, uid, 'auth.google_client_id', config.google_client_id)
+
+    # def get_default_facebook_client_id(self, cr, uid, fields, context=None):
+    #     icp = self.pool.get('ir.config_parameter')
+    #     return {
+    #         'facebook_client_id': icp.get_param(cr, uid, 'auth.facebook_client_id', "Set by the user") or False
+    #     }
+
+    # def set_facebook_client_id(self, cr, uid, ids, context=None):
+    #     config = self.browse(cr, uid, ids[0], context=context)
+    #     icp = self.pool.get('ir.config_parameter')
+    #     icp.set_param(cr, uid, 'auth.facebook_client_id', config.facebook_client_id)
\ No newline at end of file
diff --git a/addons/auth_oauth/res_config.xml b/addons/auth_oauth/res_config.xml
new file mode 100644
index 00000000000..78c5e26d983
--- /dev/null
+++ b/addons/auth_oauth/res_config.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>        
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_general_configuration">
+            <field name="name">base.config.settings.oauth</field>
+            <field name="model">base.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='module_auth_oauth']/.." position="after">
+                    <div attrs="{'invisible':[('module_auth_oauth','=',False)]}">
+                        <div name="google">
+                            <div>
+                                <field name="auth_oauth_google_enabled" class="oe_inline"/>
+                                <label for="auth_oauth_google_enabled"/>                                
+                            </div>
+                            <div attrs="{'invisible':[('auth_oauth_google_enabled','=',False)]}">
+                                <div>
+                                    <p>To setup the signin process with Google, first you have to perform the following steps:</p>
+                                    <br/>
+                                    1. Register your application through the Google's APIs console. The result of this registration is a set of values that are known to both Google and you application: 'client_id' and 'redirect_uri'.
+                                    <br/>
+                                    2. Fill the following field with the values assigned by Google.
+                                </div>
+                                <div>
+                                    <label for="auth_oauth_google_client_id" placeholder="Your CLIENT_ID"/>                                            
+                                    <field name="auth_oauth_google_client_id" class="oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div name="facebook">
+                            <div>
+                                <field name="auth_oauth_facebook_enabled" class="oe_inline"/>
+                                <label for="auth_oauth_facebook_enabled"/>                                
+                            </div>
+                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">                            
+                                <div>
+                                    <label string="Here goes the explanation"/>
+                                </div>
+                                <div>
+                                    <label for="auth_oauth_facebook_client_id" placeholder="Your CLIENT_ID"/>                                            
+                                    <field name="auth_oauth_facebook_client_id" class="oe_inline"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/auth_oauth/res_config_view.xml b/addons/auth_oauth/res_config_view.xml
deleted file mode 100644
index 5744dfaa8a2..00000000000
--- a/addons/auth_oauth/res_config_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="view_general_configuration_auth_oauth" model="ir.ui.view">
-            <field name="name">base.config.auth.oauth</field>
-            <field name="model">base.config.settings</field>
-            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-            <field name="arch" type="xml">
-                <xpath expr="//label[@for='module_auth_oauth']" position="after">
-                    <div>
-                        <field name="auth_oauth_google_active" class="oe_inline"/>
-                        <label for="auth_oauth_google_active"/>
-                    </div>
-                    <div>
-                        <p attrs="{'invisible': [('auth_oauth_google_active','=',False)]}">
-                            Explanation goes here OpenERP allows to
-                            automatically create leads (or others documents)
-                            from incoming emails. You can automatically
-                            synchronize emails with OpenERP using regular
-                            POP/IMAP accounts, using a direct email integration
-                            script for your email server, or by manually
-                            pushing emails to OpenERP using specific
-                            plugins for your preferred email application.
-                        </p>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>

From 01c56cbb9271f46f0620c33924443245b393c1fe Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 18 Aug 2012 15:04:11 +0200
Subject: [PATCH 7/9] oauth config wizard

bzr revid: al@openerp.com-20120818130411-auxfh3lc0r801kym
---
 addons/auth_oauth/auth_oauth.py   |  1 -
 addons/auth_oauth/res_config.py   | 53 +++++++++++--------------------
 addons/auth_oauth/res_config.xml  | 42 ++++++++++++------------
 addons/auth_signup/res_config.py  |  3 +-
 addons/auth_signup/res_config.xml |  4 +++
 addons/base_setup/res_config.py   |  4 +--
 addons/portal/__openerp__.py      |  2 +-
 7 files changed, 48 insertions(+), 61 deletions(-)

diff --git a/addons/auth_oauth/auth_oauth.py b/addons/auth_oauth/auth_oauth.py
index 8a7ba4e6e4d..34b6aa44936 100644
--- a/addons/auth_oauth/auth_oauth.py
+++ b/addons/auth_oauth/auth_oauth.py
@@ -17,7 +17,6 @@ class auth_oauth_provider(osv.osv):
         'enabled' : fields.boolean('Allowed'),
         'css_class' : fields.char('CSS class'),
         'body' : fields.char('Body'),
-        'active' : fields.boolean('Active'),
         'sequence' : fields.integer(),
     }
     _defaults = {
diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py
index 52d82b71895..82d79c767f5 100644
--- a/addons/auth_oauth/res_config.py
+++ b/addons/auth_oauth/res_config.py
@@ -28,51 +28,36 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_oauth_google_enabled' : fields.boolean('Allow users to login with Google'),
+        'auth_oauth_google_enabled' : fields.boolean('Allow users to sign in with Google'),
         'auth_oauth_google_client_id' : fields.char('Client ID'),
-        'auth_oauth_facebook_enabled' : fields.boolean('Allow users to login with Facebook'),
+        'auth_oauth_facebook_enabled' : fields.boolean('Allow users to sign in with Facebook'),
         'auth_oauth_facebook_client_id' : fields.char('Client ID'),
     }
 
-    def get_default_allow(self, cr, uid, fields, context=None):
+    def get_oauth_providers(self, cr, uid, fields, context=None):
         google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
-        rg = self.pool.get('auth.oauth.provider').read(cr, uid, [google_id], ['enabled'], context=context)
         facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
-        rf = self.pool.get('auth.oauth.provider').read(cr, uid, [facebook_id], ['enabled'], context=context)
+        rg = self.pool.get('auth.oauth.provider').read(cr, uid, [google_id], ['enabled','client_id'], context=context)
+        rf = self.pool.get('auth.oauth.provider').read(cr, uid, [facebook_id], ['enabled','client_id'], context=context)
         return {
             'auth_oauth_google_enabled': rg[0]['enabled'],
-            'auth_oauth_facebook_enabled': rf[0]['enabled']
+            'auth_oauth_google_client_id': rg[0]['client_id'],
+            'auth_oauth_facebook_enabled': rf[0]['enabled'],
+            'auth_oauth_facebook_client_id': rf[0]['client_id'],
         }
 
-    def set_allow(self, cr, uid, ids, context=None):
+    def set_oauth_providers(self, cr, uid, ids, context=None):
         google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
         facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
         config = self.browse(cr, uid, ids[0], context=context)
-        self.pool.get('auth.oauth.provider').write(cr, uid, [google_id], {'enabled':config.auth_oauth_google_enabled})
-        self.pool.get('auth.oauth.provider').write(cr, uid, [facebook_id], {'enabled':config.auth_oauth_facebook_enabled})
+        rg = {
+            'enabled':config.auth_oauth_google_enabled,
+            'client_id':config.auth_oauth_google_client_id,
+        }
+        rf = {
+            'enabled':config.auth_oauth_facebook_enabled,
+            'client_id':config.auth_oauth_facebook_client_id,
+        }
+        self.pool.get('auth.oauth.provider').write(cr, uid, [google_id], rg)
+        self.pool.get('auth.oauth.provider').write(cr, uid, [facebook_id], rf)
 
-    # def get_default_client_ids(self, cr, uid, fields, context=None):
-    #     google_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_google')[1]
-    #     facebook_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_facebook')[1]
-    #     return {
-    #         'auth_oauth_google_client_id': icp.get_param(cr, uid, 'auth.auth_oauth_google_client_id', "Set by the user") or False
-    #     }
-
-    # def set_client_ids(self, cr, uid, ids, context=None):
-    #     provider_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_oauth', 'provider_goole')
-
-
-    #     config = self.browse(cr, uid, ids[0], context=context)
-    #     icp = self.pool.get('ir.config_parameter')
-    #     icp.set_param(cr, uid, 'auth.google_client_id', config.google_client_id)
-
-    # def get_default_facebook_client_id(self, cr, uid, fields, context=None):
-    #     icp = self.pool.get('ir.config_parameter')
-    #     return {
-    #         'facebook_client_id': icp.get_param(cr, uid, 'auth.facebook_client_id', "Set by the user") or False
-    #     }
-
-    # def set_facebook_client_id(self, cr, uid, ids, context=None):
-    #     config = self.browse(cr, uid, ids[0], context=context)
-    #     icp = self.pool.get('ir.config_parameter')
-    #     icp.set_param(cr, uid, 'auth.facebook_client_id', config.facebook_client_id)
\ No newline at end of file
diff --git a/addons/auth_oauth/res_config.xml b/addons/auth_oauth/res_config.xml
index 78c5e26d983..2b06e05327a 100644
--- a/addons/auth_oauth/res_config.xml
+++ b/addons/auth_oauth/res_config.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>        
+<?xml version="1.0"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="view_general_configuration">
             <field name="name">base.config.settings.oauth</field>
             <field name="model">base.config.settings</field>
@@ -12,35 +11,34 @@
                         <div name="google">
                             <div>
                                 <field name="auth_oauth_google_enabled" class="oe_inline"/>
-                                <label for="auth_oauth_google_enabled"/>                                
+                                <label for="auth_oauth_google_enabled"/>
                             </div>
                             <div attrs="{'invisible':[('auth_oauth_google_enabled','=',False)]}">
-                                <div>
-                                    <p>To setup the signin process with Google, first you have to perform the following steps:</p>
+                                <blockquote>
+                                    To setup the signin process with Google, first you have to perform the following steps:<br/>
                                     <br/>
-                                    1. Register your application through the Google's APIs console. The result of this registration is a set of values that are known to both Google and you application: 'client_id' and 'redirect_uri'.
+                                    - Go to the <a href="https://code.google.com/apis/console/">Google APIs console</a><br/>
+                                    - Ceate a new project<br/>
+                                    - Go to Api Access<br/>
+                                    - Create an oauth client_id<br/>
+                                    - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.<br/>
                                     <br/>
-                                    2. Fill the following field with the values assigned by Google.
-                                </div>
-                                <div>
-                                    <label for="auth_oauth_google_client_id" placeholder="Your CLIENT_ID"/>                                            
-                                    <field name="auth_oauth_google_client_id" class="oe_inline"/>
-                                </div>
+                                    Now copy paste the client_id here: <field name="auth_oauth_google_client_id" class="oe_inline" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
+                                </blockquote>
                             </div>
                         </div>
                         <div name="facebook">
                             <div>
                                 <field name="auth_oauth_facebook_enabled" class="oe_inline"/>
-                                <label for="auth_oauth_facebook_enabled"/>                                
+                                <label for="auth_oauth_facebook_enabled"/>
                             </div>
-                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">                            
-                                <div>
-                                    <label string="Here goes the explanation"/>
-                                </div>
-                                <div>
-                                    <label for="auth_oauth_facebook_client_id" placeholder="Your CLIENT_ID"/>                                            
-                                    <field name="auth_oauth_facebook_client_id" class="oe_inline"/>
-                                </div>
+                            <div attrs="{'invisible':[('auth_oauth_facebook_enabled','=',False)]}">
+                                <blockquote>
+                                    To setup the signin process with Google, first you have to perform the following steps:<br/>
+                                    <br/>
+                                    Now copy paste the client_id here: <field name="auth_oauth_facebook_client_id" class="oe_inline" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
+                                </blockquote>
+
                             </div>
                         </div>
                     </div>
@@ -49,4 +47,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index a9a490de8c5..50dc332ac56 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -25,7 +25,8 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup')
+        'auth_signup_uninvited': fields.boolean('Allow uninvited users to sign up'),
+        'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
     def get_default_signup(self, cr, uid, fields, context=None):
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index f85d173792a..49669d36618 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -8,6 +8,10 @@
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='module_auth_anonymous']/.." position="after">
+                    <div>
+                        <field name="auth_signup_uninvited" class="oe_inline"/>
+                        <label for="auth_signup_uninvited"/>
+                    </div>
                     <div>
                         <label for="auth_signup_template_user_id"/>
                         <field name="auth_signup_template_user_id" class="oe_inline"/>
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 68940216ad6..7e06f680f83 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -30,9 +30,9 @@ class base_config_settings(osv.osv_memory):
                 This installs the module multi_company."""),
         'module_share': fields.boolean('allow documents sharing',
             help="""Share or embbed any screen of openerp."""),
-        'module_portal': fields.boolean('activate customer portal',
+        'module_portal': fields.boolean('activate the customer/supplier portal',
             help="""Give access your customers and suppliers to their documents."""),
-        'module_auth_anonymous': fields.boolean('public website',
+        'module_auth_anonymous': fields.boolean('activete the public portal',
             help="""Enable the public part of openerp, the public part of openerp are browsable like a website."""),
         'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
     }
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6669efbcf77..4da97e4bff4 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name' : "Portal",
     'version' : "1.0",
-    'depends' : ["base", "share", "auth_anonymous"],
+    'depends' : ["base", "share", "auth_signup" "auth_anonymous"],
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """

From b10545edf22c870f10f96f98db63a39f6280c202 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 18 Aug 2012 15:36:07 +0200
Subject: [PATCH 8/9] typo

bzr revid: al@openerp.com-20120818133607-ex57qifuysqmvao8
---
 addons/portal/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 4da97e4bff4..094d2915cb4 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name' : "Portal",
     'version' : "1.0",
-    'depends' : ["base", "share", "auth_signup" "auth_anonymous"],
+    'depends' : ["base", "share", "auth_signup", "auth_anonymous"],
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """

From 4f76c4e8d9fecca6ffc091f13c40ac3eadcc742d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 18 Aug 2012 18:46:36 +0200
Subject: [PATCH 9/9] improve config wizard labels

bzr revid: al@openerp.com-20120818164636-ue0fljh45smzskb9
---
 addons/auth_signup/res_config.py | 2 +-
 addons/base_setup/res_config.py  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 50dc332ac56..6afd1c5b581 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -25,7 +25,7 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_uninvited': fields.boolean('Allow uninvited users to sign up'),
+        'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"),
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 7e06f680f83..4826a50400d 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -32,8 +32,8 @@ class base_config_settings(osv.osv_memory):
             help="""Share or embbed any screen of openerp."""),
         'module_portal': fields.boolean('activate the customer/supplier portal',
             help="""Give access your customers and suppliers to their documents."""),
-        'module_auth_anonymous': fields.boolean('activete the public portal',
-            help="""Enable the public part of openerp, the public part of openerp are browsable like a website."""),
+        'module_auth_anonymous': fields.boolean('activate the public portal',
+            help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
     }