From a8927736dc9ebcf912ce8100f09dedc02c05de29 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Fri, 23 Apr 2010 22:25:10 -0400
Subject: [PATCH] Bug 4307: Sorts library locations in inventory drop-down
 list.

Replacement patch for previous patch submitted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl | 1 +
 tools/inventory.pl                                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index d521761a9f..0b350006fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -77,6 +77,7 @@ $(document).ready(function(){
         <legend>Select items you want to check</legend>
         <ol><li>
         <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
+            <option value="">All Locations</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
             <!-- TMPL_IF name="selected" -->
                 <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 56f0bcb687..c87a7e9aff 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -65,13 +65,13 @@ my ($template, $borrowernumber, $cookie)
 
 my $branches = GetBranches();
 my @branch_loop;
-push @branch_loop, {value => "", branchname => "All Locations", };
 for my $branch_hash (keys %$branches) {
 	push @branch_loop, {value => "$branch_hash",
 	                   branchname => $branches->{$branch_hash}->{'branchname'}, 
 	                   selected => ($branch_hash eq $branchcode?1:0)};	
 }
 
+@branch_loop = sort {$a->{branchname} cmp $b->{branchname}} @branch_loop;
 my @authorised_value_list;
 my $authorisedvalue_categories;
 
-- 
2.39.5