diff --git a/base_comment_template/README.rst b/base_comment_template/README.rst
index a1da38ed15..2ff8f880ab 100644
--- a/base_comment_template/README.rst
+++ b/base_comment_template/README.rst
@@ -2,10 +2,13 @@
 Base Comments Templates
 =======================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4966991ab1adb1982184b91796980b2c34d83e03680619bd013630fc774110eb
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Base Comments Templates
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-base_comment_template
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/143/16.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Add a new mixin class to define templates of comments to print on documents.
 The comment templates can be defined like make templates, so you can use variables from linked models.
@@ -39,14 +42,14 @@ It has a priority field (smaller number = higher priority)
 
 In existing reports, if you add this line will get the comment template if you created one like
 
-* <span t-raw="o.get_comment_template('position',company_id=o.company_id, partner_id=o.parnter_id )"/> ( or without any parameter)
+* <span t-out="o.get_comment_template('position',company_id=o.company_id, partner_id=o.parnter_id )"/> ( or without any parameter)
 
 
 This module is the base module for following modules:
 
 * sale_comment_template
 * purchase_comment_template
-* invoice_comment_template
+* account_comment_template
 * stock_picking_comment_template
 
 **Table of contents**
@@ -88,13 +91,13 @@ The template is a html field which will be rendered just like a mail template, s
 Change the report related to the model from configuration and add a statement like:
 
 <t t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')" t-as="comment_template_top">
-  <div t-raw="o.render_comment(comment_template_top)" />
+  <div t-out="o.render_comment(comment_template_top)" />
 
 </t>
 
 
 <t t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'after_lines')" t-as="comment_template_bottom">
-    <div t-raw="o.render_comment(comment_template_bottom)" />
+    <div t-out="o.render_comment(comment_template_bottom)" />
 
 </t>
 
@@ -110,7 +113,7 @@ mail.render.mixin with parameters:
 so you could use it :
 
 <t t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')" t-as="comment_template_top">
-    <div t-raw="o.render_comment(comment_template_top, engine='qweb', add_context={my dict}, postprocess=True)" />
+    <div t-out="o.render_comment(comment_template_top, engine='qweb', add_context={my dict}, postprocess=True)" />
 
 </t>
 
@@ -119,7 +122,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/reporting-engine/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
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/OCA/reporting-engine/issues/new?body=module:%20base_comment_template%0Aversion:%2016.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.
diff --git a/base_comment_template/readme/DESCRIPTION.rst b/base_comment_template/readme/DESCRIPTION.rst
index 6909ad5d58..bd616e27f9 100644
--- a/base_comment_template/readme/DESCRIPTION.rst
+++ b/base_comment_template/readme/DESCRIPTION.rst
@@ -12,12 +12,12 @@ It has a priority field (smaller number = higher priority)
 
 In existing reports, if you add this line will get the comment template if you created one like
 
-* <span t-raw="o.get_comment_template('position',company_id=o.company_id, partner_id=o.parnter_id )"/> ( or without any parameter)
+* <span t-out="o.get_comment_template('position',company_id=o.company_id, partner_id=o.parnter_id )"/> ( or without any parameter)
 
 
 This module is the base module for following modules:
 
 * sale_comment_template
 * purchase_comment_template
-* invoice_comment_template
+* account_comment_template
 * stock_picking_comment_template
diff --git a/base_comment_template/readme/USAGE.rst b/base_comment_template/readme/USAGE.rst
index 8800f07413..30343d7ae3 100644
--- a/base_comment_template/readme/USAGE.rst
+++ b/base_comment_template/readme/USAGE.rst
@@ -17,13 +17,13 @@ The template is a html field which will be rendered just like a mail template, s
 Change the report related to the model from configuration and add a statement like:
 
 <t t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')" t-as="comment_template_top">
-  <div t-raw="o.render_comment(comment_template_top)" />
+  <div t-out="o.render_comment(comment_template_top)" />
 
 </t>
 
 
 <t t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'after_lines')" t-as="comment_template_bottom">
-    <div t-raw="o.render_comment(comment_template_bottom)" />
+    <div t-out="o.render_comment(comment_template_bottom)" />
 
 </t>
 
