Merge commit 'refs/pull/371/head' of https://github.com/oca/server-auth…

… into 15.0-2639

base_user_show_email/README.rst

@@ -0,0 +1,85 @@
+====================
+Base User Show Email
+====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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/13.0/base_user_show_email
+    :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-13-0/server-auth-13-0-base_user_show_email
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/251/13.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+In recent Odoo versions, the login field is tightly linked to the email field
+(the field is displayed with an "Email" label, and it will populate the email of the user if it contains an "@" character).
+
+Yet for the users who uses a distinct login and email, this is confusing.
+
+The goal of this module is to untangle (a bit) these two fields. Here are the changes:
+
+* In the `res.users` form view:
+    * Display a "Login" label instead of "Email" on the `login` field
+    * Show the currently invisible `email` field and its label
+* In the `res.users` tree view:
+    * Display the `email` field next to the `login` field
+* Change the login layout to prompt for a "Login" instead of an "Email" (compatible with the web_enterprise layout)
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+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 smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/server-auth/issues/new?body=module:%20base_user_show_email%0Aversion:%2013.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
+~~~~~~~
+
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Patrick Tombez <patrick.tombez@camptocamp.com>
+
+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.
+
+This module is part of the `OCA/server-auth <https://github.com/OCA/server-auth/tree/13.0/base_user_show_email>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

base_user_show_email/__manifest__.py

@@ -0,0 +1,16 @@
+# Copyright 2019 Camptocamp
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Base User Show Email",
+    "version": "15.0.1.0.0",
+    "category": "Tools",
+    "website": "https://github.com/OCA/server-auth",
+    "author": "Camptocamp, " "Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "installable": True,
+    "application": False,
+    "summary": "Untangle user login and email",
+    "depends": ["base", "web"],
+    "data": ["views/res_users_view.xml", "views/login_layout.xml"],
+}

base_user_show_email/i18n/base_user_show_email.pot

@@ -0,0 +1,25 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_user_show_email
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \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: base_user_show_email
+#: model_terms:ir.ui.view,arch_db:base_user_show_email.user_email_form
+msgid "Email Address"
+msgstr ""
+
+#. module: base_user_show_email
+#: model_terms:ir.ui.view,arch_db:base_user_show_email.login
+#: model_terms:ir.ui.view,arch_db:base_user_show_email.user_email_form
+msgid "Login"
+msgstr ""

base_user_show_email/readme/CONTRIBUTORS.rst

@@ -0,0 +1 @@
+* Patrick Tombez <patrick.tombez@camptocamp.com>

base_user_show_email/readme/DESCRIPTION.rst

@@ -0,0 +1,13 @@
+In recent Odoo versions, the login field is tightly linked to the email field
+(the field is displayed with an "Email" label, and it will populate the email of the user if it contains an "@" character).
+
+Yet for the users who uses a distinct login and email, this is confusing.
+
+The goal of this module is to untangle (a bit) these two fields. Here are the changes:
+
+* In the `res.users` form view:
+    * Display a "Login" label instead of "Email" on the `login` field
+    * Show the currently invisible `email` field and its label
+* In the `res.users` tree view:
+    * Display the `email` field next to the `login` field
+* Change the login layout to prompt for a "Login" instead of an "Email" (compatible with the web_enterprise layout)