X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Fitemtypes.plugin;h=6884369ce2859b8a06badcb6db8cfc8851cff8c1;hb=9325e6b6989baab9e3b072d397a3bea277eb7cd5;hp=f543f2d0fe97997b0b00d8f3702676319558a267;hpb=f21577986f8ff5da5fde88deaae2302a8b40dbe7;p=srvgit

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index f543f2d0fe..6884369ce2 100755
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -5,53 +5,35 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
-use C4::Branch; # GetBranches
 =head1
 
 =cut
 
 sub set_parameters {
-	my ($template) = @_;
-	my $dbh = C4::Context->dbh;
-	my $branches=GetBranches();
-	my @branches;
-	my @select_branch;
-	my %select_branches;
-	push @select_branch,"";
-	$select_branches{""} = "";
-	foreach my $branch (keys %$branches) {
-		push @select_branch, $branch;
-		$select_branches{$branch} = $branches->{$branch}->{'branchname'};
-	}
-	my $CGIbranch=CGI::scrolling_list( -name     => 'value',
-				-id => 'value',
-				-values   => \@select_branch,
-				-labels   => \%select_branches,
-				-size     => 1,
-				-multiple => 0 );
-	$template->param(CGIbranch => $CGIbranch);
-	return $template;
+    my ($template) = @_;
+    return $template;
 }
+
 sub calculate {
 	my ($parameters) = @_;
 	my @results =();
@@ -61,51 +43,55 @@ sub calculate {
 	if ($branch) {
 		if (C4::Context->preference('item-level_itypes')) {
 		$sth = $dbh->prepare("
-        SELECT description, items.itype as itemtype, COUNT(*) AS total 
+        SELECT itemtype, description, items.itype as itemtype, COUNT(*) AS total
 			FROM itemtypes,items         
 		WHERE items.itype=itemtypes.itemtype         
 		AND items.holdingbranch=?            
-		GROUP BY  items.itype");
+		GROUP BY items.itype
+		ORDER BY itemtypes.description");
 
 		}
 		else {
 		$sth = $dbh->prepare("
-		SELECT description, biblioitems.itemtype, COUNT(*) AS total 
+        SELECT biblioitems.itemtype, description, biblioitems.itemtype, COUNT(*) AS total
 			FROM itemtypes, biblioitems, items 
 		WHERE biblioitems.itemtype=itemtypes.itemtype 
 		AND items.biblioitemnumber=biblioitems.biblioitemnumber
 		AND items.holdingbranch=?
-			GROUP BY  biblioitems.itemtype");
+			GROUP BY  biblioitems.itemtype
+			ORDER BY itemtypes.description");
 		}
 		$sth->execute($branch);
 	} else {
 		if (C4::Context->preference('item-level_itypes')) {
 		$sth = $dbh->prepare("
-		SELECT description,items.itype AS itemtype, COUNT(*) AS total 
+        SELECT biblioitems.itemtype, description,items.itype AS itemtype, COUNT(*) AS total
 			FROM itemtypes,items
 		WHERE items.itype=itemtypes.itemtype
-			GROUP BY items.itype");
+			GROUP BY items.itype
+			ORDER BY itemtypes.description");
 		}
 		else {
-		$sth = $dbh->prepare("SELECT description, biblioitems.itemtype, COUNT(*) AS total
+        $sth = $dbh->prepare("SELECT itemtype, description, biblioitems.itemtype, COUNT(*) AS total
 			FROM itemtypes, biblioitems,items 
 		WHERE biblioitems.itemtype=itemtypes.itemtype 
 		AND biblioitems.biblioitemnumber = items.biblioitemnumber
-			GROUP BY biblioitems.itemtype");
+			GROUP BY biblioitems.itemtype
+			ORDER BY itemtypes.description");
 		}
 		$sth->execute;
 	}
-	my ($description,$biblioitems,$total);
+    my ($itemtype, $description,$biblioitems,$total);
 	my $grantotal = 0;
 	my $count = 0;
-	while (($description,$biblioitems,$total) = $sth->fetchrow) {
+    while (($itemtype, $description,$biblioitems,$total) = $sth->fetchrow) {
 		my %line;
 		if($count % 2){
 			$line{toggle} = 1;
 			} else {
 				$line{toggle} = 0;
 			}
-		$line{itemtype} = $description;
+        $line{itemtype} = $itemtype;
 		$line{count} = $total;
 		$grantotal += $total;
 		push @results,\%line;