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 @@ Billing date Received bibliographic records Received items + Total Status   @@ -91,6 +93,13 @@ [% invoice.billingdate | $KohaDates %] [% invoice.receivedbiblios | html %] [% invoice.receiveditems | html %] + + [% 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 %] + [% IF invoice.closedate %] Closed on [% invoice.closedate | $KohaDates %]