[BOT] post-merge updates

Author: OCA-git-bot

README.md

@@ -23,7 +23,7 @@ addon | version | maintainers | summary
 --- | --- | --- | ---
 [data_encryption](data_encryption/) | 16.0.1.0.1 |  | Store accounts and credentials encrypted by environment
 [mail_environment](mail_environment/) | 16.0.1.0.2 |  | Configure mail servers with server_environment_files
-[mail_environment_google_gmail](mail_environment_google_gmail/) | 16.0.1.0.0 | <a href='https://github.com/ivantodorovich'><img src='https://github.com/ivantodorovich.png' width='32' height='32' style='border-radius:50%;' alt='ivantodorovich'/></a> | Configure Gmail mail servers with server_environment_files
+[mail_environment_google_gmail](mail_environment_google_gmail/) | 16.0.1.1.0 | <a href='https://github.com/ivantodorovich'><img src='https://github.com/ivantodorovich.png' width='32' height='32' style='border-radius:50%;' alt='ivantodorovich'/></a> | Configure Gmail mail servers with server_environment_files
 [pos_environment](pos_environment/) | 16.0.1.0.1 | <a href='https://github.com/legalsylvain'><img src='https://github.com/legalsylvain.png' width='32' height='32' style='border-radius:50%;' alt='legalsylvain'/></a> | Custom messages on the bill depending on the environment
 [server_environment](server_environment/) | 16.0.1.1.2 |  | move some configurations out of the database
 [server_environment_data_encryption](server_environment_data_encryption/) | 16.0.1.0.0 |  | Server Environment Data Encryption

mail_environment_google_gmail/README.rst

@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===========================================================
 Mail configuration with server_environment for Google Gmail
 ===========================================================
@@ -7,13 +11,13 @@ Mail configuration with server_environment for Google Gmail
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:1afdf6a75ab850d6e8e117f7ddfd2834abba154c008f377cd2e00a0a2a96a133
+   !! source digest: sha256:55658f8bb3f58ca5d9dc048c833a475931decfa1f0a1aafd45f9ca99a49b084b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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
+.. |badge2| image:: https://img.shields.io/badge/license-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--env-lightgray.png?logo=github
@@ -28,7 +32,7 @@ Mail configuration with server_environment for Google Gmail
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module allows to configure Gmail outgoing servers with server-env.
+This module allows to configure Gmail Authentication for email servers with server-env.
 
 **Table of contents**
 
@@ -49,10 +53,18 @@ Example of config file ::
   smtp_port = 587
   smtp_user = example@gmail.com
   smtp_encryption = starttls
-  use_google_gmail_service = True
+  smtp_authentication = gmail
   google_gmail_authorization_code = YOUR_ACCOUNT_AUTH_CODE
   google_gmail_refresh_token = YOUR_REFRESH_TOKEN
 
+  [incoming_mail.gmail_imap_server]
+  server_type = gmail
+  smtp_host = imap.gmail.com
+  smtp_port = 993
+  user = example@gmail.com
+  is_ssl = 1
+  google_gmail_authorization_code = YOUR_ACCOUNT_AUTH_CODE
+  google_gmail_refresh_token = YOUR_REFRESH_TOKEN
 
 
 These two are global parameters, in core they're configured in General Settings:

mail_environment_google_gmail/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "Mail configuration with server_environment for Google Gmail",
     "summary": "Configure Gmail mail servers with server_environment_files",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.1.0",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "maintainers": ["ivantodorovich"],
     "website": "https://github.com/OCA/server-env",

mail_environment_google_gmail/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Mail configuration with server_environment for Google Gmail</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,17 +360,22 @@
 </style>
 </head>
 <body>
-<div class="document" id="mail-configuration-with-server-environment-for-google-gmail">
-<h1 class="title">Mail configuration with server_environment for Google Gmail</h1>
+<div class="document">
 
+
+<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="mail-configuration-with-server-environment-for-google-gmail">
+<h1>Mail configuration with server_environment for Google Gmail</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:1afdf6a75ab850d6e8e117f7ddfd2834abba154c008f377cd2e00a0a2a96a133
+!! source digest: sha256:55658f8bb3f58ca5d9dc048c833a475931decfa1f0a1aafd45f9ca99a49b084b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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-env/tree/16.0/mail_environment_google_gmail"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-16-0/server-env-16-0-mail_environment_google_gmail"><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-env&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module allows to configure Gmail outgoing servers with server-env.</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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/16.0/mail_environment_google_gmail"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-16-0/server-env-16-0-mail_environment_google_gmail"><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-env&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module allows to configure Gmail Authentication for email servers with server-env.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -385,7 +390,7 @@ <h1 class="title">Mail configuration with server_environment for Google Gmail</h
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>Example of config file</p>
 <pre class="literal-block">
 [ir.config_parameter]
@@ -397,7 +402,16 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 smtp_port = 587
 smtp_user = example&#64;gmail.com
 smtp_encryption = starttls
-use_google_gmail_service = True
+smtp_authentication = gmail
+google_gmail_authorization_code = YOUR_ACCOUNT_AUTH_CODE
+google_gmail_refresh_token = YOUR_REFRESH_TOKEN
+
+[incoming_mail.gmail_imap_server]
+server_type = gmail
+smtp_host = imap.gmail.com
+smtp_port = 993
+user = example&#64;gmail.com
+is_ssl = 1
 google_gmail_authorization_code = YOUR_ACCOUNT_AUTH_CODE
 google_gmail_refresh_token = YOUR_REFRESH_TOKEN
 </pre>
@@ -415,23 +429,23 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-env/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-env/issues/new?body=module:%20mail_environment_google_gmail%0Aversion:%2016.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">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Camptocamp</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul>
 <li><p class="first"><a class="reference external" href="https://www.camptocamp.com">Camptocamp</a></p>
 <blockquote>
@@ -443,7 +457,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <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" />
@@ -458,5 +472,6 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>