diff --git a/account_check_report/__init__.py b/account_check_report/__init__.py
index 4c4f242fa03b..59b4cb501816 100644
--- a/account_check_report/__init__.py
+++ b/account_check_report/__init__.py
@@ -1 +1,2 @@
 from . import report
+from . import models
diff --git a/account_check_report/models/__init__.py b/account_check_report/models/__init__.py
new file mode 100644
index 000000000000..ab350b87bb10
--- /dev/null
+++ b/account_check_report/models/__init__.py
@@ -0,0 +1 @@
+from . import account_payment
diff --git a/account_check_report/models/account_payment.py b/account_check_report/models/account_payment.py
new file mode 100644
index 000000000000..d2883a87b4b1
--- /dev/null
+++ b/account_check_report/models/account_payment.py
@@ -0,0 +1,92 @@
+# 2016-2024 ForgeFlow S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo import api, models
+from odoo.osv import expression
+
+
+class AccountPayment(models.Model):
+    _inherit = "account.payment"
+
+    @api.depends(
+        "move_id.line_ids.matched_debit_ids", "move_id.line_ids.matched_credit_ids"
+    )
+    def _compute_stat_buttons_from_reconciliation(self):
+        res = super()._compute_stat_buttons_from_reconciliation()
+        for rec in self:
+            if rec.payment_type == "outbound":
+                open_action = rec.button_open_bills()
+                result_domain = open_action.get("domain", False)
+                if not result_domain:
+                    return res
+                rec.reconciled_bills_count = len(
+                    self.env["account.move"].search(result_domain)
+                )
+            else:
+                open_action = rec.button_open_invoices()
+                result_domain = open_action.get("domain", False)
+                if not result_domain:
+                    return res
+                rec.reconciled_invoices_count = len(
+                    self.env["account.move"].search(result_domain)
+                )
+        return res
+
+    def get_direct_refunds(self):
+        if self.payment_type == "outbound":
+            move_lines = self.reconciled_bill_ids.mapped("line_ids")
+        else:
+            move_lines = self.reconciled_invoice_ids.mapped("line_ids")
+        rec_lines = move_lines.filtered(
+            lambda x: x.account_id.reconcile
+            and x.account_id == self.destination_account_id
+            and x.partner_id == self.partner_id
+        )
+        # include direct refunds
+        if self.partner_type == "customer":
+            invoice_ids = rec_lines.mapped(
+                "matched_credit_ids.credit_move_id.full_reconcile_id."
+                "reconciled_line_ids.move_id"
+            ).filtered(lambda i: i.date <= self.date)
+        elif self.partner_type == "supplier":
+            invoice_ids = rec_lines.mapped(
+                "matched_debit_ids.debit_move_id.full_reconcile_id."
+                "reconciled_line_ids.move_id"
+            ).filtered(lambda i: i.date <= self.date)
+        # include other invoices where the payment was applied
+        invoice_ids += rec_lines.mapped(
+            "matched_credit_ids.credit_move_id.move_id"
+        ) + rec_lines.mapped("matched_debit_ids.debit_move_id.move_id")
+        if not invoice_ids:
+            return False
+        invoice_ids -= self.move_id
+        return invoice_ids
+
+    def get_direct_refunds_domain(self):
+        invoices = self.get_direct_refunds()
+        if invoices:
+            return [("id", "in", invoices.ids)]
+        return []
+
+    def button_open_invoices(self):
+        res = super(AccountPayment, self).button_open_invoices()
+        if not res.get("domain", False):
+            return res
+        result_domain = res.get("domain", False)
+        direct_refunds_domain = self.get_direct_refunds_domain()
+        if direct_refunds_domain:
+            res["domain"] = expression.OR([result_domain, direct_refunds_domain])
+        return res
+
+    def button_open_bills(self):
+        """
+        Include direct refunds, those are not linked to the payments
+        directly
+        """
+        res = super(AccountPayment, self).button_open_bills()
+        if not res.get("domain", False):
+            return res
+        result_domain = res.get("domain", False)
+        direct_refunds_domain = self.get_direct_refunds_domain()
+        if direct_refunds_domain:
+            res["domain"] = expression.OR([result_domain, direct_refunds_domain])
+        return res
diff --git a/account_check_report/report/account_check_report.xml b/account_check_report/report/account_check_report.xml
index 7f80668ef3f7..ab51c2ec6555 100644
--- a/account_check_report/report/account_check_report.xml
+++ b/account_check_report/report/account_check_report.xml
@@ -21,11 +21,13 @@
                                     style="padding-right:100mm;float:right;"
                                     t-esc="'Date: {}'.format(_format_date_to_partner_lang(o.date, o.partner_id.id))"
                                 />
