From 21cfdd2c4f5a893e0854dbf2c4e0ae38f35671d6 Mon Sep 17 00:00:00 2001 From: Murtaza Mithaiwala Date: Fri, 29 Jan 2021 12:15:58 +0530 Subject: [PATCH 01/13] account_payment_order_vendor_email --- account_payment_order_vendor_email/README.rst | 59 ++++ .../__init__.py | 1 + .../__manifest__.py | 19 ++ .../data/mail_template.xml | 252 ++++++++++++++++++ .../models/__init__.py | 1 + .../models/account_payment_mode.py | 108 ++++++++ .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 1 + .../readme/USAGE.rst | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 4 + .../test_account_payment_order_vendor_mail.py | 66 +++++ .../views/account_payment_mode_view.xml | 16 ++ .../views/account_payment_order_view.xml | 21 ++ 14 files changed, 557 insertions(+) create mode 100644 account_payment_order_vendor_email/README.rst create mode 100644 account_payment_order_vendor_email/__init__.py create mode 100644 account_payment_order_vendor_email/__manifest__.py create mode 100644 account_payment_order_vendor_email/data/mail_template.xml create mode 100644 account_payment_order_vendor_email/models/__init__.py create mode 100644 account_payment_order_vendor_email/models/account_payment_mode.py create mode 100644 account_payment_order_vendor_email/readme/CONTRIBUTORS.rst create mode 100644 account_payment_order_vendor_email/readme/DESCRIPTION.rst create mode 100644 account_payment_order_vendor_email/readme/USAGE.rst create mode 100644 account_payment_order_vendor_email/static/description/icon.png create mode 100644 account_payment_order_vendor_email/tests/__init__.py create mode 100644 account_payment_order_vendor_email/tests/test_account_payment_order_vendor_mail.py create mode 100644 account_payment_order_vendor_email/views/account_payment_mode_view.xml create mode 100644 account_payment_order_vendor_email/views/account_payment_order_view.xml diff --git a/account_payment_order_vendor_email/README.rst b/account_payment_order_vendor_email/README.rst new file mode 100644 index 00000000000..10d06c9368f --- /dev/null +++ b/account_payment_order_vendor_email/README.rst @@ -0,0 +1,59 @@ +================================== +Account Payment Order Vender Email +================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +Add fields to Account Payment Mode. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Add `send_email_to_partner` on Account Payment Mode records. + +Add 'email_temp_id' on Account Payment Mode records. + +Add Email templated to send the Payment Details on Mail +Bug Tracker +=========== + + +Credits +======= + +Authors +~~~~~~~ + +* Thinkwell Designs + +Contributors +~~~~~~~~~~~~ + +* Murtaza Mithaiwala +* Maxime Chambreuil +* Serpent Consulting Services Pvt. Ltd. + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/l10n-usa `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_vendor_email/__init__.py b/account_payment_order_vendor_email/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/account_payment_order_vendor_email/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_payment_order_vendor_email/__manifest__.py b/account_payment_order_vendor_email/__manifest__.py new file mode 100644 index 00000000000..5050dc4bfc0 --- /dev/null +++ b/account_payment_order_vendor_email/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright (C) 2020 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Payment Order Email", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "maintainers": [], + "website": "https://github.com/OCA/bank-payment", + "category": "Accounting", + "depends": ["account_payment_order", "account_payment_mode"], + "data": [ + "data/mail_template.xml", + "views/account_payment_mode_view.xml", + "views/account_payment_order_view.xml", + ], + "installable": True, +} diff --git a/account_payment_order_vendor_email/data/mail_template.xml b/account_payment_order_vendor_email/data/mail_template.xml new file mode 100644 index 00000000000..1bff0e5fb13 --- /dev/null +++ b/account_payment_order_vendor_email/data/mail_template.xml @@ -0,0 +1,252 @@ + + + + + Email for ACH Payments + + ${object.company_id.name | safe} <${(object.company_id.email or user.email) | safe}> + + Remittance Advice + + ${object.generated_user_id.lang} + + +
+ + + + + + + + +
+ Remittance + Advice
+ + ${object.name} + + 		+ ${object.company_id.name} +
+
+
+ + + + + + + + +
+
+ Dear ${object.name},

+ A payment was processed on ${ctx['date']} + for ${ctx['partner_name']} in the amount of + ${ctx['total_amount']} with reference + ${ctx['payment_ref']}.

+ % set line_dict = ctx.get('line_data',False) + % for line in line_dict: + + + + + + + + + + + + +
+ % if line == line_dict[0]: + + ${line.get("inv_date") or ''} + + % else: + ${line.get("inv_date") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("inv_no") or ''} + + % else: + ${line.get("inv_no") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("credit_ref") or ''} + + % else: + ${line.get("credit_ref") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("supp_inv") or ''} + + % else: + ${line.get("supp_inv") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("payment_amount") or ''} + + % else: + ${'%.2f' % line.get("payment_amount") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("inv_amount") or ''} + + % else: + ${'%.2f' %line.get("inv_amount") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("credit_amount") or ''} + + % else: + ${'%.2f' % line.get("credit_amount") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("discount") or ''} + + % else: + ${line.get("discount") or ''} + % endif + + % if line == line_dict[0]: + + ${line.get("due_amount") or ''} + + % else: + ${'%.2f' % line.get("due_amount") or ''} + % endif +
+ % endfor + Thanks, + % if user.signature: +
+ ${user.signature | safe} + % endif +
+
+
+
+ + + + + + + +
+ ${object.company_id.name} +
+ ${object.company_id.phone} + % if object.company_id.email + | + ${object.company_id.email} + % endif + % if object.company_id.website + | + ${object.company_id.website} + + % endif +
+ + + + + + + +
+ Powered by Odoo +
+ + + ]]> + + + + diff --git a/account_payment_order_vendor_email/models/__init__.py b/account_payment_order_vendor_email/models/__init__.py new file mode 100644 index 00000000000..715a4994f72 --- /dev/null +++ b/account_payment_order_vendor_email/models/__init__.py @@ -0,0 +1 @@ +from . import account_payment_mode diff --git a/account_payment_order_vendor_email/models/account_payment_mode.py b/account_payment_order_vendor_email/models/account_payment_mode.py new file mode 100644 index 00000000000..3ae72e287f1 --- /dev/null +++ b/account_payment_order_vendor_email/models/account_payment_mode.py @@ -0,0 +1,108 @@ +# Copyright (C) 2020 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime + +from odoo import _, fields, models + + +class PaymentModeCustom(models.Model): + _inherit = "account.payment.mode" + + send_email_to_partner = fields.Boolean( + string="Send Email to Partner", default=False + ) + email_temp_id = fields.Many2one( + "mail.template", + string="Email Template", + ) + + +class PaymentOrder(models.Model): + _inherit = "account.payment.order" + + def send_vendor_email(self): + for rec in self: + if rec.payment_mode_id.send_email_to_partner: + date_generated = rec.date_generated + for bank_line in rec.bank_line_ids: + partner_name = bank_line.partner_id.name + total_amount = bank_line.amount_currency + payment_ref = bank_line.name + line_data = [] + header_data = { + "inv_no": "Invoice No.", + "payment_amount": "Payment (in dollars)", + "discount": "Discount (in dollars)", + "inv_date": "Invoice Date", + "credit_ref": "Credit ref#", + "supp_inv": "Supp. Invoice#", + "inv_amount": "Invoice Amount", + "credit_amount": "Credit Amount", + "due_amount": "Due Amount", + } + line_data.append(header_data) + for payment_line in bank_line.payment_line_ids: + invoice_date = ( + payment_line.move_line_id.move_id.invoice_date + and datetime.strftime( + payment_line.move_line_id.move_id.invoice_date, + "%Y/%m/%d", + ) + or "" + ) + line_dict = { + "inv_no": payment_line.move_line_id.move_id.name or "", + "payment_amount": payment_line.amount_currency, + "discount": payment_line.discount_amount, + "inv_date": invoice_date or "", + "credit_ref": payment_line.order_id.name, + "supp_inv": payment_line.move_line_id.move_id.name or "", + "inv_amount": payment_line.move_line_id.move_id.amount_total, + "credit_amount": payment_line.move_line_id.move_id.amount_untaxed, + "due_amount": payment_line.move_line_id.move_id.amount_residual, + } + line_data.append(line_dict) + template = rec.payment_mode_id.email_temp_id + if not template: + template = self.env.ref( + "account_payment_order_vendor_email." + "ach_payment_email_template" + ) + partner_email_id = bank_line.partner_id.email + if partner_email_id: + template.write({"email_to": partner_email_id}) + template.with_context( + { + "date": date_generated, + "partner_name": partner_name, + "total_amount": total_amount, + "payment_ref": payment_ref, + "line_data": line_data, + } + ).send_mail(rec.id, force_send=True) + rec.message_post( + body=_( + "An email is sent successfully to %s vendor." + % partner_name + ) + ) + else: + rec.message_post( + body=_( + "An email is not able to send to %s vendor." + % partner_name + ) + ) + + def generated2uploaded(self): + res = super(PaymentOrder, self).generated2uploaded() + if self.payment_mode_id.send_email_to_partner: + self.send_vendor_email() + return res + + +class AccountPaymentLine(models.Model): + _inherit = "account.payment.line" + + discount_amount = fields.Monetary(currency_field="currency_id") diff --git a/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst b/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..a230e913003 --- /dev/null +++ b/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Murtaza Mithaiwala +* Maxime Chambreuil +* Serpent Consulting Services Pvt. Ltd. +* Daniel Reis diff --git a/account_payment_order_vendor_email/readme/DESCRIPTION.rst b/account_payment_order_vendor_email/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..7107f7077d3 --- /dev/null +++ b/account_payment_order_vendor_email/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Add fields to Account Payment Mode. diff --git a/account_payment_order_vendor_email/readme/USAGE.rst b/account_payment_order_vendor_email/readme/USAGE.rst new file mode 100644 index 00000000000..6c9203dab03 --- /dev/null +++ b/account_payment_order_vendor_email/readme/USAGE.rst @@ -0,0 +1,5 @@ +Add `send_email_to_partner` on Account Payment Mode records. + +Add 'email_temp_id' on Account Payment Mode records. + +Add Email templated to send the Payment Details on Mail diff --git a/account_payment_order_vendor_email/static/description/icon.png b/account_payment_order_vendor_email/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_payment_order_vendor_email/tests/__init__.py b/account_payment_order_vendor_email/tests/__init__.py new file mode 100644 index 00000000000..587b33984db --- /dev/null +++ b/account_payment_order_vendor_email/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2021 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_account_payment_order_vendor_mail diff --git a/account_payment_order_vendor_email/tests/test_account_payment_order_vendor_mail.py b/account_payment_order_vendor_email/tests/test_account_payment_order_vendor_mail.py new file mode 100644 index 00000000000..87983e30d32 --- /dev/null +++ b/account_payment_order_vendor_email/tests/test_account_payment_order_vendor_mail.py @@ -0,0 +1,66 @@ +# Copyright (C) 2021 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestVendorEmail(TransactionCase): + def setUp(self): + super(TestVendorEmail, self).setUp() + + # Company + self.company = self.env.ref("base.main_company") + + self.journal_c1 = self.env["account.journal"].create( + { + "name": "Journal 1", + "code": "J1", + "type": "bank", + "company_id": self.company.id, + } + ) + + self.manual_out = self.env.ref("account.account_payment_method_manual_out") + + self.email_template = self.env.ref( + "account_payment_order_vendor_email.ach_payment_email_template" + ) + + self.partner_id = self.env.ref("base.res_partner_12") + + self.payment_mode_c1 = self.env["account.payment.mode"].create( + { + "name": "Direct Debit of suppliers from Bank 1", + "bank_account_link": "variable", + "payment_method_id": self.manual_out.id, + "company_id": self.company.id, + "fixed_journal_id": self.journal_c1.id, + "variable_journal_ids": [(6, 0, [self.journal_c1.id])], + "send_email_to_partner": True, + "email_temp_id": self.email_template.id, + } + ) + + def test_send_vendor_email(self): + self.payment_order_id = self.env["account.payment.order"].create( + { + "payment_mode_id": self.payment_mode_c1.id, + "journal_id": self.journal_c1.id, + "payment_type": "outbound", + "payment_line_ids": [ + ( + 0, + 0, + { + "amount_currency": 200.00, + "partner_id": self.partner_id.id, + "communication": "TEST", + }, + ) + ], + } + ) + self.payment_order_id.draft2open() + self.payment_order_id.open2generated() + self.payment_order_id.generated2uploaded() + self.payment_order_id.send_vendor_email() diff --git a/account_payment_order_vendor_email/views/account_payment_mode_view.xml b/account_payment_order_vendor_email/views/account_payment_mode_view.xml new file mode 100644 index 00000000000..5dbbd1bf72d --- /dev/null +++ b/account_payment_order_vendor_email/views/account_payment_mode_view.xml @@ -0,0 +1,16 @@ + + + account_payment_mode_email_inherit + account.payment.mode + + + + + + + + + diff --git a/account_payment_order_vendor_email/views/account_payment_order_view.xml b/account_payment_order_vendor_email/views/account_payment_order_view.xml new file mode 100644 index 00000000000..3634b1bf013 --- /dev/null +++ b/account_payment_order_vendor_email/views/account_payment_order_view.xml @@ -0,0 +1,21 @@ + + + account_payment_order_manual_email_form + account.payment.order + + + + + + From 8190d467c56665333a25e2967d3398b79dd1c8e8 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 24 Feb 2022 14:55:19 +0000 Subject: [PATCH 02/13] Update account_payment_order_vendor_email.pot --- .../account_payment_order_vendor_email.pot | 323 ++++++++++++++++++ 1 file changed, 323 insertions(+) create mode 100644 account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot diff --git a/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot b/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot new file mode 100644 index 00000000000..3fbea9850a4 --- /dev/null +++ b/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot @@ -0,0 +1,323 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_order_vendor_email +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_payment_order_vendor_email +#: model:mail.template,body_html:account_payment_order_vendor_email.ach_payment_email_template +msgid "" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" Remittance\n" +" Advice
\n" +" \n" +" ${object.name}\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" Dear ${object.name},

\n" +" A payment was processed on ${ctx['date']}\n" +" for ${ctx['partner_name']} in the amount of\n" +" ${ctx['total_amount']} with reference\n" +" ${ctx['payment_ref']}.

\n" +" % set line_dict = ctx.get('line_data',False)\n" +" % for line in line_dict:\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"inv_date\") or ''}\n" +" \n" +" % else:\n" +" ${line.get(\"inv_date\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"inv_no\") or ''}\n" +" \n" +" % else:\n" +" ${line.get(\"inv_no\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"credit_ref\") or ''}\n" +" \n" +" % else:\n" +" ${line.get(\"credit_ref\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"supp_inv\") or ''}\n" +" \n" +" % else:\n" +" ${line.get(\"supp_inv\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"payment_amount\") or ''}\n" +" \n" +" % else:\n" +" ${'%.2f' % line.get(\"payment_amount\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"inv_amount\") or ''}\n" +" \n" +" % else:\n" +" ${'%.2f' %line.get(\"inv_amount\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"credit_amount\") or ''}\n" +" \n" +" % else:\n" +" ${'%.2f' % line.get(\"credit_amount\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"discount\") or ''}\n" +" \n" +" % else:\n" +" ${line.get(\"discount\") or ''}\n" +" % endif\n" +" \n" +" % if line == line_dict[0]:\n" +" \n" +" ${line.get(\"due_amount\") or ''}\n" +" \n" +" % else:\n" +" ${'%.2f' % line.get(\"due_amount\") or ''}\n" +" % endif\n" +"
\n" +" % endfor\n" +" Thanks,\n" +" % if user.signature:\n" +"
\n" +" ${user.signature | safe}\n" +" % endif\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" ${object.company_id.name}\n" +" \n" +" \n" +" ${object.company_id.phone}\n" +" % if object.company_id.email\n" +" | \n" +" ${object.company_id.email}\n" +" % endif\n" +" % if object.company_id.website\n" +" | \n" +" ${object.company_id.website}\n" +" \n" +" % endif\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" Powered by Odoo\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" " +msgstr "" + +#. module: account_payment_order_vendor_email +#: code:addons/account_payment_order_vendor_email/models/account_payment_mode.py:0 +#, python-format +msgid "An email is not able to send to %s vendor." +msgstr "" + +#. module: account_payment_order_vendor_email +#: code:addons/account_payment_order_vendor_email/models/account_payment_mode.py:0 +#, python-format +msgid "An email is sent successfully to %s vendor." +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line__discount_amount +msgid "Discount Amount" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line__display_name +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__display_name +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_order__display_name +msgid "Display Name" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__email_temp_id +msgid "Email Template" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line__id +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__id +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_order__id +msgid "ID" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line____last_update +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode____last_update +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_order____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model,name:account_payment_order_vendor_email.model_account_payment_line +msgid "Payment Lines" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model,name:account_payment_order_vendor_email.model_account_payment_mode +msgid "Payment Modes" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model,name:account_payment_order_vendor_email.model_account_payment_order +msgid "Payment Order" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:mail.template,subject:account_payment_order_vendor_email.ach_payment_email_template +msgid "Remittance Advice" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model_terms:ir.ui.view,arch_db:account_payment_order_vendor_email.account_payment_order_manual_email_form +msgid "Send Email" +msgstr "" + +#. module: account_payment_order_vendor_email +#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__send_email_to_partner +msgid "Send Email to Partner" +msgstr "" From f4c7263f2eb218c0dfdc65fe4d8373c7abd04e08 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 24 Feb 2022 15:01:07 +0000 Subject: [PATCH 03/13] README.rst --- account_payment_order_vendor_email/README.rst | 38 +- .../static/description/index.html | 429 ++++++++++++++++++ 2 files changed, 461 insertions(+), 6 deletions(-) create mode 100644 account_payment_order_vendor_email/static/description/index.html diff --git a/account_payment_order_vendor_email/README.rst b/account_payment_order_vendor_email/README.rst index 10d06c9368f..d334937fa8f 100644 --- a/account_payment_order_vendor_email/README.rst +++ b/account_payment_order_vendor_email/README.rst @@ -1,12 +1,30 @@ -================================== -Account Payment Order Vender Email -================================== +=========================== +Account Payment Order Email +=========================== .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github + :target: https://github.com/OCA/bank-payment/tree/14.0/account_payment_order_vendor_email + :alt: OCA/bank-payment +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/bank-payment-14-0/bank-payment-14-0-account_payment_order_vendor_email + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/173/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + Add fields to Account Payment Mode. **Table of contents** @@ -22,9 +40,16 @@ Add `send_email_to_partner` on Account Payment Mode records. Add 'email_temp_id' on Account Payment Mode records. Add Email templated to send the Payment Details on Mail + Bug Tracker =========== +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= @@ -32,7 +57,7 @@ Credits Authors ~~~~~~~ -* Thinkwell Designs +* Open Source Integrators Contributors ~~~~~~~~~~~~ @@ -40,6 +65,7 @@ Contributors * Murtaza Mithaiwala * Maxime Chambreuil * Serpent Consulting Services Pvt. Ltd. +* Daniel Reis Maintainers ~~~~~~~~~~~ @@ -54,6 +80,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/l10n-usa `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_vendor_email/static/description/index.html b/account_payment_order_vendor_email/static/description/index.html new file mode 100644 index 00000000000..57cafca3dee --- /dev/null +++ b/account_payment_order_vendor_email/static/description/index.html @@ -0,0 +1,429 @@ + + + + + + +Account Payment Order Email + + + +
+

