Merge PR #262 into 18.0

OCA-git-bot · OCA-git-bot · commit e7009e4a07a2 · 2026-06-29T15:42:44.000Z
Signed-off-by gurneyalex
diff --git a/mail_environment/README.rst b/mail_environment/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
-
 ==========================================
 Mail configuration with server_environment
 ==========================================
@@ -17,7 +13,7 @@ Mail configuration with server_environment
 .. |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--env-lightgray.png?logo=github
@@ -103,8 +99,8 @@ file.
 Known issues / Roadmap
 ======================
 
-- Due to the special nature of this addon, you cannot test it on the OCA
-  runbot.
+-  Due to the special nature of this addon, you cannot test it on the
+   OCA runbot.
 
 Bug Tracker
 ===========
@@ -127,12 +123,12 @@ Authors
 Contributors
 ------------
 
-- Nicolas Bessi <nicolas.bessi@camptocamp.com>
-- Yannick Vaucher <yannick.vaucher@camptocamp.com>
-- Guewen Baconnier <guewen.baconnier@camptocamp.com>
-- Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com>
-- Holger Brunn <hbrunn@therp.nl>
-- Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
+-  Nicolas Bessi <nicolas.bessi@camptocamp.com>
+-  Yannick Vaucher <yannick.vaucher@camptocamp.com>
+-  Guewen Baconnier <guewen.baconnier@camptocamp.com>
+-  Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com>
+-  Holger Brunn <hbrunn@therp.nl>
+-  Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
 
 Maintainers
 -----------
diff --git a/mail_environment/__init__.py b/mail_environment/__init__.py
@@ -1 +1,2 @@
 from . import models
+from .hooks import uninstall_hook
diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py
@@ -10,4 +10,5 @@
     "license": "AGPL-3",
     "website": "https://github.com/OCA/server-env",
     "depends": ["mail", "server_environment"],
+    "uninstall_hook": "uninstall_hook",
 }
diff --git a/mail_environment/hooks.py b/mail_environment/hooks.py
@@ -0,0 +1,43 @@
+# Copyright 2026 Camptocamp (https://www.camptocamp.com)
+from odoo.addons.server_environment.uninstall import restore_env_managed_columns
+
+
+def uninstall_hook(env):
+    """Restore database columns that server.env.mixin dropped for mail models.
+
+    When mail_environment is uninstalled, ``ir.mail_server`` and
+    ``fetchmail.server`` would be left without the columns that the ORM
+    dropped when this addon was first installed. This hook recreates those
+    columns and repopulates them with the current effective values so the
+    database remains usable after removal.
+
+    After uninstalling this module, an Odoo server restart is required.
+    Field definitions referencing the compute methods of the mixin persist in memory
+    until the Python process restarts.
+    """
+    restore_env_managed_columns(
+        env,
+        "ir.mail_server",
+        [
+            "smtp_host",
+            "smtp_port",
+            "smtp_user",
+            "smtp_pass",
+            "smtp_encryption",
+            "smtp_authentication",
+        ],
+    )
+    restore_env_managed_columns(
+        env,
+        "fetchmail.server",
+        [
+            "server",
+            "port",
+            "server_type",
+            "user",
+            "password",
+            "is_ssl",
+            "attach",
+            "original",
+        ],
+    )
diff --git a/mail_environment/static/description/index.html b/mail_environment/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>README.rst</title>
+<title>Mail configuration with server_environment</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="mail-configuration-with-server-environment">
+<h1 class="title">Mail configuration with server_environment</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="mail-configuration-with-server-environment">
-<h1>Mail configuration with server_environment</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:b27d3ac30fd7cb59d6eed6d0f910db100f70a145e028b2096015bcd7022a33b3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/18.0/mail_environment"><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-18-0/server-env-18-0-mail_environment"><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=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-env/tree/18.0/mail_environment"><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-18-0/server-env-18-0-mail_environment"><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=18.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 the incoming and outgoing mail servers
 using the server_environment mechanism: you can then have different mail
 servers for the production and the test environment.</p>
@@ -395,12 +390,12 @@ <h1>Mail configuration with server_environment</h1>
 </ul>
 </div>
 <div class="section" id="installation">
-<h2><a class="toc-backref" href="#toc-entry-1">Installation</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 <p>To install this module, you need to have the server_environment module
 installed and properly configured.</p>
 </div>
 <div class="section" id="configuration">
-<h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 <p>With this module installed, the incoming and outgoing mail servers are
 configured in the server_environment_files module (which is a module you
 should provide, see the documentation of server_environment for more
@@ -440,36 +435,36 @@ <h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
 mail server with the field name set to “odoo_pop_mail1”.</p>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-3">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
 <p>Once configured, Odoo will read the mail servers values from the
 configuration file related to each environment defined in the main Odoo
 file.</p>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h1>
 <ul class="simple">
-<li>Due to the special nature of this addon, you cannot test it on the OCA
-runbot.</li>
+<li>Due to the special nature of this addon, you cannot test it on the
+OCA runbot.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
 <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%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-6">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
 <ul class="simple">
 <li>Camptocamp</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <ul class="simple">
 <li>Nicolas Bessi &lt;<a class="reference external" href="mailto:nicolas.bessi&#64;camptocamp.com">nicolas.bessi&#64;camptocamp.com</a>&gt;</li>
 <li>Yannick Vaucher &lt;<a class="reference external" href="mailto:yannick.vaucher&#64;camptocamp.com">yannick.vaucher&#64;camptocamp.com</a>&gt;</li>
@@ -480,7 +475,7 @@ <h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-9">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" />
@@ -493,6 +488,5 @@ <h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>
diff --git a/mail_environment/tests/test_mail_environment.py b/mail_environment/tests/test_mail_environment.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`from . import models`
	`2`	`+from .hooks import uninstall_hook`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@`
`10`	`10`	`"license": "AGPL-3",`
`11`	`11`	`"website": "https://github.com/OCA/server-env",`
`12`	`12`	`"depends": ["mail", "server_environment"],`
	`13`	`+ "uninstall_hook": "uninstall_hook",`
`13`	`14`	`}`