-                                <span
-                                    name='check_number'
-                                    style="position:absolute; right:35mm;"
-                                    t-esc="'Check #: {}'.format(o.check_number)"
-                                />
+                                <t t-if="o.check_number">
+                                    <span
+                                        name='check_number'
+                                        style="position:absolute; right:35mm;"
+                                        t-esc="'Check #: {}'.format(o.check_number)"
+                                    />
+                                </t>
                             </strong>
                             <table
                                 class="oe_mt32 table table-condensed"
@@ -49,12 +51,12 @@
                                         <tr style="text-align:left;border-top: 0px;">
                                             <td style="padding-top:2mm;">
                                                 <span
-                                                    t-esc="_format_date_to_partner_lang(line.date_maturity, o.partner_id.id)"
+                                                    t-esc="_format_date_to_partner_lang(line[0].date, o.partner_id.id)"
                                                 />
                                             </td>
                                             <td
                                                 style="max-width: 55mm;"
-                                                t-esc="line.display_name"
+                                                t-esc="line[0].display_name"
                                             />
                                             <td>
                                                 <span
diff --git a/account_check_report/report/report_helper.py b/account_check_report/report/report_helper.py
index c3fd47aa9e8d..d5d8b0f0dc37 100644
--- a/account_check_report/report/report_helper.py
+++ b/account_check_report/report/report_helper.py
@@ -25,6 +25,25 @@ def _get_paid_lines(self, payment):
         amls = rec_lines.mapped("matched_credit_ids.credit_move_id") + rec_lines.mapped(
             "matched_debit_ids.debit_move_id"
         )
+        # Include direct refunds:
+        if payment.partner_type == "customer":
+            amls += rec_lines.mapped(
+                "matched_debit_ids.debit_move_id.matched_credit_ids."
+                "credit_move_id.full_reconcile_id.reconciled_line_ids"
+            ).filtered(
+                lambda line: line.id
+                not in rec_lines.mapped("matched_debit_ids.debit_move_id.id")
+                and line.move_id.date <= payment.date
+            )
+        else:
+            amls += rec_lines.mapped(
+                "matched_credit_ids.credit_move_id.matched_debit_ids."
+                "debit_move_id.full_reconcile_id.reconciled_line_ids"
+            ).filtered(
+                lambda line: line.id
+                not in rec_lines.mapped("matched_credit_ids.credit_move_id.id")
+                and line.move_id.date <= payment.date
+            )
         amls -= rec_lines
         # Here we need to handle a nasty corner case.
         # Sometimes we match a payment with invoices and refunds. Internally
@@ -36,16 +55,43 @@ def _get_paid_lines(self, payment):
         # refunds. In order to solve that, we will just include all the move
         # lines associated to the invoices that the user intended to pay,
         # including refunds.
-        invoice_amls = payment.reconciled_invoice_ids.line_ids.filtered(
-            lambda x: x.account_id.reconcile
-            and x.account_id == payment.destination_account_id
-            and x.partner_id == payment.partner_id
-        )
+        if payment.partner_type == "customer":
+            invoice_amls = payment.reconciled_invoice_ids.line_ids.filtered(
+                lambda x: x.account_id.reconcile
+                and x.account_id == payment.destination_account_id
+                and x.partner_id == payment.partner_id
+            )
+        else:
+            invoice_amls = payment.reconciled_bill_ids.line_ids.filtered(
+                lambda x: x.account_id.reconcile
+                and x.account_id == payment.destination_account_id
+                and x.partner_id == payment.partner_id
+            )
         amls |= invoice_amls
