From b46336608ea3d78b1b8e80239d0996fc5c12769c Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Thu, 12 May 2016 04:46:54 +0000
Subject: [PATCH] Bug 16454: Use 'inventory' instead of
 'inventory/stocktaking'

To test:
1) Go to the tools home page. Confirm it says 'Inventory' instead of 'Inventory/stocktaking'
2) Click Inventory. Confirm heading now says 'Inventory' instead of 'Inventory/stocktaking'
3) Confirm that it now says 'Inventory' instead of 'Inventory/stocktaking' in the tools menu along the left of the page
4) Click Help in top right corner. Confirm help heading now says 'Inventory' instead of 'Inventory/stocktaking'

Sponsored-by: Catalyst IT
---
 koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc         |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt      |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index 9a2b1bf..a918e2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -75,7 +75,7 @@
     <li><a href="/cgi-bin/koha/tools/export.pl">Export data</a></li>
     [% END %]
     [% IF ( CAN_user_tools_inventory ) %]
-	<li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></li>
+	<li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></li>
     [% END %]
     [% IF ( CAN_user_tools_label_creator ) %]
 	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
index b767743..e885a33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Inventory/Stocktaking</h1>
+<h1>Inventory</h1>
 
 <p>Koha's Inventory Tool can be used in one of two ways, the first is by printing out a shelf list that you can then mark items off on, or by uploading a text files of barcodes gathered by a portable scanner.</p>
 
@@ -18,4 +18,4 @@
 
 <p><strong>See the full documentation for Inventory in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/inventory.html">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index 8b5c4d9..ef92067 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -101,7 +101,7 @@ $(document).ready(function(){
    <div id="bd">
     <div id="yui-main">
     <div class="yui-b">
-    <h1>Inventory/Stocktaking</h1>
+    <h1>Inventory</h1>
     [% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date | $KohaDates %]</div>
     <div class="dialog alert">Number of potential barcodes read: [% LinesRead %]</div>[% END %]
     [% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index a8f8ff4..9432934 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -145,7 +145,7 @@
     [% END %]
 
     [% IF ( CAN_user_tools_inventory ) %]
-    <dt><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></dt>
+    <dt><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></dt>
     <dd>Perform inventory (stocktaking) of your catalog</dd>
     [% END %]
 
-- 
1.7.10.4