pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-12.1 up to 8aa8548d8a

Browse Source
This commit is contained in:
Christophe Simonis
2019-01-09 19:59:27 +01:00
parent 37b518f174 8aa8548d8a
commit d7c5bc02cc
710 changed files with 19023 additions and 12590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_ldap/i18n/auth_ldap.pot
+5 -4
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Project-Id-Version: Odoo Server saas~12.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-21 13:17+0000\n"
"PO-Revision-Date: 2018-09-21 13:17+0000\n"
"POT-Creation-Date: 2018-12-24 10:57+0000\n"
"PO-Revision-Date: 2018-12-24 10:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -133,7 +133,7 @@ msgid "Login Information"
msgstr ""
#. module: auth_ldap
#: code:addons/auth_ldap/models/res_company_ldap.py:201
#: code:addons/auth_ldap/models/res_company_ldap.py:202
#, python-format
msgid "No local user found for LDAP login and not configured to create one"
msgstr ""
@@ -197,3 +197,4 @@ msgstr ""
#: model:ir.model,name:auth_ldap.model_res_users
msgid "Users"
msgstr ""
addons/auth_ldap/i18n/nb.po
+5 -3
View File
@@ -4,13 +4,15 @@
#
# Translators:
# Martin Trigaux, 2018
# Marius Stedjan <marius@stedjan.com>, 2018
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-21 13:17+0000\n"
"PO-Revision-Date: 2018-09-21 13:17+0000\n"
"Last-Translator: Martin Trigaux, 2018\n"
"PO-Revision-Date: 2018-08-24 09:15+0000\n"
"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +47,7 @@ msgstr ""
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_config_settings
msgid "Config Settings"
msgstr ""
msgstr "Konfigurasjonsinnstillinger"
#. module: auth_ldap
#: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__create_user
addons/auth_ldap/models/res_company_ldap.py
+1 -1
View File
@@ -192,7 +192,7 @@ class CompanyLDAP(models.Model):
elif conf['create_user']:
_logger.debug("Creating new Odoo user \"%s\" from LDAP" % login)
values = self._map_ldap_attributes(conf, login, ldap_entry)
SudoUser = self.env['res.users'].sudo()
SudoUser = self.env['res.users'].sudo().with_context(no_reset_password=True)
if conf['user']:
values['active'] = True
return SudoUser.browse(conf['user'][0]).copy(default=values).id