-        return amls
+        res = []
+        invoices_checked = []
+        # Another nasty corner case:
+        # avoid printing more than one line for invoice where the
+        # payable/receivable line is split. That happens when using
+        # payment terms with several lines
+        # I group the lines by invoice below
+        for aml in amls:
+            invoice = aml.move_id
+            if invoice in invoices_checked:
+                # prevent duplicated lines
+                continue
+            if invoice:
+                invoices_checked.append(invoice)
+                amls_inv = amls.filtered(lambda line: line.move_id == invoice)
+                res.append([line for line in amls_inv])
+            else:
+                res.append([aml])
+        return res
 
-    def _get_residual_amount(self, payment, line):
-        amt = line.amount_residual
+    def _get_residual_amount(self, payment, lines):
+        amt = abs(lines[0].move_id.amount_total) - abs(
+            self._get_paid_amount(payment, lines)
+        )
         if amt < 0.0:
             amt *= -1
         amt = payment.company_id.currency_id.with_context(date=payment.date).compute(
@@ -53,37 +99,98 @@ def _get_residual_amount(self, payment, line):
         )
         return amt
 
-    def _get_paid_amount(self, payment, line):
-        amount = 0.0
-        total_amount_to_show = 0.0
-        # We pay out
-        if line.matched_credit_ids:
-            amount = -1 * sum(p.amount for p in line.matched_credit_ids)
-        # We receive payment
-        elif line.matched_debit_ids:
-            amount = sum(p.amount for p in line.matched_debit_ids)
+    def _get_paid_amount_this_payment(self, payment, lines):
+        "Get the paid amount for the payment at payment date"
+        agg_amt = 0
+        for line in lines:
+            amount = 0.0
+            total_paid_at_date = 0.0
+            payment.mapped("reconciled_invoice_ids")
+            # Considering the dates of the partial reconcile
+            if line.matched_credit_ids:
+                amount = -1 * sum(
+                    p.amount
+                    for p in line.matched_credit_ids.filtered(
+                        lambda line: line.credit_move_id.date <= payment.date
+                        and (
+                            line.credit_move_id.payment_id == payment
+                            or not line.credit_move_id.payment_id
+                        )
+                    )
+                )
+            # We receive payment
+            elif line.matched_debit_ids:
+                amount = sum(
+                    p.amount
+                    for p in line.matched_debit_ids.filtered(
+                        lambda line: line.debit_move_id.date <= payment.date
+                        and (
+                            line.debit_move_id.payment_id == payment
+                            or not line.debit_move_id.payment_id
+                        )
+                    )
+                )
 
-        # In case of customer payment, we reverse the amounts
-        if payment.partner_type == "customer":
-            amount *= -1
+            # In case of customer payment, we reverse the amounts
+            if payment.partner_type == "customer":
+                amount *= -1
+            amount_to_show = payment.company_id.currency_id.with_context(
+                date=payment.date
+            ).compute(amount, payment.currency_id)
+            if not float_is_zero(
+                amount_to_show, precision_rounding=payment.currency_id.rounding
+            ):
+                total_paid_at_date = amount_to_show
+            agg_amt += total_paid_at_date
+        return agg_amt
 
-        amount_to_show = payment.company_id.currency_id.with_context(
-            date=payment.date
-        ).compute(amount, payment.currency_id)
-        if not float_is_zero(
-            amount_to_show, precision_rounding=payment.currency_id.rounding
-        ):
-            total_amount_to_show = amount_to_show
-        return total_amount_to_show
+    def _get_paid_amount(self, payment, lines):
+        "Get the total paid amount for all payments at the payment date"
+        agg_amt = 0.0
+        for line in lines:
+            amount = 0.0
+            total_amount_to_show = 0.0
+            # Considering the dates of the partial reconcile
+            if line.matched_credit_ids:
+                amount = -1 * sum(
+                    p.amount
+                    for p in line.matched_credit_ids.filtered(
+                        lambda line: line.credit_move_id.date <= payment.date
+                    )
+                )
+            # We receive payment
+            elif line.matched_debit_ids:
+                amount = sum(
+                    p.amount
+                    for p in line.matched_debit_ids.filtered(
+                        lambda line: line.debit_move_id.date <= payment.date
+                    )
+                )
 
