From 277ced2a58625d21e916aea4608f27e5660e5c6c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 2 Oct 2013 09:58:14 +0200 Subject: [PATCH] Bug 5336: Multiple QA fixes - add a message if the search returns no result - keep selected values if the search returns no result (for fund and order status) - remove plurals in order status - move the order status column in the search results table --- acqui/histsearch.pl | 2 + .../prog/en/modules/acqui/histsearch.tt | 64 ++++++++++++++------ 2 files changed, 49 insertions(+), 17 deletions(-) diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl index e9e4009..7e26f97 100755 --- a/acqui/histsearch.pl +++ b/acqui/histsearch.pl @@ -149,6 +149,8 @@ $template->param( basketgroupname => $basketgroupname, from_placed_on => $from_date, to_placed_on => $to_date, + orderstatus => $orderstatus, + budget_id => $budget, bp_loop => $bp_loop, debug => $debug || $input->param('debug') || 0, uc(C4::Context->preference("marcflavour")) => 1 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index fe6623b..9c75709 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -51,12 +51,36 @@
  • @@ -66,7 +90,11 @@ [% FOREACH bp_loo IN bp_loop %] [% FOREACH h_loo IN bp_loo.hierarchy %] + [% IF h_loo.budget_id == budget_id %] + [% END %] @@ -94,6 +122,7 @@ Order line (parent) + Status Basket Basket group Invoice number @@ -101,7 +130,6 @@ Vendor Placed on Received on - Status Quantity received Pending order Unit cost @@ -115,6 +143,15 @@ [% order.ordernumber %] [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %] + + [% SWITCH order.orderstatus %] + [% CASE 'new' %]New + [% CASE 'ordered' %]Pending + [% CASE 'partial' %]Partially received + [% CASE 'complete' %]Received + [% CASE 'cancelled' %]Cancelled + [% END %] + [% order.basketname %] ([% order.basketno %]) [% IF ( order.basketgroupid ) %] @@ -140,15 +177,6 @@ [% order.datereceived | $KohaDates %] [% END %] - - [% SWITCH order.orderstatus %] - [% CASE 'new' %]New orders - [% CASE 'ordered' %]Pending orders - [% CASE 'partial' %]Partially received orders - [% CASE 'complete' %]Received orders - [% CASE 'cancelled' %]Cancelled orders - [% END %] - [% order.quantityreceived %] [% order.quantity %] [% order.ecost %] @@ -157,7 +185,9 @@ [% END %] - [% ELSE %][% END %] + [% ELSE %] + There is no order for this search. + [% END %] -- 1.7.10.4