From 70a8e7902bcece46c1276bd3c618349c65042b12 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 27 Jan 2014 16:54:12 +0100
Subject: [PATCH] [FIX] remove module_portal_anonymous ref

bzr revid: chm@openerp.com-20140127155412-zujhq5qb2q6xzj2t
---
 addons/auth_signup/res_config.xml                     |  2 +-
 addons/base_setup/res_config.py                       |  2 --
 addons/base_setup/res_config_view.xml                 | 11 +----------
 .../website_sale/static/src/js/website.tour.shop.js   |  4 ++--
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 47df51ea1f9..1f8bc760a9e 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -7,7 +7,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="//field[@name='module_portal_anonymous']/.." position="after">
+                <xpath expr="//field[@name='module_portal']/.." position="after">
                     <div>
                         <field name="auth_signup_reset_password" class="oe_inline"/>
                         <label for="auth_signup_reset_password"/>
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index dc0b1de12df..763d0784603 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -35,8 +35,6 @@ class base_config_settings(osv.osv_memory):
             help="""Share or embbed any screen of openerp."""),
         'module_portal': fields.boolean('Activate the customer portal',
             help="""Give your customers access to their documents."""),
-        'module_portal_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, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
         'module_google_drive': fields.boolean('Attach Google documents to any record',
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 8b89cbb9546..fd57e077ee4 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -44,7 +44,7 @@
                             <div>
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
-                                <p attrs="{'invisible': [('module_portal_anonymous','=',False)]}">
+                                <p attrs="{'invisible': [('module_portal','=',False)]}">
                                     When you send a document to a customer
                                     (quotation, invoice), your customer will be
                                     able to signup to get all his documents,
@@ -52,15 +52,6 @@
                                     etc.
                                 </p>
                             </div>
-                            <div>
-                                <field name="module_portal_anonymous" class="oe_inline"/>
-                                <label for="module_portal_anonymous"/> <span class="oe_grey">(company news, jobs, contact form, etc.)</span>
-                                <p attrs="{'invisible': [('module_portal_anonymous','=',False)]}">
-                                    The public portal is accessible only if you are in a single database mode. You can
-                                    launch the OpenERP Server with the option <b>--db-filter=YOUR_DATABAE</b> to do so.
-                                    Once activated, the login page will be replaced by the public website.
-                                </p>
-                            </div>
                         </div>
                     </group>
                     <group>
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index c7540563d93..5abe60c8252 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -184,7 +184,7 @@
 
     website.EditorShopTest = website.Test.extend({
         id: 'shoptest',
-        name: "Try to by 3 products",
+        name: "Try to by products",
         path: '/shop',
         init: function (editor) {
             var self = this;
@@ -300,7 +300,7 @@
             return this._super();
         },
         trigger: function () {
-            return (this.resume() && this.testUrl(/^\/shop\//)) || this._super();
+            return (this.resume() && this.testUrl(/\/shop\//)) || this._super();
         },
     });