Merge PR #1332 into 16.0

Signed-off-by pedrobaeza
OCA · Mar 19, 2024 · 3225aec · 3225aec
2 parents d0d76c1 + b8848c5
commit 3225aec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/mail_tracking/README.rst b/mail_tracking/README.rst
@@ -7,7 +7,7 @@ Email tracking
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:7d0822f2344e54b410baa9c231fbd045c780f5d96da47d84e3b645ee12e3df55
+   !! source digest: sha256:900b65e7ae35d363f6d5884b49a0a63e14764e2a1cf34e7ccedb70b9ee2ebda1
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -44,7 +44,7 @@ If you're using a multi-database installation (with or without dbfilter option)
 where /web/databse/selector returns a list of more than one database, then
 you need to add ``mail_tracking`` addon to wide load addons list
 (by default, only ``web`` addon), setting ``--load`` option.
-For example, ``--load=web,mail_tracking``
+For example, ``--load=web,mail,mail_tracking``
 
 Configuration
 =============

diff --git a/mail_tracking/readme/INSTALL.rst b/mail_tracking/readme/INSTALL.rst
@@ -2,4 +2,4 @@ If you're using a multi-database installation (with or without dbfilter option)
 where /web/databse/selector returns a list of more than one database, then
 you need to add ``mail_tracking`` addon to wide load addons list
 (by default, only ``web`` addon), setting ``--load`` option.
-For example, ``--load=web,mail_tracking``
+For example, ``--load=web,mail,mail_tracking``
diff --git a/mail_tracking/static/description/index.html b/mail_tracking/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">Email tracking</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7d0822f2344e54b410baa9c231fbd045c780f5d96da47d84e3b645ee12e3df55
+!! source digest: sha256:900b65e7ae35d363f6d5884b49a0a63e14764e2a1cf34e7ccedb70b9ee2ebda1
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/social/tree/16.0/mail_tracking"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_tracking"><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/social&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 shows email notification tracking status for any messages in
@@ -398,7 +399,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 where /web/databse/selector returns a list of more than one database, then
 you need to add <tt class="docutils literal">mail_tracking</tt> addon to wide load addons list
 (by default, only <tt class="docutils literal">web</tt> addon), setting <tt class="docutils literal"><span class="pre">--load</span></tt> option.
-For example, <tt class="docutils literal"><span class="pre">--load=web,mail_tracking</span></tt></p>
+For example, <tt class="docutils literal"><span class="pre">--load=web,mail,mail_tracking</span></tt></p>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>

diff --git a/mail_tracking/tests/test_mail_tracking.py b/mail_tracking/tests/test_mail_tracking.py
@@ -439,7 +439,7 @@ def mock_error_function(*args, **kwargs):
             controller.mail_tracking_open(db, tracking.id, False)
 
     def test_db_env_no_cr(self):
-        http.request.cr = None
+        http.request.env = None
         db = self.env.cr.dbname
         controller = MailTrackingController()
         # Cast Cursor to Mock object to avoid raising 'Cursor not closed explicitly' log