Account Payment Order Email

+ + +

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

Add fields to Account Payment Mode.

+

Table of contents

+ +
+

Usage

+

Add send_email_to_partner on Account Payment Mode records.

+

Add ‘email_temp_id’ on Account Payment Mode records.

+

Add Email templated to send the Payment Details on Mail

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Open Source Integrators
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/bank-payment project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 17765110f11d8e5f011af5de3294659caaa35d62 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 6 Nov 2022 16:29:37 +0100 Subject: [PATCH 04/13] account_payment_order_vendor_email: Adapt module to native payment refactoring --- .../models/account_payment_mode.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/account_payment_order_vendor_email/models/account_payment_mode.py b/account_payment_order_vendor_email/models/account_payment_mode.py index 3ae72e287f1..eaaaf3a2104 100644 --- a/account_payment_order_vendor_email/models/account_payment_mode.py +++ b/account_payment_order_vendor_email/models/account_payment_mode.py @@ -1,4 +1,5 @@ # Copyright (C) 2020 Open Source Integrators +# Copyright 2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from datetime import datetime @@ -25,10 +26,10 @@ def send_vendor_email(self): for rec in self: if rec.payment_mode_id.send_email_to_partner: date_generated = rec.date_generated - for bank_line in rec.bank_line_ids: - partner_name = bank_line.partner_id.name - total_amount = bank_line.amount_currency - payment_ref = bank_line.name + for payment in rec.payment_ids: + partner_name = payment.partner_id.name + total_amount = payment.amount + payment_ref = payment.payment_reference line_data = [] header_data = { "inv_no": "Invoice No.", @@ -42,7 +43,7 @@ def send_vendor_email(self): "due_amount": "Due Amount", } line_data.append(header_data) - for payment_line in bank_line.payment_line_ids: + for payment_line in payment.payment_line_ids: invoice_date = ( payment_line.move_line_id.move_id.invoice_date and datetime.strftime( @@ -69,7 +70,7 @@ def send_vendor_email(self): "account_payment_order_vendor_email." "ach_payment_email_template" ) - partner_email_id = bank_line.partner_id.email + partner_email_id = payment.partner_id.email if partner_email_id: template.write({"email_to": partner_email_id}) template.with_context( From fc85374c57fb194e5d9bb27ea45770c41cee2883 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 1 Jan 2023 16:55:59 +0000 Subject: [PATCH 05/13] account_payment_order_vendor_email 14.0.2.0.0 --- account_payment_order_vendor_email/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_order_vendor_email/__manifest__.py b/account_payment_order_vendor_email/__manifest__.py index 5050dc4bfc0..34cc0eae964 100644 --- a/account_payment_order_vendor_email/__manifest__.py +++ b/account_payment_order_vendor_email/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Account Payment Order Email", - "version": "14.0.1.0.0", + "version": "14.0.2.0.0", "license": "AGPL-3", "author": "Open Source Integrators, Odoo Community Association (OCA)", "maintainers": [], From 38513626390c845cca411ceff24e66f68c7b9d9e Mon Sep 17 00:00:00 2001 From: Nikul-OSI Date: Tue, 18 Apr 2023 15:08:42 +0530 Subject: [PATCH 06/13] [MIG] account_payment_order_vendor_email: Migrated to v16 --- .../__manifest__.py | 4 +- .../data/mail_template.xml | 522 +++++++++++------- .../models/account_payment_mode.py | 20 +- .../readme/CONTRIBUTORS.rst | 1 + 4 files changed, 323 insertions(+), 224 deletions(-) diff --git a/account_payment_order_vendor_email/__manifest__.py b/account_payment_order_vendor_email/__manifest__.py index 34cc0eae964..5380cd3e1fd 100644 --- a/account_payment_order_vendor_email/__manifest__.py +++ b/account_payment_order_vendor_email/__manifest__.py @@ -3,10 +3,10 @@ { "name": "Account Payment Order Email", - "version": "14.0.2.0.0", + "version": "16.0.1.0.0", "license": "AGPL-3", "author": "Open Source Integrators, Odoo Community Association (OCA)", - "maintainers": [], + "maintainers": ["ursais"], "website": "https://github.com/OCA/bank-payment", "category": "Accounting", "depends": ["account_payment_order", "account_payment_mode"], diff --git a/account_payment_order_vendor_email/data/mail_template.xml b/account_payment_order_vendor_email/data/mail_template.xml index 1bff0e5fb13..e679e9aa3a9 100644 --- a/account_payment_order_vendor_email/data/mail_template.xml +++ b/account_payment_order_vendor_email/data/mail_template.xml @@ -7,245 +7,343 @@ name="model_id" ref="account_payment_order.model_account_payment_order" /> - ${object.company_id.name | safe} <${(object.company_id.email or user.email) | safe}> + {{ object.company_id.email or user.email }} Remittance Advice - ${object.generated_user_id.lang} - {{ object.generated_user_id.lang }} + - - - - - - - + + - +
- -
-
- - + + + + + + - - - + + + + +
+ border="0" + cellpadding="0" + cellspacing="0" + style="padding-top: 16px; background-color: white; font-family:Verdana, Arial,sans-serif; color: #454748; min-width:800px; border-collapse:separate;" + > +
+ +
+
+ + + + - + + + -
Remittance - Advice
+ Advice + +
- ${object.name} + - 		+ ${object.company_id.name} -
+
-
-
- - + +
+
+
+ + + - - + + -
- Dear ${object.name},

