From 0f0fc26c609d98a550f49c5828b781345edaeadf 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' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Cédric Vita Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 480ac8667971a638b4b27d0dc8e5bb29f9f2a372) Signed-off-by: Chris Cormack --- 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 77e42a42ae..8cf89cc6ac 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 -- 2.39.5