Merge PR #1045 into 14.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-02-23 08:17:07 +00:00
5 changed files with 27 additions and 62 deletions

View File

@@ -33,7 +33,11 @@
<tbody>
% for payment_line in object.payment_line_ids:
<tr>
<td>${payment_line.communication}</td>
% if payment_line.move_line_id.move_id.move_type in ("in_invoice", "in_refund") and payment_line.move_line_id.move_id.ref:
<td>${payment_line.move_line_id.move_id.ref}</td>
% else:
<td>${payment_line.communication}</td>
% endif
<td>${payment_line.date}</td>
<td>${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>
</tr>

View File

@@ -6,6 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-02-22 15:35+0000\n"
"PO-Revision-Date: 2023-02-22 15:35+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,7 +38,11 @@ msgid ""
" <tbody>\n"
" % for payment_line in object.payment_line_ids:\n"
" <tr>\n"
" <td>${payment_line.communication}</td>\n"
" % 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"
" <td>${payment_line.move_line_id.move_id.ref}</td>\n"
" % else:\n"
" <td>${payment_line.communication}</td>\n"
" % endif\n"
" <td>${payment_line.date}</td>\n"
" <td>${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>\n"
" </tr>\n"

View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-14 07:51+0000\n"
"PO-Revision-Date: 2022-12-14 08:54+0100\n"
"POT-Creation-Date: 2023-02-22 15:35+0000\n"
"PO-Revision-Date: 2023-02-22 16:37+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: es\n"
@@ -44,7 +44,12 @@ msgid ""
" <tbody>\n"
" % for payment_line in object.payment_line_ids:\n"
" <tr>\n"
" <td>${payment_line.communication}</td>\n"
" % 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"
" <td>${payment_line.move_line_id.move_id.ref}</td>\n"
" % else:\n"
" <td>${payment_line.communication}</td>\n"
" % endif\n"
" <td>${payment_line.date}</td>\n"
" <td>${format_amount(payment_line.amount_currency, "
"payment_line.currency_id)}</td>\n"
@@ -80,7 +85,12 @@ msgstr ""
" <tbody>\n"
" % for payment_line in object.payment_line_ids:\n"
" <tr>\n"
" <td>${payment_line.communication}</td>\n"
" % 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"
" <td>${payment_line.move_line_id.move_id.ref}</td>\n"
" % else:\n"
" <td>${payment_line.communication}</td>\n"
" % endif\n"
" <td>${payment_line.date}</td>\n"
" <td>${format_amount(payment_line.amount_currency, "
"payment_line.currency_id)}</td>\n"
@@ -91,7 +101,7 @@ msgstr ""
" <p>No dude en ponerse en contacto con nosotros si tiene alguna pregunta."
"</p>\n"
"</div>\n"
" "
" "
#. module: account_payment_order_notification
#: model:mail.template,subject:account_payment_order_notification.email_account_payment_order_notification

View File

@@ -1,37 +0,0 @@
<?xml version='1.0' encoding='utf-8' ?>
<odoo>
<record id="email_account_payment_order_notification" model="ir.rule">
<field
name="body_html"
><![CDATA[
<div style="font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
<p>Hello ${object.partner_id.name or ''},</p>
% if object.order_id.payment_type == 'inbound':
<p>A debit order including at least one of your invoices has been processed and sent to the bank.</p>
% else:
<p>A payment order including at least one of your invoices has been processed and sent to the bank.</p>
% endif
<p>It includes the following transactions:</p>
<table>
<thead>
<tr style="height: 15px; background-color: #d8d8d8;font-size: 13px;font-weight:bold;" align="center" valign="middle">
<td>Number</td>
<td>Date</td>
<td>Amount</td>
</tr>
</thead>
<tbody>
% for payment_line in object.payment_line_ids:
<tr>
<td>${payment_line.communication}</td>
<td>${payment_line.date}</td>
<td>${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>
</tr>
% endfor
</tbody>
</table>
<p>Do not hesitate to contact us if you have any questions.</p>
</div>
]]></field>
</record>
</odoo>

View File

@@ -1,18 +0,0 @@
# Copyright 2022 Tecnativa - Víctor Martínez
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from openupgradelib import openupgrade
@openupgrade.migrate()
def migrate(env, version):
openupgrade.load_data(
env.cr,
"account_payment_order_notification",
"migrations/14.0.1.2.0/noupdate_changes.xml",
)
openupgrade.delete_record_translations(
env.cr,
"account_payment_order_notification",
["email_account_payment_order_notification"],
)