Merge PR #2852 into 16.0

Signed-off-by legalsylvain
OCA · Feb 20, 2024 · 136a2a1 · 136a2a1
2 parents 5d16ec7 + 0b3814c
commit 136a2a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/database_cleanup/README.rst b/database_cleanup/README.rst
@@ -7,7 +7,7 @@ Database cleanup
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5b20da6ec90ee20d79a80f6d9e04bb104579f7a3ff86270b9f3221c1fdb05d38
+   !! source digest: sha256:27fddd3070979c5e7dba98ef343e7f5000864fe05325b64e9766e1dd9cab21f3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -81,6 +81,7 @@ Contributors
 * Stefan Rijnhart <stefan@opener.amsterdam>
 * Holger Brunn <hbrunn@therp.nl>
 * Stéphane Mangin <stephane.mangin@camptocamp.com>
+* Mark Schuit <mark@gig.solutions>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/database_cleanup/models/purge_columns.py b/database_cleanup/models/purge_columns.py
@@ -68,7 +68,8 @@ class CleanupPurgeWizardColumn(models.TransientModel):
     # Format: {table: [fields]}
     blacklist = {
         "wkf_instance": ["uid"],  # lp:1277899
-        "res_users": ["password", "password_crypt"],
+        "res_users": ["password", "password_crypt", "totp_secret"],
+        "res_partner": ["signup_token"],
     }
 
     @api.model

diff --git a/database_cleanup/readme/CONTRIBUTORS.rst b/database_cleanup/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Stefan Rijnhart <stefan@opener.amsterdam>
 * Holger Brunn <hbrunn@therp.nl>
 * Stéphane Mangin <stephane.mangin@camptocamp.com>
+* Mark Schuit <mark@gig.solutions>
diff --git a/database_cleanup/static/description/index.html b/database_cleanup/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -366,7 +367,7 @@ <h1 class="title">Database cleanup</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:5b20da6ec90ee20d79a80f6d9e04bb104579f7a3ff86270b9f3221c1fdb05d38
+!! source digest: sha256:27fddd3070979c5e7dba98ef343e7f5000864fe05325b64e9766e1dd9cab21f3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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-tools/tree/16.0/database_cleanup"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-16-0/server-tools-16-0-database_cleanup"><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-tools&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>Clean your Odoo database from remnants of modules, models, columns and
@@ -422,6 +423,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.amsterdam">stefan&#64;opener.amsterdam</a>&gt;</li>
 <li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
 <li>Stéphane Mangin &lt;<a class="reference external" href="mailto:stephane.mangin&#64;camptocamp.com">stephane.mangin&#64;camptocamp.com</a>&gt;</li>
+<li>Mark Schuit &lt;<a class="reference external" href="mailto:mark&#64;gig.solutions">mark&#64;gig.solutions</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">