- A payment was processed on ${ctx['date']} - for ${ctx['partner_name']} in the amount of - ${ctx['total_amount']} with reference - ${ctx['payment_ref']}.

- % set line_dict = ctx.get('line_data',False) - % for line in line_dict: - - - - - - - - - - - - -
- % if line == line_dict[0]: - - ${line.get("inv_date") or ''} - - % else: - ${line.get("inv_date") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("inv_no") or ''} - - % else: - ${line.get("inv_no") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("credit_ref") or ''} - - % else: - ${line.get("credit_ref") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("supp_inv") or ''} - - % else: - ${line.get("supp_inv") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("payment_amount") or ''} - - % else: - ${'%.2f' % line.get("payment_amount") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("inv_amount") or ''} - - % else: - ${'%.2f' %line.get("inv_amount") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("credit_amount") or ''} - - % else: - ${'%.2f' % line.get("credit_amount") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("discount") or ''} - - % else: - ${line.get("discount") or ''} - % endif - - % if line == line_dict[0]: - - ${line.get("due_amount") or ''} - - % else: - ${'%.2f' % line.get("due_amount") or ''} - % endif -
- % endfor + Dear , +

+ A payment was processed on + for in the amount of + with reference + .

+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Thanks, - % if user.signature: -
- ${user.signature | safe} - % endif + +
+ +
+
-
+
- - - + - - + + + | + + + + | + + + + +
- ${object.company_id.name} -
- ${object.company_id.phone} - % if object.company_id.email - | - ${object.company_id.email} - % endif - % if object.company_id.website - | +
+ + + + + + -
+ +
- ${object.company_id.website} - - % endif -
-
+
- + + > + + + +
+ - -
- Powered by Odoo -
-
+ Powered by + Odoo +
+
- ]]> diff --git a/account_payment_order_vendor_email/models/account_payment_mode.py b/account_payment_order_vendor_email/models/account_payment_mode.py index eaaaf3a2104..7a65856aa06 100644 --- a/account_payment_order_vendor_email/models/account_payment_mode.py +++ b/account_payment_order_vendor_email/models/account_payment_mode.py @@ -23,6 +23,7 @@ class PaymentOrder(models.Model): _inherit = "account.payment.order" def send_vendor_email(self): + context = dict(self._context) for rec in self: if rec.payment_mode_id.send_email_to_partner: date_generated = rec.date_generated @@ -73,7 +74,7 @@ def send_vendor_email(self): partner_email_id = payment.partner_id.email if partner_email_id: template.write({"email_to": partner_email_id}) - template.with_context( + context.update( { "date": date_generated, "partner_name": partner_name, @@ -81,19 +82,18 @@ def send_vendor_email(self): "payment_ref": payment_ref, "line_data": line_data, } - ).send_mail(rec.id, force_send=True) + ) + template.with_context(**context).send_mail( + rec.id, force_send=True + ) rec.message_post( - body=_( - "An email is sent successfully to %s vendor." - % partner_name - ) + body=_("An email is not able to send to %s vendor.") + % partner_name ) else: rec.message_post( - body=_( - "An email is not able to send to %s vendor." - % partner_name - ) + body=_("An email is not able to send to %s vendor.") + % partner_name ) def generated2uploaded(self): diff --git a/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst b/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst index a230e913003..3741acc6c19 100644 --- a/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst +++ b/account_payment_order_vendor_email/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Maxime Chambreuil * Serpent Consulting Services Pvt. Ltd. * Daniel Reis +* Nikul Chaudhary From 6406886fef24cedec7a2eb8a48f559c0636033f9 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 17 Jun 2024 09:04:11 +0000 Subject: [PATCH 07/13] [UPD] Update account_payment_order_vendor_email.pot --- .../account_payment_order_vendor_email.pot | 422 ++++++++---------- 1 file changed, 176 insertions(+), 246 deletions(-) diff --git a/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot b/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot index 3fbea9850a4..fc666c777bd 100644 --- a/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot +++ b/account_payment_order_vendor_email/i18n/account_payment_order_vendor_email.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -16,249 +16,195 @@ msgstr "" #. module: account_payment_order_vendor_email #: model:mail.template,body_html:account_payment_order_vendor_email.ach_payment_email_template msgid "" -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" -" \n" -" \n" -" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" \n" +"
\n" +"
\n" +" \n" +" \n" +" \n" -" \n" -"
\n" " Remittance\n" -" Advice
\n" -" \n" -" ${object.name}\n" +" Advice\n" " \n" -" 		\n" -" \n" -"
\n" -" \n" -"
\n" -"
\n" -" \n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" 		\n" +" \"${object.company_id.name}\"\n" +"
\n" +"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" -" \n" -" \n" -"
\n" "
\n" -" Dear ${object.name},

