From 9e6be55a06bc44450845199dc3db25b4021da7ef Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 27 Apr 2019 13:42:17 +0000 Subject: [PATCH] Bug 21364: (QA follow-up) Fix QA script complaints (tabs and filters) Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- C4/Acquisition.pm | 2 +- .../prog/en/modules/acqui/booksellers.tt | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 6f0f678aa9..38bb24186b 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -685,7 +685,7 @@ sub GetBasketsInfosByBookseller { , aqorders.quantity , 0) ) AS expected_items, - SUM( aqorders.uncertainprice ) AS uncertainprices + SUM( aqorders.uncertainprice ) AS uncertainprices FROM aqbasket LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno WHERE booksellerid = ?}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 024c95ffe2..512eed7015 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -60,21 +60,21 @@ [% END %] [% IF (supplier.name) %] - [% supplier.name | html %] + [% supplier.name | html %] [% ELSE %] - NO NAME + NO NAME [% END %] [% IF ( CAN_user_acquisition_order_manage ) %] [% IF ( supplier.active ) %] - New basket + New basket [% ELSE %] (inactive) [% END %] [% END %] [% IF ( supplier.loop_basket.size ) %] - Receive shipment + Receive shipment [% END %]
@@ -102,7 +102,7 @@ [% END %] [% basket.basketno | html %] - [% basket.basketname | html %] + [% basket.basketname | html %] [% basket.total_items | html %] [% IF basket.total_items_cancelled %] @@ -147,13 +147,13 @@
[%# There should be no space between these two buttons, it would render badly %] - View + View -- 2.39.5