diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst
index 435bb23cd..95ec38e1b 100644
--- a/account_payment_sale/README.rst
+++ b/account_payment_sale/README.rst
@@ -23,7 +23,7 @@ Account Payment Sale
     :target: https://runbot.odoo-community.org/runbot/173/14.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This modules adds one field on sale orders: *Payment Mode*.
 This field is copied from customer to sale order and then from sale order to
@@ -83,6 +83,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/bank-payment <https://github.com/OCA/bank-payment/tree/14.0/account_payment_sale>`_ project on GitHub.
+This module is part of the `OCA/bank-payment <https://github.com/OCA/bank-payment/tree/15.0/account_payment_sale>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_payment_sale/__manifest__.py b/account_payment_sale/__manifest__.py
index 775aae7f0..ea20463a6 100644
--- a/account_payment_sale/__manifest__.py
+++ b/account_payment_sale/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Account Payment Sale",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Banking addons",
     "license": "AGPL-3",
     "summary": "Adds payment mode on sale orders",
diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po
index 0fe29a625..09df33aae 100644
--- a/account_payment_sale/i18n/es.po
+++ b/account_payment_sale/i18n/es.po
@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-02 03:43+0000\n"
-"PO-Revision-Date: 2022-02-02 14:33+0000\n"
-"Last-Translator: Olga Marco Puértolas <olga.marco@creublanca.es>\n"
+"PO-Revision-Date: 2018-07-13 09:23+0000\n"
+"Last-Translator: Enric Tobella <etobella@creublanca.es>\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 3.0.1\n"
 
 #. module: account_payment_sale
 #: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
@@ -42,7 +42,7 @@ msgstr "Ventas. Anticipo pago factura"
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
 msgid "Sales Order"
-msgstr "Órdenes de venta"
+msgstr ""
 
 #~ msgid "Quotation"
 #~ msgstr "Presupuesto"
diff --git a/account_payment_sale/readme/CONTRIBUTORS.rst b/account_payment_sale/readme/CONTRIBUTORS.rst
index 66e1e8090..408931b06 100644
--- a/account_payment_sale/readme/CONTRIBUTORS.rst
+++ b/account_payment_sale/readme/CONTRIBUTORS.rst
@@ -4,3 +4,4 @@
 * Danimar Ribeiro
 * Raphaël Valyi
 * Raf Ven <raf.ven@dynapps.be>
+* Manuel Regidor <manuel.regidor@sygel.es>
diff --git a/account_payment_sale/tests/__init__.py b/account_payment_sale/tests/__init__.py
index 55d111022..6f699d0d8 100644
--- a/account_payment_sale/tests/__init__.py
+++ b/account_payment_sale/tests/__init__.py
@@ -1,2 +1 @@
-from . import common
 from . import test_sale_order
diff --git a/account_payment_sale/tests/common.py b/account_payment_sale/tests/common.py
index 3164e8b06..a2d6ae887 100644
--- a/account_payment_sale/tests/common.py
+++ b/account_payment_sale/tests/common.py
@@ -1,13 +1,14 @@
 # Copyright 2018 Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 
-class CommonTestCase(SavepointCase):
+class CommonTestCase(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
 
         cls.bank = cls.env["res.partner.bank"].create(
             {"acc_number": "test", "partner_id": cls.env.user.company_id.partner_id.id}
diff --git a/account_payment_sale/tests/test_sale_order.py b/account_payment_sale/tests/test_sale_order.py
index 10be023e0..a2c5e994b 100644
--- a/account_payment_sale/tests/test_sale_order.py
+++ b/account_payment_sale/tests/test_sale_order.py
@@ -91,7 +91,7 @@ class TestSaleOrder(CommonTestCase):
                 "product_id": self.env.ref("sale.advance_product_0").id,
             }
         )
-        payment.with_context(context).create_invoices()
+        payment.with_context(**context).create_invoices()
         invoice = order.invoice_ids
         self.assertEqual(len(invoice), 1)
         self.assertEqual(invoice.payment_mode_id, self.payment_mode_2)
diff --git a/account_payment_sale/views/sale_report_templates.xml b/account_payment_sale/views/sale_report_templates.xml
index 1122770c8..d9e2f8271 100644
--- a/account_payment_sale/views/sale_report_templates.xml
+++ b/account_payment_sale/views/sale_report_templates.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <template id="report_sale_payment_mode" inherit_id="sale.report_saleorder_document">
-        <xpath expr="//p[@t-if='doc.payment_term_id.note']" position="after">
-            <p t-if="doc.payment_mode_id.note" id="payment_mode_note">
+        <xpath
+            expr="//p[@t-if='not is_html_empty(doc.payment_term_id.note)']"
+            position="after"
+        >
+            <p
+                t-if="not is_html_empty(doc.payment_mode_id.note)"
+                id="payment_mode_note"
+            >
                 <strong>Payment Mode:</strong>
                 <span t-field="doc.payment_mode_id.note" />
             </p>