\n" -" A payment was processed on ${ctx['date']}\n" -" for ${ctx['partner_name']} in the amount of\n" -" ${ctx['total_amount']} with reference\n" -" ${ctx['payment_ref']}.

\n" -" % set line_dict = ctx.get('line_data',False)\n" -" % for line in line_dict:\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"inv_date\") or ''}\n" -" \n" -" % else:\n" -" ${line.get(\"inv_date\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"inv_no\") or ''}\n" -" \n" -" % else:\n" -" ${line.get(\"inv_no\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"credit_ref\") or ''}\n" -" \n" -" % else:\n" -" ${line.get(\"credit_ref\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"supp_inv\") or ''}\n" -" \n" -" % else:\n" -" ${line.get(\"supp_inv\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"payment_amount\") or ''}\n" -" \n" -" % else:\n" -" ${'%.2f' % line.get(\"payment_amount\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"inv_amount\") or ''}\n" -" \n" -" % else:\n" -" ${'%.2f' %line.get(\"inv_amount\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"credit_amount\") or ''}\n" -" \n" -" % else:\n" -" ${'%.2f' % line.get(\"credit_amount\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"discount\") or ''}\n" -" \n" -" % else:\n" -" ${line.get(\"discount\") or ''}\n" -" % endif\n" -" \n" -" % if line == line_dict[0]:\n" -" \n" -" ${line.get(\"due_amount\") or ''}\n" -" \n" -" % else:\n" -" ${'%.2f' % line.get(\"due_amount\") or ''}\n" -" % endif\n" -"
\n" -" % endfor\n" +" Dear ,\n" +"