-    def _get_total_amount(self, payment, line):
-        amt = line.balance
-        if amt < 0.0:
-            amt *= -1
-        amt = payment.company_id.currency_id.with_context(date=payment.date).compute(
-            amt, payment.currency_id
-        )
-        return amt
+            # In case of customer payment, we reverse the amounts
+            if payment.partner_type == "customer":
+                amount *= -1
+            amount_to_show = payment.company_id.currency_id.with_context(
+                date=payment.date
+            ).compute(amount, payment.currency_id)
+            if not float_is_zero(
+                amount_to_show, precision_rounding=payment.currency_id.rounding
+            ):
+                total_amount_to_show = amount_to_show
+            agg_amt += total_amount_to_show
+        return agg_amt
+
+    def _get_total_amount(self, payment, lines):
+        agg_amt = 0
+        for line in lines:
+            amt = line.balance
+            if amt < 0.0 or line.move_id.move_type in ("in_refund", "out_refund"):
+                amt *= -1
+            amt = payment.company_id.currency_id.with_context(
+                date=payment.date
+            ).compute(amt, payment.currency_id)
+            agg_amt += amt
+        return agg_amt
 
     @api.model
     def _get_report_values(self, docids, data=None):
@@ -96,7 +203,7 @@ def _get_report_values(self, docids, data=None):
             "total_amount": self._get_total_amount,
             "paid_lines": self._get_paid_lines,
             "residual_amount": self._get_residual_amount,
-            "paid_amount": self._get_paid_amount,
+            "paid_amount": self._get_paid_amount_this_payment,
             "_format_date_to_partner_lang": self._format_date_to_partner_lang,
         }
         return docargs