@@ -39,6 +39,6 @@ mail.render.mixin with parameters:
 so you could use it :
 
 <t t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')" t-as="comment_template_top">
-    <div t-raw="o.render_comment(comment_template_top, engine='qweb', add_context={my dict}, postprocess=True)" />
+    <div t-out="o.render_comment(comment_template_top, engine='qweb', add_context={my dict}, postprocess=True)" />
 
 </t>
diff --git a/base_comment_template/static/description/index.html b/base_comment_template/static/description/index.html
index b93d40de83..c9190077c2 100644
--- a/base_comment_template/static/description/index.html
+++ b/base_comment_template/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Base Comments Templates</title>
 <style type="text/css">
 
@@ -366,8 +366,10 @@ <h1 class="title">Base Comments Templates</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4966991ab1adb1982184b91796980b2c34d83e03680619bd013630fc774110eb
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/reporting-engine/tree/16.0/base_comment_template"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-base_comment_template"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/143/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/reporting-engine/tree/16.0/base_comment_template"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-base_comment_template"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&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>Add a new mixin class to define templates of comments to print on documents.
 The comment templates can be defined like make templates, so you can use variables from linked models.</p>
 <p>Two positions are available for the comments:</p>
@@ -380,13 +382,13 @@ <h1 class="title">Base Comments Templates</h1>
 It has a priority field (smaller number = higher priority)</p>
 <p>In existing reports, if you add this line will get the comment template if you created one like</p>
 <ul class="simple">
-<li>&lt;span t-raw=”o.get_comment_template(‘position’,company_id=o.company_id, partner_id=o.parnter_id )”/&gt; ( or without any parameter)</li>
+<li>&lt;span t-out=”o.get_comment_template(‘position’,company_id=o.company_id, partner_id=o.parnter_id )”/&gt; ( or without any parameter)</li>
 </ul>
 <p>This module is the base module for following modules:</p>
 <ul class="simple">
 <li>sale_comment_template</li>
 <li>purchase_comment_template</li>
-<li>invoice_comment_template</li>
+<li>account_comment_template</li>
 <li>stock_picking_comment_template</li>
 </ul>
 <p><strong>Table of contents</strong></p>
@@ -435,12 +437,12 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 <p>Change the report related to the model from configuration and add a statement like:</p>
 <dl class="docutils">
 <dt>&lt;t t-foreach=”o.comment_template_ids.filtered(lambda x: x.position == ‘before_lines’)” t-as=”comment_template_top”&gt;</dt>
-<dd>&lt;div t-raw=”o.render_comment(comment_template_top)” /&gt;</dd>
+<dd>&lt;div t-out=”o.render_comment(comment_template_top)” /&gt;</dd>
 </dl>
 <p>&lt;/t&gt;</p>
 <dl class="docutils">
 <dt>&lt;t t-foreach=”o.comment_template_ids.filtered(lambda x: x.position == ‘after_lines’)” t-as=”comment_template_bottom”&gt;</dt>
-<dd>&lt;div t-raw=”o.render_comment(comment_template_bottom)” /&gt;</dd>
+<dd>&lt;div t-out=”o.render_comment(comment_template_bottom)” /&gt;</dd>
 </dl>
 <p>&lt;/t&gt;</p>
 <p>You should always use t-if since the method returns False if no template is found.</p>
@@ -454,7 +456,7 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 <p>so you could use it :</p>
 <dl class="docutils">
 <dt>&lt;t t-foreach=”o.comment_template_ids.filtered(lambda x: x.position == ‘before_lines’)” t-as=”comment_template_top”&gt;</dt>
-<dd>&lt;div t-raw=”o.render_comment(comment_template_top, engine=’qweb’, add_context={my dict}, postprocess=True)” /&gt;</dd>
+<dd>&lt;div t-out=”o.render_comment(comment_template_top, engine=’qweb’, add_context={my dict}, postprocess=True)” /&gt;</dd>
 </dl>
 <p>&lt;/t&gt;</p>
 </div>
@@ -462,7 +464,7 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 <h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/reporting-engine/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 smashing it by providing a detailed and welcomed
+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/reporting-engine/issues/new?body=module:%20base_comment_template%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>