From e2429999fed712d54f4ecfac5a5caac4617c30f7 Mon Sep 17 00:00:00 2001
From: MAHAMADASIF ANSARI <maan@odoo.com>
Date: Fri, 6 May 2022 10:55:12 +0000
Subject: [PATCH] [FIX] calendar: remove `description_to_html_lines` method
 reference

With commit that replaced most of the text fields to HTML fields (see
commit[1]), the `description_to_html_lines` method was removed from
`calendar.event` model and linked templates. But another commit[2]
merged afterwards introduced a mail template that used this method,
due to which the rendering used to crashed.

This commit adapts the template and thus fixes the crash while
rendering the template.

commit[1] - https://github.com/odoo/odoo/commit/cb4f597410bcb08208ee277144d755bef8b6d688
commit[2] - https://github.com/odoo/odoo/commit/40fd44f618cb54d8c75b8c090cc36655316aa825

task-2821957

closes odoo/odoo#91280

X-original-commit: 71b9e36f5c5e36f13f26bf74038ddb736d5e25de
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/calendar/data/mail_template_data.xml | 13 ++-----------
 addons/calendar/i18n/calendar.pot           | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/addons/calendar/data/mail_template_data.xml b/addons/calendar/data/mail_template_data.xml
index cb390fb6e94..4111503b309 100644
--- a/addons/calendar/data/mail_template_data.xml
+++ b/addons/calendar/data/mail_template_data.xml
@@ -402,18 +402,9 @@
                         <strong>Details of the event</strong>
                     </p>
                     <ul>
-                        <t t-if="not is_online and object.display_description">
-                            <li>Description: <t t-out="object.description or ''" /></li>
-                        </t>
-                        <t t-elif="is_online and object.description">
-                            <t t-set="splitted_description" t-value="object.description_to_html_lines()" />
+                        <t t-if="not is_html_empty(object.description)">
                             <li>Description:
-                                <ul>
-                                    <t t-foreach="splitted_description" t-as="description_line">
-                                        <li t-out="description_line or ''"></li>
-                                    </t>
-                                </ul>
-                            </li>
+                            <t t-out="object.description">Internal meeting for discussion for new pricing for product and services.</t></li>
                         </t>
                         <t t-if="object.videocall_location">
                             <li>Meeting URL:
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index e124f927e90..955025f84ed 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -210,18 +210,9 @@ msgid ""
 "                        <strong>Details of the event</strong>\n"
 "                    </p>\n"
 "                    <ul>\n"
-"                        <t t-if=\"not is_online and object.display_description\">\n"
-"                            <li>Description: <t t-out=\"object.description or ''\"/></li>\n"
-"                        </t>\n"
-"                        <t t-elif=\"is_online and object.description\">\n"
-"                            <t t-set=\"splitted_description\" t-value=\"object.description_to_html_lines()\"/>\n"
+"                        <t t-if=\"not is_html_empty(object.description)\">\n"
 "                            <li>Description:\n"
-"                                <ul>\n"
-"                                    <t t-foreach=\"splitted_description\" t-as=\"description_line\">\n"
-"                                        <li t-out=\"description_line or ''\"/>\n"
-"                                    </t>\n"
-"                                </ul>\n"
-"                            </li>\n"
+"                            <t t-out=\"object.description\">Internal meeting for discussion for new pricing for product and services.</t></li>\n"
 "                        </t>\n"
 "                        <t t-if=\"object.videocall_location\">\n"
 "                            <li>Meeting URL:\n"