X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Fitemtypes.plugin;h=e4164a5a76f77013d0d7d902b58c07de4fe0d630;hb=789c562e188ce2705fb94cc79403a7616cb092e3;hp=d541429932b66678bf5c9a59f3513ae1c2d712b7;hpb=6e7a4d3a3da8db196dddb502c09817dd291f3590;p=koha_fer

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index d541429932..e4164a5a76 100755
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -22,7 +22,6 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
@@ -32,27 +31,15 @@ use C4::Branch; # GetBranches
 =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) = @_;
+    my $userbranch = '';
+    if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
+        $userbranch = C4::Context->userenv->{'branch'};
+    }
+    $template->param( branchloop => GetBranchesLoop($userbranch) );
+    return $template;
 }
+
 sub calculate {
 	my ($parameters) = @_;
 	my @results =();
@@ -66,7 +53,8 @@ sub calculate {
 			FROM itemtypes,items         
 		WHERE items.itype=itemtypes.itemtype         
 		AND items.holdingbranch=?            
-		GROUP BY  items.itype");
+		GROUP BY items.itype
+		ORDER BY itemtypes.description");
 
 		}
 		else {
@@ -76,7 +64,8 @@ sub calculate {
 		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 {
@@ -85,14 +74,16 @@ sub calculate {
 		SELECT 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
 			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;
 	}
@@ -117,6 +108,7 @@ sub calculate {
 	$globalline{loopitemtype} = \@results;
 	$globalline{total} = $grantotal;
 	$globalline{branch} = $branch;
+	$globalline{branchname} = GetBranchName($branch);
 	push @mainloop,\%globalline;
 	return \@mainloop;
 }