various installer changes

[koha_fer] / reports / itemtypes.plugin

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index 61f05df..71b00a3 100644 (file)
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -23,11 +22,11 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
+use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
-
+use C4::Branch; # GetBranches
 =head1
 
 =cut
@@ -35,7 +34,7 @@ use C4::Koha;
 sub set_parameters {
        my ($template) = @_;
        my $dbh = C4::Context->dbh;
-       my $branches=getbranches();
+       my $branches=GetBranches();
        my @branches;
        my @select_branch;
        my %select_branches;
@@ -63,12 +62,13 @@ sub calculate {
        if ($branch) {
                $sth = $dbh->prepare("select description, biblioitems.itemtype, count(*) as total from itemtypes, biblioitems, items 
                                                where biblioitems.itemtype=itemtypes.itemtype 
-                                                       and items.biblionumber=biblioitems.biblionumber
+                                                       and items.biblioitemnumber=biblioitems.biblioitemnumber
                                                        and items.holdingbranch=?
                                                group by biblioitems.itemtype");
                $sth->execute($branch);
        } else {
-               $sth = $dbh->prepare("select description, biblioitems.itemtype, count(*) as total from itemtypes, biblioitems where biblioitems.itemtype=itemtypes.itemtype group by biblioitems.itemtype");
+               $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");
                $sth->execute;
        }
        my ($description,$biblioitems,$total);
@@ -96,4 +96,4 @@ sub calculate {
        return \@mainloop;
 }
 
-1;
\ No newline at end of file
+1;