Skip to content

Commit

Permalink
Merge PR #1113 into 14.0
Browse files Browse the repository at this point in the history 
Signed-off-by pedrobaeza
  • Loading branch information
@OCA-git-bot
OCA-git-bot committed Jul 31, 2023
2 parents 5c1fc4b + 291b797 commit 7b32e60
Show file tree
Hide file tree
Showing 3 changed files with 177 additions and 155 deletions.
42 changes: 23 additions & 19 deletions account_payment_order_notification/data/mail_template_data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,40 @@
<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; ">
<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>
<table width="100%">
<tbody>
% for payment_line in object.payment_line_ids:
<tr>
% 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>${format_date(payment_line.date)}</td>
<td>${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>
<tr style="border-bottom:2px solid #dee2e6;">
<td style="width:40%;"><strong>Number</strong></td>
<td width="30%"><strong>Date</strong></td>
<td width="30%"><strong>Amount</strong></td>
</tr>
% endfor
</tbody>
</table>
% for payment_line in object.payment_line_ids:
<table width="100%">
<tbody>
<tr>
<td width="40%">
% if payment_line.move_line_id.move_id.move_type in ("in_invoice", "in_refund") and payment_line.move_line_id.move_id.ref:
${payment_line.move_line_id.move_id.ref}
% else:
${payment_line.communication}
% endif
</td>
<td width="30%">${format_date(payment_line.date)}</td>
<td width="30%">${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>
</tr>
</tbody>
</table>
% endfor
<p>Do not hesitate to contact us if you have any questions.</p>
</div>
]]></field>
Expand Down
178 changes: 91 additions & 87 deletions account_payment_order_notification/i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,90 +348,94 @@ msgstr ""
msgid "Wizard Account Payment Order Notification Line"
msgstr ""

