diff --git a/account_payment_order_notification/i18n/account_payment_order_notification.pot b/account_payment_order_notification/i18n/account_payment_order_notification.pot
index 715c68a4f..aa2884005 100644
--- a/account_payment_order_notification/i18n/account_payment_order_notification.pot
+++ b/account_payment_order_notification/i18n/account_payment_order_notification.pot
@@ -4,10 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-14 07:51+0000\n"
-"PO-Revision-Date: 2022-12-14 07:51+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,43 +16,50 @@ msgstr ""
 #. module: account_payment_order_notification
 #: model:mail.template,body_html:account_payment_order_notification.email_account_payment_order_notification
 msgid ""
-"\n"
 "<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-"    <p>Hello ${object.partner_id.name or ''},</p>\n"
-"    % if object.order_id.payment_type == 'inbound':\n"
-"        <p>A debit order including at least one of your invoices has been processed and sent to the bank.</p>\n"
-"    % else:\n"
-"        <p>A payment order including at least one of your invoices has been processed and sent to the bank.</p>\n"
-"    % endif\n"
-"    <p>It includes the following transactions:</p>\n"
-"    <table>\n"
-"        <thead>\n"
-"            <tr style=\"height: 15px; background-color: #d8d8d8;font-size: 13px;font-weight:bold;\" align=\"center\" valign=\"middle\">\n"
-"                <td>Number</td>\n"
-"                <td>Date</td>\n"
-"                <td>Amount</td>\n"
-"            </tr>\n"
-"        </thead>\n"
-"        <tbody>\n"
-"        % for payment_line in object.payment_line_ids:\n"
-"            <tr>\n"
-"                <td>${payment_line.communication}</td>\n"
-"                <td>${format_date(payment_line.date)}</td>\n"
-"                <td>${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>\n"
-"            </tr>\n"
-"        % endfor\n"
-"        </tbody>\n"
-"    </table>\n"
-"    <p>Do not hesitate to contact us if you have any questions.</p>\n"
-"</div>\n"
-"    "
-msgstr ""
-
-#. module: account_payment_order_notification
-#: model:mail.template,subject:account_payment_order_notification.email_account_payment_order_notification
-msgid ""
-"${object.company_id.name} Payment Order (Ref ${object.order_id.name or "
-"'n/a'})"
+"                <p>Hello <t t-out=\"object.partner_id.name or ''\">Brandon Freeman</t>,</p>\n"
+"                <t t-if=\"object.order_id.payment_type == 'inbound'\">\n"
+"                    <p>A debit order including at least one of your invoices has been processed and\n"
+"                        sent to the bank.</p>\n"
+"                </t>\n"
+"                <t t-else=\"\">\n"
+"                    <p>A payment order including at least one of your invoices has been processed\n"
+"                        and sent to the bank.</p>\n"
+"                </t>\n"
+"                <p>It includes the following transactions:</p>\n"
+"                <table class=\"table table-striped\">\n"
+"                    <thead>\n"
+"                        <tr style=\"height: 15px; background-color: #d8d8d8;font-size: 13px;font-weight:bold;\" align=\"center\" valign=\"middle\">\n"
+"                            <td>Number</td>\n"
+"                            <td>Date</td>\n"
+"                            <td>Amount</td>\n"
+"                        </tr>\n"
+"                    </thead>\n"
+"                    <tbody>\n"
+"                        <t t-foreach=\"object.payment_line_ids\" t-as=\"payment_line\">\n"
+"                            <tr>\n"
+"                                <td>\n"
+"                                    <t t-if=\"payment_line.move_line_id.move_id.move_type in ('in_invoice', 'in_refund') and payment_line.move_line_id.move_id.ref\">\n"
+"                                        <t t-out=\"payment_line.move_line_id.move_id.ref or ''\">PY000</t>\n"
+"                                    </t>\n"
+"                                    <t t-else=\"\">\n"
+"                                        <t t-out=\"payment_line.communication or ''\">Email</t>\n"
+"                                    </t>\n"
+"                                </td>\n"
+"                                <td>\n"
+"                                    <t t-out=\"format_date(payment_line.date)\"></t>\n"
+"                                </td>\n"
+"                                <td>\n"
+"                                    <t t-out=\"format_amount(payment_line.amount_currency, payment_line.currency_id) or ''\">$\n"
+"                                        1000</t>\n"
+"                                </td>\n"
+"                            </tr>\n"
+"                        </t>\n"
+"                    </tbody>\n"
+"                </table>\n"
+"                <p>Do not hesitate to contact us if you have any questions.</p>\n"
+"            </div>\n"
+"        "
 msgstr ""
 
 #. module: account_payment_order_notification
@@ -97,7 +102,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order__display_name
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__display_name
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification__display_name
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification_line__display_name
@@ -110,6 +114,7 @@ msgid "Email"
 msgstr ""
 
 #. module: account_payment_order_notification
+#. odoo-python
 #: code:addons/account_payment_order_notification/models/account_payment_order.py:0
 #, python-format
 msgid "Email has been sent to the following partners: %s"
@@ -120,11 +125,6 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
 #. module: account_payment_order_notification
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__message_partner_ids
 msgid "Followers (Partners)"
@@ -136,7 +136,11 @@ msgid "Group By"
 msgstr ""
 
 #. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order__id
+#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: account_payment_order_notification
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__id
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification__id
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification_line__id
@@ -145,7 +149,6 @@ msgstr ""
 
 #. module: account_payment_order_notification
 #: model:ir.model.fields,help:account_payment_order_notification.field_account_payment_order_notification__message_needaction
-#: model:ir.model.fields,help:account_payment_order_notification.field_account_payment_order_notification__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
@@ -161,7 +164,6 @@ msgid "Is Follower"
 msgstr ""
 
 #. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order____last_update
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification____last_update
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification____last_update
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification_line____last_update
@@ -238,11 +240,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: account_payment_order_notification
-#: model:ir.model.fields,help:account_payment_order_notification.field_account_payment_order_notification__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: account_payment_order_notification
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__order_id
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_wizard_account_payment_order_notification__order_id
@@ -276,6 +273,11 @@ msgstr ""
 msgid "Payment Order Notification"
 msgstr ""
 
+#. module: account_payment_order_notification
+#: model:mail.template,name:account_payment_order_notification.email_account_payment_order_notification
+msgid "Payment Order Notification: Send by email"
+msgstr ""
+
 #. module: account_payment_order_notification
 #: model:ir.actions.act_window,name:account_payment_order_notification.account_payment_order_notification_action
 msgid "Payment Order Notifications"
@@ -306,16 +308,6 @@ msgstr ""
 msgid "Transactions"
 msgstr ""
 
-#. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: account_payment_order_notification
 #: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__website_message_ids
 msgid "Website Messages"
@@ -335,3 +327,10 @@ msgstr ""
 #: model:ir.model,name:account_payment_order_notification.model_wizard_account_payment_order_notification_line
 msgid "Wizard Account Payment Order Notification Line"
 msgstr ""
+
+#. module: account_payment_order_notification
+#: model:mail.template,subject:account_payment_order_notification.email_account_payment_order_notification
+msgid ""
+"{{ object.company_id.name }} Payment Order (Ref {{ object.order_id.name or "
+"'n/a' }})"
+msgstr ""