From 2db12fa77b3c261309ed3b4f8e38d4bd9d7a1736 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 25 May 2015 11:22:07 +0200 Subject: [PATCH] Bug 13946: Change order status 'Pending' to 'Ordered' The order status after closing the basket is 'ordered' in the database, but displays as 'pending' in the staff interface. As we use 'pending' when you have to review a suggestion, this clashes in translations and the meaning is different. The patch renames 'pending' for the order status to 'Ordered' to be more clear. To test: - Verfiy 'Ordered' shows in the pull down on the acq advanced search and search still works correctly - Verify the results table also display 'Ordered' as the status --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 77e42a4..8cf89cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -95,9 +95,9 @@ var MSG_REMOVE_PATRON = _("Remove"); [% END %] [% IF orderstatus == "ordered" %] - + [% ELSE %] - + [% END %] [% IF orderstatus == "partial" %] @@ -180,7 +180,7 @@ var MSG_REMOVE_PATRON = _("Remove"); [% SWITCH order.orderstatus %] [% CASE 'new' %]New - [% CASE 'ordered' %]Pending + [% CASE 'ordered' %]Ordered [% CASE 'partial' %]Partially received [% CASE 'complete' %]Received [% CASE 'cancelled' %]Cancelled -- 1.9.1