From 7599a6c4dca9cb2744b8695edef8192202d37b9d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Feb 2021 14:20:14 +0000 Subject: [PATCH] Bug 27795: Misalignment of TOTAL value in lateorders page This patch corrects the colspan in the footer of the late orders page. It also adds a quantity total cell to the footer and changes the container of the buttons at the bottom of the page from a

tag to the standard

. To test, apply the patch and go to Acquisitions -> Late orders. In the footer of the late orders page, there should be a total under the "Quantity" column. The total cost number should be correctly aligned under the "total cost" header cell. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 42a32bc1727dc4723e07a83cc53e5951a09a20b2) Signed-off-by: Fridolin Somers (cherry picked from commit 1100dcf0fc69de841eef23f8e1b3c1b390b48fbc) Signed-off-by: Andrew Fuerste-Henry --- .../prog/en/modules/acqui/lateorders.tt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 3ce632ba30..84714c18b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -50,6 +50,7 @@

[% END %] [% SET total = 0 %] + [% SET total_quantity = 0 %] [% IF bookseller_filter %]

Check all Uncheck all

[% END %] @@ -106,7 +107,10 @@ [% END %] [% END %] - [% lateorder.quantity | html %] + + [% lateorder.quantity | html %] + [% SET total_quantity = total_quantity + lateorder.quantity %] + [% SET subtotal = (lateorder.quantity - lateorder.quantityreceived) * lateorder.rrp %] [% SET total = total + subtotal %] @@ -174,14 +178,14 @@ Total + [% total_quantity | html %] [% total | $Price %]   -
-

+

Export as CSV @@ -196,7 +200,7 @@
-

+
[% ELSE %]

There are no late orders.

[% END %] -- 2.39.5