From ce3643073a4cfce9c3da2b4b106d8b7c5e2788c1 Mon Sep 17 00:00:00 2001
From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk>
Date: Thu, 11 Jun 2026 17:05:09 +0100
Subject: [PATCH] Bug 39959: Add a total column to the invoices table

Test plan:
1. Create an order and receive it to create an invoice
2. In the invoices search, look for your invoice
3. There will be no total against the invoice
4. Apply patch and restart_all
5. Refresh the page, the total column should now be present

Signed-off-by: Coleen Lilly <clilly@aacpl.net>
Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
---
 C4/Acquisition.pm                                        | 3 ++-
 .../intranet-tmpl/prog/en/modules/acqui/invoices.tt      | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 728f95bb01..7d076f8810 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2418,6 +2418,7 @@ sub GetInvoices {
     my $query = qq{
         SELECT aqinvoices.invoiceid, aqinvoices.invoicenumber, aqinvoices.booksellerid, aqinvoices.shipmentdate, aqinvoices.billingdate, aqinvoices.closedate, aqinvoices.shipmentcost, aqinvoices.shipmentcost_budgetid, aqinvoices.message_id,
             aqbooksellers.name AS suppliername,
+            aqbooksellers.invoiceincgst,
           COUNT(
             DISTINCT IF(
               aqorders.datereceived IS NOT NULL,
@@ -2538,7 +2539,7 @@ sub GetInvoices {
     }
 
     $query .=
-        " GROUP BY aqinvoices.invoiceid, aqinvoices.invoicenumber, aqinvoices.booksellerid, aqinvoices.shipmentdate, aqinvoices.billingdate, aqinvoices.closedate, aqinvoices.shipmentcost, aqinvoices.shipmentcost_budgetid, aqinvoices.message_id, aqbooksellers.name";
+        " GROUP BY aqinvoices.invoiceid, aqinvoices.invoicenumber, aqinvoices.booksellerid, aqinvoices.shipmentdate, aqinvoices.billingdate, aqinvoices.closedate, aqinvoices.shipmentcost, aqinvoices.shipmentcost_budgetid, aqinvoices.message_id, aqbooksellers.name, aqbooksellers.invoiceincgst";
 
     if ( $args{order_by} ) {
         my ( $column, $direction ) = split / /, $args{order_by};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 1ccefdb509..58476ef984 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -4,6 +4,7 @@
 [% USE AuthorisedValues %]
 [% USE KohaDates %]
 [% USE Branches %]
+[% USE Price %]
 [% SET footerjs = 1 %]
 [% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -66,6 +67,7 @@
                                         <th>Billing date</th>
                                         <th>Received bibliographic records</th>
                                         <th>Received items</th>
+                                        <th>Total</th>
                                         <th>Status</th>
                                         <th class="no-sort">&nbsp;</th>
                                     </tr>
@@ -91,6 +93,13 @@
                                             <td data-order="[% invoice.billingdate | html %]"> [% invoice.billingdate | $KohaDates %] </td>
                                             <td>[% invoice.receivedbiblios | html %]</td>
                                             <td>[% invoice.receiveditems | html %]</td>
+                                            <td>
+                                                [% IF invoice.invoiceincgst %]
+                                                    [% invoice.total_tax_included + invoice.total_adj + invoice.shipmentcost | $Price %]
+                                                [% ELSE %]
+                                                    [% invoice.total_tax_excluded + invoice.total_adj + invoice.shipmentcost | $Price %]
+                                                [% END %]
+                                            </td>
                                             <td>
                                                 [% IF invoice.closedate %]
                                                     <span>Closed on [% invoice.closedate | $KohaDates %]</span>