[FIX] inherit problems with planning enterprise module

With website_odoo_debranding installed it was not possible to install enterprise planning. Planning relies on <t t-call="web.brand_promotion_message"> sections which was removed with replacing the o_brand_promotion. [UPD] Update website_odoo_debranding.pot [BOT] post-merge updates
OCA · Oct 22, 2024 · 03fcdd2 · 03fcdd2
1 parent d2c21fd
commit 03fcdd2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/website_odoo_debranding/README.rst b/website_odoo_debranding/README.rst
@@ -7,7 +7,7 @@ Remove Odoo Branding from Website
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3275e93b6507f51f2acc3ec36d2570e42e2358e799e2df634aad5e89fd21d8fc
+   !! source digest: sha256:b77bb9badf3de8cdfa3c273a437992e365d3c83e60843c27e117674b8f2cbbe9
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/website_odoo_debranding/i18n/website_odoo_debranding.pot b/website_odoo_debranding/i18n/website_odoo_debranding.pot
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/website_odoo_debranding/static/description/index.html b/website_odoo_debranding/static/description/index.html
@@ -1,4 +1,3 @@
-<?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>
@@ -367,7 +366,7 @@ <h1 class="title">Remove Odoo Branding from Website</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:3275e93b6507f51f2acc3ec36d2570e42e2358e799e2df634aad5e89fd21d8fc
+!! source digest: sha256:b77bb9badf3de8cdfa3c273a437992e365d3c83e60843c27e117674b8f2cbbe9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/website/tree/17.0/website_odoo_debranding"><img alt="OCA/website" src="https://img.shields.io/badge/github-OCA%2Fwebsite-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/website-17-0/website-17-0-website_odoo_debranding"><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/website&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module remove Odoo branding on website:</p>

diff --git a/website_odoo_debranding/templates/disable_odoo.xml b/website_odoo_debranding/templates/disable_odoo.xml
@@ -3,13 +3,16 @@
     <!-- Remove "Create a free website with Odoo" -->
     <template
         id="layout_footer_copyright"
-        inherit_id="website.brand_promotion"
+        inherit_id="web.brand_promotion_message"
         customize_show="True"
         name="Remove Odoo Promotional Link"
         priority="999"
     >
-        <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
-            <div class="o_brand_promotion" />
+        <xpath expr="//t[@t-set='final_message']" position="replace">
+            <t t-set="final_message" />
+        </xpath>
+        <xpath expr="//t[@t-out]" position="replace">
+            <t t-out="final_message" />
         </xpath>
     </template>
 </odoo>