From afad97f7221892a544f9bdc6a9b63fa5140720f5 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 12 Dec 2012 12:22:37 +0100
Subject: [PATCH 07/10] [IMP] Portal, now auto_install (also all of its
dependencies)
bzr revid: vta@openerp.com-20121212112237-1uvr5kuwheyq0sri
---
addons/auth_signup/__openerp__.py | 1 +
addons/base_setup/__openerp__.py | 2 +-
addons/email_template/__openerp__.py | 2 +-
addons/mail/__openerp__.py | 2 +-
addons/portal/__openerp__.py | 1 +
addons/share/__openerp__.py | 1 +
6 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 5fe705a4440..4e1ada7bd19 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -30,6 +30,7 @@ Allow users to sign up and reset their password
'category': 'Authentication',
'website': 'http://www.openerp.com',
'installable': True,
+ 'auto_install': True,
'depends': [
'base_setup',
'email_template',
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index e74238ba59c..9da171f2161 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -42,7 +42,7 @@ Shows you a list of applications features to install from.
],
'demo': [],
'installable': True,
- 'auto_install': False,
+ 'auto_install': True,
'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
'css': ['static/src/css/base_setup.css'],
}
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index f79800a76b9..1dc3baaf63c 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -64,7 +64,7 @@ campaigns on any OpenERP document.
],
'demo': ['res_partner_demo.yml'],
'installable': True,
- 'auto_install': False,
+ 'auto_install': True,
'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'],
}
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index c535e3f7024..5ddd66250d7 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -70,7 +70,7 @@ Main Features
'data/mail_group_demo_data.xml',
],
'installable': True,
- 'auto_install': False,
+ 'auto_install': True,
'application': True,
'images': [
'images/customer_history.jpeg',
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 5ed1772afea..e0aea46463c 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -52,6 +52,7 @@ very handy when used in combination with the module 'share'.
],
'demo': ['portal_demo.xml'],
'css': ['static/src/css/portal.css'],
+ 'auto_install': True,
'installable': True,
}
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 94eccba2a56..607dde3aa71 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -49,6 +49,7 @@ synchronization with other companies.
'wizard/share_wizard_view.xml'
],
'installable': True,
+ 'auto_install': True,
'web': True,
'js': ['static/src/js/share.js'],
'css': ['static/src/css/share.css'],
From 25014703058b8781129b874a903e0fea555443f4 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 12 Dec 2012 13:40:49 +0100
Subject: [PATCH 08/10] [IMP] Moved all js code from auth_anonymous to
portal_anonymous (changed also all related names, etc.) which will do all the
job. Removed auth_anonymous
bzr revid: vta@openerp.com-20121212124049-yttnbx75zxrekvc4
---
addons/auth_anonymous/__init__.py | 0
addons/auth_anonymous/__openerp__.py | 15 ----------
addons/auth_anonymous/i18n/ar.po | 30 -------------------
addons/auth_anonymous/i18n/auth_anonymous.pot | 29 ------------------
addons/auth_anonymous/i18n/fr.po | 30 -------------------
addons/auth_anonymous/i18n/hr.po | 30 -------------------
addons/auth_anonymous/i18n/it.po | 30 -------------------
addons/auth_anonymous/i18n/nb.po | 30 -------------------
addons/auth_anonymous/i18n/nl.po | 30 -------------------
addons/auth_anonymous/i18n/nl_BE.po | 30 -------------------
addons/auth_anonymous/i18n/pt_BR.po | 30 -------------------
addons/auth_anonymous/i18n/zh_CN.po | 30 -------------------
addons/auth_signup/res_config.xml | 2 +-
addons/base_setup/res_config.py | 2 +-
addons/base_setup/res_config_view.xml | 4 +--
addons/portal_anonymous/__openerp__.py | 4 ++-
.../static/src/js/portal_anonymous.js} | 4 +--
.../static/src/xml/portal_anonymous.xml} | 2 +-
18 files changed, 10 insertions(+), 322 deletions(-)
delete mode 100644 addons/auth_anonymous/__init__.py
delete mode 100644 addons/auth_anonymous/__openerp__.py
delete mode 100644 addons/auth_anonymous/i18n/ar.po
delete mode 100644 addons/auth_anonymous/i18n/auth_anonymous.pot
delete mode 100644 addons/auth_anonymous/i18n/fr.po
delete mode 100644 addons/auth_anonymous/i18n/hr.po
delete mode 100644 addons/auth_anonymous/i18n/it.po
delete mode 100644 addons/auth_anonymous/i18n/nb.po
delete mode 100644 addons/auth_anonymous/i18n/nl.po
delete mode 100644 addons/auth_anonymous/i18n/nl_BE.po
delete mode 100644 addons/auth_anonymous/i18n/pt_BR.po
delete mode 100644 addons/auth_anonymous/i18n/zh_CN.po
rename addons/{auth_anonymous/static/src/js/auth_anonymous.js => portal_anonymous/static/src/js/portal_anonymous.js} (93%)
rename addons/{auth_anonymous/static/src/xml/auth_anonymous.xml => portal_anonymous/static/src/xml/portal_anonymous.xml} (86%)
diff --git a/addons/auth_anonymous/__init__.py b/addons/auth_anonymous/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/auth_anonymous/__openerp__.py b/addons/auth_anonymous/__openerp__.py
deleted file mode 100644
index 6ec7c35edc0..00000000000
--- a/addons/auth_anonymous/__openerp__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- 'name': 'Anonymous',
- 'description': """
-Allow anonymous access to OpenERP.
-==================================
- """,
- 'author': 'OpenERP SA',
- 'version': '1.0',
- 'category': 'Authentication',
- 'website': 'http://www.openerp.com',
- 'installable': True,
- 'depends': ['web'],
- 'js': ['static/src/js/auth_anonymous.js'],
- 'qweb': ['static/src/xml/auth_anonymous.xml'],
-}
diff --git a/addons/auth_anonymous/i18n/ar.po b/addons/auth_anonymous/i18n/ar.po
deleted file mode 100644
index 09604084e5e..00000000000
--- a/addons/auth_anonymous/i18n/ar.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-01 17:58+0000\n"
-"Last-Translator: gehad shaat \n"
-"Language-Team: Arabic \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "تسجيل دخول"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "مجموعة مجهولة"
diff --git a/addons/auth_anonymous/i18n/auth_anonymous.pot b/addons/auth_anonymous/i18n/auth_anonymous.pot
deleted file mode 100644
index 75d06a7e581..00000000000
--- a/addons/auth_anonymous/i18n/auth_anonymous.pot
+++ /dev/null
@@ -1,29 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * auth_anonymous
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 02:52+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr ""
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr ""
-
diff --git a/addons/auth_anonymous/i18n/fr.po b/addons/auth_anonymous/i18n/fr.po
deleted file mode 100644
index 32042501573..00000000000
--- a/addons/auth_anonymous/i18n/fr.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-07 10:27+0000\n"
-"Last-Translator: Quentin THEURET \n"
-"Language-Team: French \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Connexion"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr ""
diff --git a/addons/auth_anonymous/i18n/hr.po b/addons/auth_anonymous/i18n/hr.po
deleted file mode 100644
index 4e910f11324..00000000000
--- a/addons/auth_anonymous/i18n/hr.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-09 19:39+0000\n"
-"Last-Translator: Goran Kliska \n"
-"Language-Team: Croatian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Prijava"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "Anonimna grupa"
diff --git a/addons/auth_anonymous/i18n/it.po b/addons/auth_anonymous/i18n/it.po
deleted file mode 100644
index b2251ea113c..00000000000
--- a/addons/auth_anonymous/i18n/it.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-30 00:10+0000\n"
-"Last-Translator: Sergio Corato \n"
-"Language-Team: Italian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Login"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "Gruppo Anonimo"
diff --git a/addons/auth_anonymous/i18n/nb.po b/addons/auth_anonymous/i18n/nb.po
deleted file mode 100644
index 545549eb7a2..00000000000
--- a/addons/auth_anonymous/i18n/nb.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-02 20:46+0000\n"
-"Last-Translator: Kaare Pettersen \n"
-"Language-Team: Norwegian Bokmal \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-03 04:36+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Logg inn."
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "Anonym gruppe."
diff --git a/addons/auth_anonymous/i18n/nl.po b/addons/auth_anonymous/i18n/nl.po
deleted file mode 100644
index 41d1a276d56..00000000000
--- a/addons/auth_anonymous/i18n/nl.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-29 15:11+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
-"Language-Team: Dutch \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Inloggen"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "Anonieme groep"
diff --git a/addons/auth_anonymous/i18n/nl_BE.po b/addons/auth_anonymous/i18n/nl_BE.po
deleted file mode 100644
index 52400d66436..00000000000
--- a/addons/auth_anonymous/i18n/nl_BE.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-27 13:37+0000\n"
-"Last-Translator: Els Van Vossel (Agaplan) \n"
-"Language-Team: Dutch (Belgium) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Aanmelden"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "Anonieme groep"
diff --git a/addons/auth_anonymous/i18n/pt_BR.po b/addons/auth_anonymous/i18n/pt_BR.po
deleted file mode 100644
index 0e5b432110f..00000000000
--- a/addons/auth_anonymous/i18n/pt_BR.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-10 14:18+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource \n"
-"Language-Team: Brazilian Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Autenticação"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "Grupo Anônimo"
diff --git a/addons/auth_anonymous/i18n/zh_CN.po b/addons/auth_anonymous/i18n/zh_CN.po
deleted file mode 100644
index 95afb2638c6..00000000000
--- a/addons/auth_anonymous/i18n/zh_CN.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-27 16:43+0000\n"
-"Last-Translator: ccdos \n"
-"Language-Team: Chinese (Simplified) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "登录"
-
-#. module: auth_anonymous
-#: model:res.groups,name:auth_anonymous.group_anonymous
-msgid "Anonymous Group"
-msgstr "匿名组"
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 86c56a065a7..47df51ea1f9 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -7,7 +7,7 @@
base.config.settings
-
+
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 27cc35d1308..dfe5d528fe2 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -32,7 +32,7 @@ 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('Activate the public portal',
+ '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"),
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index b08f116d414..80bc9bf6291 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -46,8 +46,8 @@