From 5d3ea96e578fa4b0a143cc26330c7d4ff689ef4b Mon Sep 17 00:00:00 2001 From: Aleisha 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' in heading and in description 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' 5) Go to user account page, go to Set Permissions 6) Expand Tools option and confirm it says 'inventory' instead of 'inventory (stocktaking)' Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc | 2 +- .../prog/en/modules/help/members/member-flags.tt | 2 +- .../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 | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index 68c6001bd3..6a80ba18d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -63,7 +63,7 @@ [%- CASE 'edit_quotes' -%]Edit quotes for quote-of-the-day feature [%- CASE 'export_catalog' -%]Export bibliographic and holdings data [%- CASE 'import_patrons' -%]Import patron data - [%- CASE 'inventory' -%]Perform inventory (stocktaking) of your catalog + [%- CASE 'inventory' -%]Perform inventory of your catalog [%- CASE 'items_batchdel' -%]Perform batch deletion of items [%- CASE 'items_batchmod' -%]Perform batch modification of items [%- CASE 'items_batchmod_restricted' -%]Limit batch item modification to subfields defined in the SubfieldsToAllowForRestrictedBatchmod preference (please note that items_batchmod is still required) 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 9a2b1bf09d..a918e2a829 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 @@
  • Export data
    • [% END %] [% IF ( CAN_user_tools_inventory ) %] -
  • Inventory/stocktaking
    • +
  • Inventory
    • [% END %] [% IF ( CAN_user_tools_label_creator ) %]
  • Label creator
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt index 72823de18b..974a2157a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt @@ -410,7 +410,7 @@
  • inventory
      -
    • Perform inventory (stocktaking) of your catalog
      • +
    • Perform inventory of your catalog
    • Access to the Inventory Tool
    • 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 b767743a37..e885a33cff 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' %] -

    Inventory/Stocktaking

    +

    Inventory

    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.

    @@ -18,4 +18,4 @@

    See the full documentation for Inventory in the manual (online).

    -[% 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 8b5c4d98b2..ef920676fc 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(){
    -

    Inventory/Stocktaking

    +

    Inventory

    [% IF (moddatecount) %]
    [% moddatecount %] items modified : datelastseen set to [% date | $KohaDates %]
    Number of potential barcodes read: [% LinesRead %]
    [% END %] [% IF (errorfile) %]
    [% errorfile %] can't be opened
    [% 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 a8f8ff4d88..09bc4b647e 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,8 +145,8 @@ [% END %] [% IF ( CAN_user_tools_inventory ) %] -
    Inventory/stocktaking
    -
    Perform inventory (stocktaking) of your catalog
    +
    Inventory
    +
    Perform inventory of your catalog
    [% END %] [% IF ( CAN_user_tools_label_creator ) %] -- 2.39.5