diff --git a/account_check_report/tests/__init__.py b/account_check_report/tests/__init__.py
new file mode 100644
index 000000000000..b16b9bcb0a82
--- /dev/null
+++ b/account_check_report/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_account_check_report
diff --git a/account_check_report/tests/test_account_check_report.py b/account_check_report/tests/test_account_check_report.py
new file mode 100644
index 000000000000..e8513169780b
--- /dev/null
+++ b/account_check_report/tests/test_account_check_report.py
@@ -0,0 +1,280 @@
+# 2016-2021 ForgeFlow S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+import time
+from functools import reduce
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestAccountCheckReport(TransactionCase):
+    def setUp(self):
+        super(TestAccountCheckReport, self).setUp()
+        self.journal_model = self.env["account.journal"]
+        self.account_move_model = self.env["account.move"]
+        self.account_move_line_model = self.env["account.move.line"]
+        self.register_payments_model = self.env["account.payment.register"]
+        self.payment_method_model = self.env["account.payment.method"]
+        self.account_account_model = self.env["account.account"]
+        self.payment_model = self.env["account.payment"]
+        self.payment_method_line_model = self.env["account.payment.method.line"]
+
+        self.partner1 = self.env.ref("base.res_partner_1")
+        self.company = self.env.ref("base.main_company")
+        self.currency_usd_id = self.env.ref("base.USD").id
+        self.currency_euro_id = self.env.ref("base.EUR").id
+        self.acc_payable_type = self.env.ref("account.data_account_type_payable")
+        self.acc_expense_type = self.env.ref("account.data_account_type_expenses")
+        self.product = self.env.ref("product.product_product_4")
+        self.payment_method_check = self.payment_method_model.search(
+            [("code", "=", "check_printing")],
+            limit=1,
+        )
+        self.action_check_report = self.env.ref(
+            "account_check_report.action_report_check_report"
+        )
+        if not self.payment_method_check:
+            self.payment_method_check = self.payment_method_model.create(
+                {
+                    "name": "Check",
+                    "code": "check_printing",
+                    "payment_type": "outbound",
+                    "check": True,
+                }
+            )
+        self.bank_journal = self.journal_model.create(
+            {
+                "name": "Cash Journal - Test",
+                "type": "bank",
+                "code": "bank",
+                "check_manual_sequencing": True,
+                "outbound_payment_method_line_ids": [
+                    (4, self.payment_method_check.id, None)
+                ],
+            }
+        )
+        self.payment_method_line_check = self.payment_method_line_model.create(
+            {
+                "name": "Check",
+                "payment_method_id": self.payment_method_check.id,
+                "journal_id": self.bank_journal.id,
+            }
+        )
+        self.purchase_journal = self.journal_model.create(
+            {
+                "name": "Purchase Journal - Test",
+                "type": "purchase",
+                "code": "Test",
+            }
+        )
+        self.acc_payable = self._create_account(
+            "account payable test", "ACPRB1", self.acc_payable_type, True
+        )
+        self.acc_expense = self._create_account(
+            "account expense test", "ACPRB2", self.acc_expense_type, False
+        )
+        self.partner1.property_account_payable_id = self.acc_payable
+
+    def _create_account(self, name, code, user_type, reconcile):
+        account = self.account_account_model.create(
+            {
+                "name": name,
+                "code": code,
+                "user_type_id": user_type.id,
+                "company_id": self.company.id,
+                "reconcile": reconcile,
+            }
+        )
+        return account
+
+    def _create_vendor_bill(self, account):
+        partner_id = self.partner1.id
+        invoice_vals = {
+            "move_type": "in_invoice",
+            "partner_id": partner_id,
+            "invoice_date": fields.Date.context_today(self.env.user),
+            "invoice_line_ids": [
+                (
+                    0,
+                    0,
+                    {
+                        "name": "Test product",
+                        "quantity": 1,
+                        "account_id": account.id,
+                        "price_unit": 2.99,
+                        "tax_ids": [(6, 0, [])],
+                    },
+                )
+            ],
+        }
+        invoice = (
+            self.env["account.move"]
+            .with_context(default_move_type="out_invoice")
+            .create(invoice_vals)
+        )
+        return invoice
+
+    def _create_payment(self, amount=1.0):
+        payment = self.payment_model.create(
+            {
+                "payment_type": "outbound",
+                "payment_method_id": self.env.ref(
+                    "account.account_payment_method_manual_in"
+                ).id,
+                "partner_type": "supplier",
+                "partner_id": self.partner1.id,
+                "amount": amount,
+                "currency_id": self.company.currency_id.id,
+                "date": time.strftime("%Y-%m-%d"),
+                "journal_id": self.bank_journal.id,
+                "company_id": self.company.id,
+            }
+        )
+        payment.action_post()
+        return payment
+
+    def test_01_check_printing(self):
+        """Test if the report is printed succesfully"""
+        vendor_bill = self._create_vendor_bill(self.acc_expense)
+        vendor_bill.action_post()
+        wiz = self.register_payments_model.with_context(
+            active_ids=[vendor_bill.id], active_model="account.move"
+        ).create(
+            {
+                "journal_id": self.bank_journal.id,
+                "payment_date": fields.Date.from_string("2077-10-23"),
+                "group_payment": True,
+                "payment_method_line_id": self.payment_method_line_check.id,
+            }
+        )
+        payment = wiz._create_payments()
+        content = self.action_check_report._render_qweb_pdf(payment.id)
+        self.assertEqual(content[1], "html")
+
+    def test_02_get_invoices(self):
+        """Test if the lines shown are good (simple case)"""
+        vendor_bill = self._create_vendor_bill(self.acc_expense)
+        vendor_bill2 = self._create_vendor_bill(self.acc_expense)
+        vendor_bill.action_post()
+        vendor_bill2.action_post()
+        wiz = self.register_payments_model.with_context(
+            active_ids=[vendor_bill.id, vendor_bill2.id], active_model="account.move"
+        ).create(
+            {
+                "journal_id": self.bank_journal.id,
+                "payment_date": fields.Date.from_string("2077-10-23"),
+                "group_payment": True,
+                "payment_method_line_id": self.payment_method_line_check.id,
+            }
+        )
+        payment = wiz._create_payments()
+        amls = self.env["report.account_check_report.check_report"]._get_paid_lines(
+            payment
+        )
+        amml_list = [item[0] for item in amls]
+        self.assertIn(
+            vendor_bill.line_ids.filtered(lambda l: l.account_id == self.acc_payable),
+            amml_list,
+        )
+        self.assertTrue(
+            len(
+                vendor_bill.line_ids.filtered(
+                    lambda l: l.account_id == self.acc_payable
+                )
+            )
+            > 0
+        )
+        #  Test button invoices
+        res = payment.button_open_bills()
+        self.assertTrue(vendor_bill.id in res["domain"][1][2])
+
+    def test_00_several_payments(self):
+        """check the amount is correct on partial payments
+        and the line is not repeated if several payments involved"""
+        vendor_bill = self._create_vendor_bill(self.acc_expense)
+        vendor_bill.action_post()
+        vendor_bill2 = self._create_vendor_bill(self.acc_expense)
+        vendor_bill2.action_post()
+        payment = self._create_payment(amount=1)
+        payment2 = self._create_payment(amount=4)
+        payment_ml = payment.line_ids.filtered(
+            lambda l: l.account_id == self.acc_payable
+        )
+        payment2_ml = payment2.line_ids.filtered(
+            lambda l: l.account_id == self.acc_payable
+        )
+        vendor_bill_ml = vendor_bill.line_ids.filtered(
+            lambda l: l.account_id == self.acc_payable
+        )
+        vendor_bill2_ml = vendor_bill2.line_ids.filtered(
+            lambda l: l.account_id == self.acc_payable
+        )
+        # reconcile fully the first bill with 1st payment
+        # the rest with the 2nd payment 1 + 1.99
+        (payment_ml + payment2_ml + vendor_bill_ml).reconcile()
+        # reconcile partially the 2nd payments with the second invoice ($ 2.01 from payment)
+        (payment2_ml + vendor_bill2_ml).reconcile()
+        # PAYMENT CHECK REPORT PAYMENT 1
+        report_lines = self.env[
+            "report.account_check_report.check_report"
+        ]._get_paid_lines(payment)
+        amls_in_report = reduce(lambda x, y: x + y, report_lines)
+        aml_list = [item[0] for item in amls_in_report]
+        # check only the first bill appears
+        self.assertIn(
+            vendor_bill.line_ids.filtered(lambda l: l.account_id == self.acc_payable),
+            aml_list,
+        )
+        self.assertNotIn(
+            vendor_bill2.line_ids.filtered(lambda l: l.account_id == self.acc_payable),
+            aml_list,
+        )
+        # check the values of the line in the report
+        paid_amount = self.env[
+            "report.account_check_report.check_report"
+        ]._get_paid_amount_this_payment(payment, amls_in_report)
+        self.assertEqual(paid_amount, 1.0)
+        residual = self.env[
+            "report.account_check_report.check_report"
+        ]._get_residual_amount(payment, amls_in_report)
+        self.assertEqual(residual, 0.0)
+        total_amount = self.env[
+            "report.account_check_report.check_report"
+        ]._get_total_amount(payment, amls_in_report)
+        self.assertEqual(total_amount, 2.99)
+        # PAYMENT CHECK REPORT PAYMENT 2
+        report_lines = self.env[
+            "report.account_check_report.check_report"
+        ]._get_paid_lines(payment2)
+        amls_in_report = reduce(lambda x, y: x + y, report_lines)
+        aml_list = [item[0] for item in amls_in_report]
+        # check both bill appears
+        self.assertIn(
+            vendor_bill.line_ids.filtered(lambda l: l.account_id == self.acc_payable),
+            aml_list,
+        )
+        self.assertIn(
+            vendor_bill2.line_ids.filtered(lambda l: l.account_id == self.acc_payable),
+            aml_list,
+        )
+        # check the values of the line in the report
+        for aml in amls_in_report:
+            paid_amount = self.env[
+                "report.account_check_report.check_report"
+            ]._get_paid_amount_this_payment(payment2, aml)
+            if aml == vendor_bill_ml:
+                self.assertAlmostEqual(paid_amount, 1.99, places=2)
+            else:
+                self.assertAlmostEqual(paid_amount, 2.01, places=2)
+            residual = self.env[
+                "report.account_check_report.check_report"
+            ]._get_residual_amount(payment2, aml)
+            if aml == vendor_bill_ml:
+                self.assertEqual(residual, 0.0)
+            else:
+                self.assertAlmostEqual(residual, 0.98, places=2)
+            total_amount = self.env[
+                "report.account_check_report.check_report"
+            ]._get_total_amount(payment2, aml)
+            self.assertAlmostEqual(total_amount, 2.99, places=2)