OCA · ap-wtioit · Jul 23, 2013 · Jul 24, 2013 · Mar 14, 2014 · Jul 12, 2014
diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,4 @@ lxml
 pyjwt
 pysaml2
 python-jose
+python-ldap
diff --git a/users_ldap_mail/README.rst b/users_ldap_mail/README.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =====================================
 LDAP mapping for user name and e-mail
 =====================================
@@ -17,7 +13,7 @@ LDAP mapping for user name and e-mail
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github

diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "LDAP mapping for user name and e-mail",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.0.1",
     "depends": ["auth_ldap"],
     "author": "Daniel Reis," "Odoo Community Association (OCA)",
     "maintainers": ["joao-p-marques"],

diff --git a/users_ldap_mail/models/users_ldap_model.py b/users_ldap_mail/models/users_ldap_model.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from odoo import fields, models, tools
+from odoo import fields, models
 
 _logger = logging.getLogger(__name__)
 
@@ -42,7 +42,7 @@ def _map_ldap_attributes(self, conf, login, ldap_entry):
         for value_key, conf_name in mapping:
             try:
                 if conf[conf_name]:
-                    values[value_key] = tools.ustr(ldap_entry[1][conf[conf_name]][0])
+                    values[value_key] = ldap_entry[1][conf[conf_name]][0]
             except KeyError:
                 _logger.warning(
                     f'No LDAP attribute "{conf.get(conf_name)}" found for login '

diff --git a/users_ldap_mail/static/description/index.html b/users_ldap_mail/static/description/index.html
@@ -3,16 +3,15 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>LDAP mapping for user name and e-mail</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -360,21 +359,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="ldap-mapping-for-user-name-and-e-mail">
+<h1 class="title">LDAP mapping for user name and e-mail</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="ldap-mapping-for-user-name-and-e-mail">
-<h1>LDAP mapping for user name and e-mail</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:884c0f40475b56edbbe58a469af7199aca71ce970676c1b15cdea31aa7fcb5c2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-auth/tree/18.0/users_ldap_mail"><img alt="OCA/server-auth" src="https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-auth-18-0/server-auth-18-0-users_ldap_mail"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-auth&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-auth/tree/18.0/users_ldap_mail"><img alt="OCA/server-auth" src="https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-auth-18-0/server-auth-18-0-users_ldap_mail"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-auth&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of the auth_ldap module to support
 mail from LDAP and to allow you to get an e-mail address from LDAP
 accounts to Odoo users.</p>
@@ -393,7 +387,7 @@ <h1>LDAP mapping for user name and e-mail</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>Open Odoo in your browser</li>
@@ -408,30 +402,30 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>Add tests (use LDAP Mocking through something like
 <a class="reference external" href="https://mockldap.readthedocs.io/en/latest/overview.html">https://mockldap.readthedocs.io/en/latest/overview.html</a>)</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-auth/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/server-auth/issues/new?body=module:%20users_ldap_mail%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Daniel Reis</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <li>Daniel Reis (<a class="reference external" href="https://launchpad.com/~dreis-pt">https://launchpad.com/~dreis-pt</a>),</li>
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
@@ -442,11 +436,9 @@ <h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
@@ -457,6 +449,5 @@ <h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>
diff --git a/users_ldap_populate/README.rst b/users_ldap_populate/README.rst
@@ -0,0 +1,108 @@
+=============
+LDAP Populate
+=============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4eb3cab1122e35773a183c1ec5450f73de46c048210cddf536bc7aa0e138cf42
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github
+    :target: https://github.com/OCA/server-auth/tree/18.0/users_ldap_populate
+    :alt: OCA/server-auth
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/server-auth-18-0/server-auth-18-0-users_ldap_populate
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/server-auth&target_branch=18.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module extends the functionality of auth_ldap by adding
+functionality so that users can be populated from a LDAP server.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module, you need to:
+
+1. Go to 'Settings' -> 'General Settings'
+2. In the LDAP category click on or add a LDAP configuration
+3. In the pop-up enter all the LDAP settings
+4. Click the populate button
+5. A new pop-up will notify you of how many users are added
+
+Known issues / Roadmap
+======================
+
+- Improve test coverage and port its LDAP Patch method to a module where
+  they can be imported and reutilized on other tests.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-auth/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/server-auth/issues/new?body=module:%20users_ldap_populate%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Therp BV
+
+Contributors
+------------
+
+- Therp BV <https://therp.nl>
+- `Tecnativa <https://www.tecnativa.com>`__:
+
+  - Alexandre Díaz
+  - João Marques
+  - Carlos Roca
+  - Carolina Fernandez
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-joao-p-marques| image:: https://github.com/joao-p-marques.png?size=40px
+    :target: https://github.com/joao-p-marques
+    :alt: joao-p-marques
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-joao-p-marques| 
+
+This module is part of the `OCA/server-auth <https://github.com/OCA/server-auth/tree/18.0/users_ldap_populate>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/users_ldap_populate/__init__.py b/users_ldap_populate/__init__.py
@@ -0,0 +1,5 @@
+# Copyright 2012 Therp BV (<http://therp.nl>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html).
+
+from . import models
+from . import wizards
diff --git a/users_ldap_populate/__manifest__.py b/users_ldap_populate/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright 2012-2018 Therp BV <https://therp.nl>.
+# Copyright 2021 Tecnativa - João Marques
+# Copyright 2023 Tecnativa - Carolina Fernandez
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html).
+
+{
+    "name": "LDAP Populate",
+    "version": "18.0.1.0.1",
+    "author": "Therp BV, Odoo Community Association (OCA)",
+    "maintainers": ["joao-p-marques"],
+    "website": "https://github.com/OCA/server-auth",
+    "license": "AGPL-3",
+    "category": "Tools",
+    "depends": ["auth_ldap"],
+    "external_dependencies": {"python": ["python-ldap"]},
+    "data": [
+        "security/ir.model.access.csv",
+        "wizards/populate_wizard.xml",
+        "views/users_ldap.xml",
+    ],
+    "installable": True,
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ lxml @@
     pyjwt
     pysaml2
     python-jose
+    python-ldap