#~ 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"
#~ " % 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"
#~ " % endfor\n"
#~ " </tbody>\n"
#~ " </table>\n"
#~ " <p>Do not hesitate to contact us if you have any questions.</p>\n"
#~ "</div>\n"
#~ " "
#~ msgstr ""
#~ "\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>Hola ${object.partner_id.name or ''},</p>\n"
#~ " % if object.order_id.payment_type == 'inbound':\n"
#~ " <p>Se ha procesado y enviado al banco una orden de débito que "
#~ "incluye al menos una de sus facturas.</p>\n"
#~ " % else:\n"
#~ " <p>Se ha procesado y enviado al banco una orden de pago que "
#~ "incluye al menos una de sus facturas.</p>\n"
#~ " % endif\n"
#~ " <p>Incluye las siguientes transacciones:</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>Número</td>\n"
#~ " <td>Fecha</td>\n"
#~ " <td>Importe</td>\n"
#~ " </tr>\n"
#~ " </thead>\n"
#~ " <tbody>\n"
#~ " % for payment_line in object.payment_line_ids:\n"
#~ " <tr>\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"
#~ " % endfor\n"
#~ " </tbody>\n"
#~ " </table>\n"
#~ " <p>No dude en ponerse en contacto con nosotros si tiene alguna "
#~ "pregunta.</p>\n"
#~ "</div>\n"
#~ " "
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 width=\"100%\" ;\"=\"\">\n"
" <tbody>\n"
" <tr style=\"border-bottom:2px solid #dee2e6;\">\n"
" <td style=\"width:40%;\"><strong>Number</strong></td>\n"
" <td width=\"30%\"><strong>Date</strong></td>\n"
" <td width=\"30%\"><strong>Amount</strong></td>\n"
" </tr>\n"
" </tbody>\n"
" </table>\n"
" % for payment_line in object.payment_line_ids: \n"
" <table width=\"100%\" ;=\"\">\n"
" <tbody>\n"
" <tr>\n"
" <td width=\"40%\">\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"
" ${payment_line.move_line_id.move_id.ref}\n"
" % else:\n"
" ${payment_line.communication}\n"
" % endif\n"
" </td>\n"
" <td width=\"30%\">${format_date(payment_line.date)}</"
"td>\n"
" <td width=\"30%\">${format_amount(payment_line."
"amount_currency, payment_line.currency_id)}</td>\n"
" </tr>\n"
" </tbody>\n"
" </table>\n"
" % endfor\n"
" <p>Do not hesitate to contact us if you have any questions.</p>\n"
"</div>\n"
" "
msgstr ""
"\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>Hola ${object.partner_id.name or ''},</p>\n"
" % if object.order_id.payment_type == 'inbound':\n"
" <p>Se ha procesado y enviado al banco una orden de débito que "
"incluye al menos una de sus facturas.</p>\n"
" % else:\n"
" <p>Se ha procesado y enviado al banco una orden de pago que incluye "
"al menos una de sus facturas.</p>\n"
" % endif\n"
" <p>Incluye las siguientes transacciones:</p>\n"
" <table width=\"100%\" ;\"=\"\">\n"
" <tbody>\n"
" <tr style=\"border-bottom:2px solid #dee2e6;\">\n"
" <td style=\"width:40%;\"><strong>Número</strong></td>\n"
" <td width=\"30%\"><strong>Fecha</strong></td>\n"
" <td width=\"30%\"><strong>Importe</strong></td>\n"
" </tr>\n"
" </tbody>\n"
" </table>\n"
" % for payment_line in object.payment_line_ids: \n"
" <table width=\"100%\" ;=\"\">\n"
" <tbody>\n"
" <tr>\n"
" <td width=\"40%\">\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"
" ${payment_line.move_line_id.move_id.ref}\n"
" % else:\n"
" ${payment_line.communication}\n"
" % endif\n"
" </td>\n"
" <td width=\"30%\">${format_date(payment_line.date)}</"
"td>\n"
" <td width=\"30%\">${format_amount(payment_line."
"amount_currency, payment_line.currency_id)}</td>\n"
" </tr>\n"
" </tbody>\n"
" </table>\n"
" % endfor\n"
" <p>No dude en ponerse en contacto con nosotros si tiene alguna pregunta."
"</p>\n"
"</div>\n"
" "
112 changes: 63 additions & 49 deletions account_payment_order_notification/i18n/fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,81 +20,95 @@ msgstr ""
#: 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"
"<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"
" <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"
" <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"
" <table width=\"100%\" ;\"=\"\">\n"
" <tbody>\n"
" % for payment_line in object.payment_line_ids:\n"
" <tr>\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>${format_date(payment_line.date)}</td>\n"
" <td>${format_amount(payment_line.amount_currency, payment_line.currency_id)}</td>\n"
" <tr style=\"border-bottom:2px solid #dee2e6;\">\n"
" <td style=\"width:40%;\"><strong>Number</strong></td>\n"
" <td width=\"30%\"><strong>Date</strong></td>\n"
" <td width=\"30%\"><strong>Amount</strong></td>\n"
" </tr>\n"
" % endfor\n"
" </tbody>\n"
" </table>\n"
" % for payment_line in object.payment_line_ids: \n"
" <table width=\"100%\" ;=\"\">\n"
" <tbody>\n"
" <tr>\n"
" <td width=\"40%\">\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"
" ${payment_line.move_line_id.move_id.ref}\n"
" % else:\n"
" ${payment_line.communication}\n"
" % endif\n"
" </td>\n"
" <td width=\"30%\">${format_date(payment_line.date)}</"
"td>\n"
" <td width=\"30%\">${format_amount(payment_line."
"amount_currency, payment_line.currency_id)}</td>\n"
" </tr>\n"
" </tbody>\n"
" </table>\n"
" % endfor\n"
" <p>Do not hesitate to contact us if you have any questions.</p>\n"
"</div>\n"
" "
msgstr ""
"\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>Bonjour ${object.partner_id.name ou ''},</p>\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>Bonjour ${object.partner_id.name or ''},</p>\n"
" % if object.order_id.payment_type == 'inbound':\n"
" <p>Un ordre de débit comprenant au moins une de vos factures a été "
"traité et envoyé à la banque.</p>\n"
" % else:\n"
" <p>Un ordre de paiement comprenant au moins une de vos factures a "
"été traité et envoyé à la banque.</p>\n"
" % endif\n"
" <p>Il comprend les transactions suivantes :</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>Nombre</td>\n"
" <td>Date</td>\n"
" <td>Quantité</td>\n"
" </tr>\n"
" </thead>\n"
" <p>Il comprend les transactions suivantes :</p>\n"
" <table width=\"100%\" ;\"=\"\">\n"
" <tbody>\n"
" % for payment_line in object.payment_line_ids : \n"
" <tr>\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>${format_date(payment_line.date)}</td>\n"
" <td>${format_amount(payment_line.amount_currency, "
"payment_line.currency_id)}</td>\n"
" <tr style=\"border-bottom:2px solid #dee2e6;\">\n"
" <td style=\"width:40%;\"><strong>Nombre</strong></td>\n"
" <td width=\"30%\"><strong>Date</strong></td>\n"
" <td width=\"30%\"><strong>Quantité</strong></td>\n"
" </tr>\n"
" % endfor\n"
" </tbody>\n"
" </table>\n"
" <p>N’hésitez pas à nous contacter si vous avez des questions.</p>\n"
" % for payment_line in object.payment_line_ids: \n"
" <table width=\"100%\" ;=\"\">\n"
" <tbody>\n"
" <tr>\n"
" <td width=\"40%\">\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"
" ${payment_line.move_line_id.move_id.ref}\n"
" % else:\n"
" ${payment_line.communication}\n"
" % endif\n"
" </td>\n"
" <td width=\"30%\">${format_date(payment_line.date)}</"
"td>\n"
" <td width=\"30%\">${format_amount(payment_line."
"amount_currency, payment_line.currency_id)}</td>\n"
" </tr>\n"
" </tbody>\n"
" </table>\n"
" % endfor\n"
" <p>N’hésitez pas à nous contacter si vous avez des questions."
"</p>\n"
"</div>\n"
" "
" "

#. module: account_payment_order_notification
#: model:mail.template,subject:account_payment_order_notification.email_account_payment_order_notification
Expand Down

0 comments on commit 7b32e60

Please sign in to comment.