\n" +" A payment was processed on \n" +" for in the amount of\n" +" with reference\n" +" .

\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" \n" " Thanks,\n" -" % if user.signature:\n" -"
\n" -" ${user.signature | safe}\n" -" % endif\n" +" \n" +"
\n" +" \n" +" \n" "
\n" "
\n" -" \n" -"
\n" +" \n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" \n" " \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" ${object.company_id.name}\n" -" \n" -" \n" -" ${object.company_id.phone}\n" -" % if object.company_id.email\n" -" | \n" -" ${object.company_id.email}\n" -" % endif\n" -" % if object.company_id.website\n" -" | \n" -" ${object.company_id.website}\n" -" \n" -" % endif\n" -" \n" -" \n" -" \n" -" \n" -" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" \n" +"
\n" +" \n" +" \n" +" |\n" +" \n" +" \n" +" \n" +" |\n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" \n" " \n" -" \n" -" \n" -" \n" -" Powered by Odoo\n" -" \n" -" \n" -" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" Powered by\n" +" Odoo\n" +"
\n" +" \n" +" \n" " \n" -" \n" " " msgstr "" #. module: account_payment_order_vendor_email +#. odoo-python #: code:addons/account_payment_order_vendor_email/models/account_payment_mode.py:0 -#, python-format -msgid "An email is not able to send to %s vendor." -msgstr "" - -#. module: account_payment_order_vendor_email #: code:addons/account_payment_order_vendor_email/models/account_payment_mode.py:0 #, python-format -msgid "An email is sent successfully to %s vendor." +msgid "An email is not able to send to %s vendor." msgstr "" #. module: account_payment_order_vendor_email @@ -266,30 +212,14 @@ msgstr "" msgid "Discount Amount" msgstr "" -#. module: account_payment_order_vendor_email -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line__display_name -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__display_name -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_order__display_name -msgid "Display Name" -msgstr "" - #. module: account_payment_order_vendor_email #: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__email_temp_id msgid "Email Template" msgstr "" #. module: account_payment_order_vendor_email -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line__id -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode__id -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_order__id -msgid "ID" -msgstr "" - -#. module: account_payment_order_vendor_email -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_line____last_update -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_mode____last_update -#: model:ir.model.fields,field_description:account_payment_order_vendor_email.field_account_payment_order____last_update -msgid "Last Modified on" +#: model:mail.template,name:account_payment_order_vendor_email.ach_payment_email_template +msgid "Email for ACH Payments" msgstr "" #. module: account_payment_order_vendor_email From 42bf4d18ae76c9464956a1d194c3b7807430390e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 17 Jun 2024 09:08:23 +0000 Subject: [PATCH 08/13] [BOT] post-merge updates --- account_payment_order_vendor_email/README.rst | 32 +++++++++----- .../static/description/index.html | 44 ++++++++++--------- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/account_payment_order_vendor_email/README.rst b/account_payment_order_vendor_email/README.rst index d334937fa8f..f298d16b11f 100644 --- a/account_payment_order_vendor_email/README.rst +++ b/account_payment_order_vendor_email/README.rst @@ -2,10 +2,13 @@ Account Payment Order Email =========================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:e140fcddccecb19696e2b3b17a7c1f438dd2344a68a1d94428a4c6355996a576 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Account Payment Order Email :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/14.0/account_payment_order_vendor_email + :target: https://github.com/OCA/bank-payment/tree/16.0/account_payment_order_vendor_email :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-14-0/bank-payment-14-0-account_payment_order_vendor_email + :target: https://translation.odoo-community.org/projects/bank-payment-16-0/bank-payment-16-0-account_payment_order_vendor_email :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/173/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-payment&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Add fields to Account Payment Mode. @@ -46,8 +49,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -66,6 +69,7 @@ Contributors * Maxime Chambreuil * Serpent Consulting Services Pvt. Ltd. * Daniel Reis +* Nikul Chaudhary Maintainers ~~~~~~~~~~~ @@ -80,6 +84,14 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/bank-payment `_ project on GitHub. +.. |maintainer-ursais| image:: https://github.com/ursais.png?size=40px + :target: https://github.com/ursais + :alt: ursais + +Current `maintainer `__: + +|maintainer-ursais| + +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_vendor_email/static/description/index.html b/account_payment_order_vendor_email/static/description/index.html index 57cafca3dee..d4b2d090862 100644 --- a/account_payment_order_vendor_email/static/description/index.html +++ b/account_payment_order_vendor_email/static/description/index.html @@ -1,20 +1,19 @@ - - + Account Payment Order Email