From 83387bf3b1d9eb8710e184269338361ac1477d1c Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sun, 31 May 2015 15:52:26 +0200
Subject: [PATCH] Bug 14163: Acq - receive shipment and order from staged:
 rename 'Show all' to 'Show inactive'

'Show all' in acquisition makes the inactive funds in the fund list
box visible. This patch changes the text to 'Show inactive' to be more
clear about the functionality.

Patch changes 2 pages. To test:

1) Order from staged file
- make sure you have uploaded a few records via the tools
- create a new order using the 'From a staged file' option
- select a file to order from - 'Add orders'
- Verify the 'Select to import' tab now displayed the text
  'Show inactive funds' and that it works as expected
- Switch to the 'Default accounting details' tab
- Verify the text there is also changed to 'Show inactive' and
  works like expected.

2) Receive shipment
- receive a new shipment for a vendor with unreceived orders
- Verify the label next to the fund list has changed to
  'Show inactive' and works as expected.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Simple string change, no errors.

Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index d0414cf6fa..bf6c0b648b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -179,7 +179,7 @@
                   <div id="records_to_import">
                     <span class="checkall"><a id="checkAll" href="#">Check all</a></span>
                     <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck all</a></span>
-                    <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show all funds:</label>
+                    <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show inactive funds:</label>
                     <input type="checkbox" id="showallbudgets" />
                         <input type="hidden" name="op" value="import_records"/>
                         <input type="hidden" name="basketno" value="[% basketno %]" />
@@ -353,7 +353,7 @@
                                                 [% END %]
                                             [% END %]
                                             </select>
-                                            <label for="all_showallbudgets" style="float:none;width:auto;">&nbsp;Show all:</label>
+                                            <label for="all_showallbudgets" style="float:none;width:auto;">&nbsp;Show inactive:</label>
                                             <input type="checkbox" id="all_showallbudgets" />
                                         </li>
                                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index fe0f0f5a79..486fac2a15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -191,7 +191,7 @@
                     [% END %]
                 [% END %]
             </select>
-            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show all:</label>
+            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
             <input type="checkbox" id="showallfunds" />
 
         </li>
-- 
2.11.0