diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 48fec608195..4fde3264a9d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -194,7 +194,7 @@
-
+
@@ -349,7 +349,7 @@
-
+
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 2fc3ca5b524..8bbe867c111 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -88,8 +88,8 @@ class ir_model_fields_anonymization(osv.osv):
if global_state == 'anonymized':
raise osv.except_osv('Error !', "The database is currently anonymized, you cannot create, modify or delete fields.")
elif global_state == 'unstable':
- msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
- " while some fields are not anonymized. You should try to solve this problem before trying to create, write or delete fields."
+ msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
+ " while some fields are not anonymized. You should try to solve this problem before trying to create, write or delete fields.")
raise osv.except_osv('Error !', msg)
return True
@@ -297,7 +297,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
res['name'] = '.pickle'
res['summary'] = self._get_summary_value(cr, uid, context)
res['state'] = self._get_state_value(cr, uid, context)
- res['msg'] = """Before executing the anonymization process, you should make a backup of your database."""
+ res['msg'] = _("""Before executing the anonymization process, you should make a backup of your database.""")
return res
@@ -355,8 +355,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
# remove the placeholer:
eview.remove(placeholder)
else:
- msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
- " while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
+ msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
+ " while some fields are not anonymized. You should try to solve this problem before trying to do anything else.")
raise osv.except_osv('Error !', msg)
res['arch'] = etree.tostring(eview)
@@ -386,10 +386,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
# check that all the defined fields are in the 'clear' state
state = self.pool.get('ir.model.fields.anonymization')._get_global_state(cr, uid, context=context)
if state == 'anonymized':
- self._raise_after_history_update(cr, uid, history_id, 'Error !', "The database is currently anonymized, you cannot anonymize it again.")
+ self._raise_after_history_update(cr, uid, history_id, _('Error !'), _("The database is currently anonymized, you cannot anonymize it again."))
elif state == 'unstable':
- msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
- " while some fields are not anonymized. You should try to solve this problem before trying to do anything."
+ msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
+ " while some fields are not anonymized. You should try to solve this problem before trying to do anything.")
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
# do the anonymization:
@@ -441,11 +441,11 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
elif field_type == 'integer':
anonymized_value = 0
elif field_type in ['binary', 'many2many', 'many2one', 'one2many', 'reference']: # cannot anonymize these kind of fields
- msg = "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference."
+ msg = _("Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference.")
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
if anonymized_value is None:
- self._raise_after_history_update(cr, uid, history_id, 'Error !', "Anonymized value is None. This cannot happens.")
+ self._raise_after_history_update(cr, uid, history_id, _('Error !'), _("Anonymized value is None. This cannot happens."))
sql = "update %(table)s set %(field)s = %%(anonymized_value)s where id = %%(id)s" % {
'table': table_name,
@@ -521,16 +521,16 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
# check that all the defined fields are in the 'anonymized' state
state = ir_model_fields_anonymization_model._get_global_state(cr, uid, context=context)
if state == 'clear':
- raise osv.except_osv('Error !', "The database is not currently anonymized, you cannot reverse the anonymization.")
+ raise osv.except_osv_('Error !', "The database is not currently anonymized, you cannot reverse the anonymization.")
elif state == 'unstable':
- msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
- " while some fields are not anonymized. You should try to solve this problem before trying to do anything."
+ msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
+ " while some fields are not anonymized. You should try to solve this problem before trying to do anything.")
raise osv.except_osv('Error !', msg)
wizards = self.browse(cr, uid, ids, context=context)
for wizard in wizards:
if not wizard.file_import:
- msg = "It is not possible to reverse the anonymization process without supplying the anonymization export file."
+ msg = _("It is not possible to reverse the anonymization process without supplying the anonymization export file.")
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
# reverse the anonymization:
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 1246850fe04..00000000000
--- a/addons/auth_anonymous/__openerp__.py
+++ /dev/null
@@ -1,16 +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'],
- 'data': ['auth_anonymous.xml'],
- 'js': ['static/src/js/auth_anonymous.js'],
- 'qweb': ['static/src/xml/auth_anonymous.xml'],
-}
diff --git a/addons/auth_anonymous/auth_anonymous.xml b/addons/auth_anonymous/auth_anonymous.xml
deleted file mode 100644
index 503a8cc8274..00000000000
--- a/addons/auth_anonymous/auth_anonymous.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- Anonymous
- anonymous
- anonymous
-
-
- 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
-
-
-
-
- Anonymous Group
-
-
-
-
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/es.po b/addons/auth_anonymous/i18n/es.po
deleted file mode 100644
index 977ae9253a9..00000000000
--- a/addons/auth_anonymous/i18n/es.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Spanish 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-11 14:07+0000\n"
-"Last-Translator: Pedro Manuel Baeza \n"
-"Language-Team: Spanish \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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
-
-#. module: auth_anonymous
-#. openerp-web
-#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
-#, python-format
-msgid "Login"
-msgstr "Inicio de sesión"
-
-#. 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/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/__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/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/__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/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 @@
-
-
+
+
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 746936e28cd..86a944544ff 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -300,6 +300,7 @@ AndrewopportunityInterest in your Graphic Design Project
+ 7Agrolait
@@ -420,6 +421,7 @@ Andrew
opportunityInterest in your customizable Pcs
+ 3Robin Smith
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/event/event_view.xml b/addons/event/event_view.xml
index efdbf1be3b2..f8796e5183e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -240,20 +240,22 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 9e5337492d9..f6cd3366226 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -99,7 +99,7 @@ class hr_analytic_timesheet(osv.osv):
if context is None:
context = {}
emp_obj = self.pool.get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id') or uid)], context=context)
if emp_id:
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.product_id:
@@ -110,7 +110,7 @@ class hr_analytic_timesheet(osv.osv):
emp_obj = self.pool.get('hr.employee')
if context is None:
context = {}
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id') or uid)], context=context)
if emp_id:
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.product_id:
@@ -121,7 +121,7 @@ class hr_analytic_timesheet(osv.osv):
emp_obj = self.pool.get('hr.employee')
if context is None:
context = {}
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id') or uid)], context=context)
if emp_id:
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if bool(emp.product_id):
@@ -136,8 +136,11 @@ class hr_analytic_timesheet(osv.osv):
emp_obj = self.pool.get('hr.employee')
if context is None:
context = {}
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
- if not emp_id :
+ if context.get('employee_id'):
+ emp_id = [context.get('employee_id')]
+ else:
+ emp_id = emp_obj.search(cr, uid, [('user_id','=',context.get('user_id') or uid)], limit=1, context=context)
+ if not emp_id:
raise osv.except_osv(_('Warning!'), _('Please create an employee for this user, using the menu: Human Resources > Employees.'))
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.journal_id:
@@ -152,7 +155,7 @@ class hr_analytic_timesheet(osv.osv):
'general_account_id': _getGeneralAccount,
'journal_id': _getAnalyticJournal,
'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(self,cr,uid,context=ctx)),
- 'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id', uid),
+ 'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id') or uid,
}
def on_change_account_id(self, cr, uid, ids, account_id, context=None):
return {'value':{}}
@@ -169,7 +172,7 @@ class hr_analytic_timesheet(osv.osv):
if context is None:
context = {}
emp_obj = self.pool.get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id') or uid)], context=context)
ename = ''
if emp_id:
ename = emp_obj.browse(cr, uid, emp_id[0], context=context).name
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 3991696b331..242658bc0c0 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -143,7 +143,7 @@ class hr_si_project(osv.osv_memory):
model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)], context=context)
resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
return {
- 'name': 'Sign in / Sign out',
+ 'name': _('Sign in / Sign out'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'hr.sign.%s.project' % in_out,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 6a060410d6d..f4ab61b028f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -218,8 +218,10 @@ class hr_timesheet_sheet(osv.osv):
def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
department_id = False
if employee_id:
- department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
- return {'value': {'department_id': department_id}}
+ empl_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
+ department_id = empl_id.department_id.id
+ user_id = empl_id.user_id.id
+ return {'value': {'department_id': department_id, 'user_id': user_id,}}
# ------------------------------------------------
# OpenChatter methods and notifications
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6de6be6c08d..1dd9d8323bf 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -81,6 +81,7 @@
+
@@ -94,7 +95,6 @@
-
@@ -103,7 +103,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
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/mail/mail_message.py b/addons/mail/mail_message.py
index 3f3b80b8f08..6997036234c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -76,7 +76,7 @@ class mail_message(osv.Model):
# TDE note: regroup by model/ids, to have less queries to perform
result = dict.fromkeys(ids, False)
for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
- if not message.get('model') or not message.get('res_id'):
+ if not message.get('model') or not message.get('res_id') or not self.pool.get(message['model']):
continue
result[message['id']] = self._shorten_name(self.pool.get(message['model']).name_get(cr, SUPERUSER_ID, [message['res_id']], context=context)[0][1])
return result
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6a505ef7534..cd783509bd4 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -729,8 +729,9 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
'location_id': False,
'location_dest_id': False
}}
+ location_obj = self.pool.get('stock.location')
warehouse_obj = self.pool.get('stock.warehouse')
- location_id = self.pool.get('stock.location').search(cr, uid, [('usage','=','production')], context=context)
+ location_id = location_obj.search(cr, uid, [('usage','=','production')], context=context)
location_id = location_id and location_id[0] or False
if type == 'add':
@@ -748,11 +749,12 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
'location_id': stock_id,
'location_dest_id': location_id
}}
+ scrap_location_ids = location_obj.search(cr, uid, [('scrap_location', '=', True)], context=context)
return {'value': {
'to_invoice': False,
'location_id': location_id,
- 'location_dest_id': self.pool.get('stock.location').search(cr, uid, [('name','=','Inventory loss')], context=context)
+ 'location_dest_id': scrap_location_ids and scrap_location_ids[0] or False,
}}
mrp_repair_line()
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 4f37a2205d7..c2ae387a879 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -43,16 +43,16 @@ very handy when used in combination with the module 'share'.
""",
'website': 'http://www.openerp.com',
'data': [
- 'security/portal_security.xml',
- 'security/ir.model.access.csv',
'portal_data.xml',
'portal_view.xml',
'wizard/portal_wizard_view.xml',
'wizard/share_wizard_view.xml',
'acquirer_view.xml',
+ 'security/ir.model.access.csv',
],
'demo': ['portal_demo.xml'],
'css': ['static/src/css/portal.css'],
+ 'auto_install': True,
'installable': True,
}
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 9e2bff2b962..920ec524fbd 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,6 +2,16 @@
+
+
+ Portal
+ Portal members have specific access rights (such as record rules and restricted menus).
+ They usually do not belong to the usual OpenERP groups.
+
+
+
+
+
Company's news
@@ -64,7 +74,16 @@
-
+
+
+
+ Anonymous
+ Anonymous users have specific access rights (such as record rules and restricted menus).
+ They usually do not belong to the usual OpenERP groups.
+ Paypal
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 4aad43716b6..7bd1224144d 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -5,48 +5,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Group Search
- res.groups
-
-
-
-
-
-
-
-
-
-
-
-
- Portal Form
- res.groups
-
-
-
-
-
-
-
-
+
Inboxmail.wall
@@ -76,9 +38,45 @@
-
+ action="action_mail_inbox_feeds_portal" sequence="10" groups="portal.group_portal"/>
+
+
+
+
+
+
+
+
+
+
+
+ Group Search
+ res.groups
+
+
+
+
+
+
+
+
+
+
+
+
+ Portal Form
+ res.groups
+
+
+
+
+
+
+
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 59ca37e213d..c81d96109ac 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,6 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_portal,1,0,1,1
-access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,group_portal,1,1,1,0
+access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_portal,1,0,1,1
+access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,portal.group_portal,1,1,1,0
access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_portal,1,0,0,0
access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_portal,1,0,0,0
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
deleted file mode 100644
index ee0af785599..00000000000
--- a/addons/portal/security/portal_security.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
- Portal
- Portal members have specific access rights (such as record rules and restricted menus).
- They usually do not belong to the usual OpenERP groups.
-
-
-
-
-
-
-
diff --git a/addons/portal_anonymous/__openerp__.py b/addons/portal_anonymous/__openerp__.py
index 25c35ec5799..5fe25614c40 100644
--- a/addons/portal_anonymous/__openerp__.py
+++ b/addons/portal_anonymous/__openerp__.py
@@ -9,6 +9,11 @@ Allow anonymous to Access Portal.
'category': 'Hidden',
'website': 'http://www.openerp.com',
'installable': True,
- 'depends': ['portal', 'auth_anonymous'],
- 'data': ['portal_anonymous.xml'],
+ 'depends': ['portal', 'web'],
+ 'data': [
+ 'security/ir.model.access.csv',
+ 'portal_anonymous_data.xml',
+ ],
+ 'js': ['static/src/js/portal_anonymous.js'],
+ 'qweb': ['static/src/xml/portal_anonymous.xml'],
}
diff --git a/addons/portal_anonymous/portal_anonymous.xml b/addons/portal_anonymous/portal_anonymous.xml
deleted file mode 100644
index 599df7933c5..00000000000
--- a/addons/portal_anonymous/portal_anonymous.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/addons/portal_anonymous/portal_anonymous_data.xml b/addons/portal_anonymous/portal_anonymous_data.xml
new file mode 100644
index 00000000000..ae97f4a577a
--- /dev/null
+++ b/addons/portal_anonymous/portal_anonymous_data.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Anonymous
+ anonymous
+ anonymous
+
+
+ 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
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/portal_anonymous/security/ir.model.access.csv b/addons/portal_anonymous/security/ir.model.access.csv
new file mode 100644
index 00000000000..9751c715516
--- /dev/null
+++ b/addons/portal_anonymous/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,0,0
+access_res_partner,res.partner,base.model_res_partner,portal.group_anonymous,1,0,0,0
+access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_anonymous,1,0,0,0
+access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_anonymous,1,0,0,0
+access_res_partner_title,res.partner_title,base.model_res_partner_title,portal.group_anonymous,1,0,0,0
diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js
similarity index 93%
rename from addons/auth_anonymous/static/src/js/auth_anonymous.js
rename to addons/portal_anonymous/static/src/js/portal_anonymous.js
index ac9feeed0b6..173e098a7bb 100644
--- a/addons/auth_anonymous/static/src/js/auth_anonymous.js
+++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js
@@ -1,4 +1,4 @@
-openerp.auth_anonymous = function(instance) {
+openerp.portal_anonymous = function(instance) {
instance.web.Login.include({
start: function() {
@@ -19,7 +19,7 @@ openerp.auth_anonymous = function(instance) {
init: function(parent) {
this._super(parent);
if (this.session.username == 'anonymous') {
- this.template = 'UserMenu.auth_anonymous';
+ this.template = 'UserMenu.portal_anonymous';
this.do_update = function() {}; // avoid change of avatar
}
},
diff --git a/addons/auth_anonymous/static/src/xml/auth_anonymous.xml b/addons/portal_anonymous/static/src/xml/portal_anonymous.xml
similarity index 86%
rename from addons/auth_anonymous/static/src/xml/auth_anonymous.xml
rename to addons/portal_anonymous/static/src/xml/portal_anonymous.xml
index 5ab84c281c7..07653ccf44c 100644
--- a/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
+++ b/addons/portal_anonymous/static/src/xml/portal_anonymous.xml
@@ -3,7 +3,7 @@
-->
-
+