# 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., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# 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.
use strict;
use warnings;
my $minlocation=$input->param('minlocation') || '';
my $maxlocation=$input->param('maxlocation');
$maxlocation=$minlocation.'Z' unless ( $maxlocation || ! $minlocation );
-my $location=$input->param('location');
-my $itemtype=$input->param('itemtype');
+my $location=$input->param('location') || '';
+my $itemtype=$input->param('itemtype'); # FIXME note, template does not currently supply this
my $ignoreissued=$input->param('ignoreissued');
my $datelastseen = $input->param('datelastseen');
my $offset = $input->param('offset');
$offset=0 unless $offset;
my $pagesize = $input->param('pagesize');
$pagesize=50 unless $pagesize;
-my $branchcode = $input->param('branchcode');
+my $branchcode = $input->param('branchcode') || '';
+my $branch = $input->param('branch');
my $op = $input->param('op');
my $res; #contains the results loop
# warn "uploadbarcodes : ".$uploadbarcodes;
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;
+my $authorisedvalue_categories = '';
my $frameworks = getframeworks();
+$frameworks->{''} = {frameworkcode => ''}; # Add the default framework
+
for my $fwk (keys %$frameworks){
my $fwkcode = $frameworks->{$fwk}->{'frameworkcode'};
my $authcode = GetAuthValCode('items.location', $fwkcode);
}
my $statuses = [];
-for my $statfield (qw/items.notforloan items.itemlost items.wthdrawn items.damaged/){
+for my $statfield (qw/items.notforloan items.itemlost items.withdrawn items.damaged/){
my $hash = {};
$hash->{fieldname} = $statfield;
$hash->{authcode} = GetAuthValCode($statfield);
for my $authvfield (@$statuses) {
$staton->{$authvfield->{fieldname}} = [];
for my $authval (@{$authvfield->{values}}){
- if ( $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{id}) eq 'on' ){
+ if ( defined $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{id}) && $input->param('status-' . $authvfield->{fieldname} . '-' . $authval->{id}) eq 'on' ){
push @{$staton->{$authvfield->{fieldname}}}, $authval->{id};
}
}
$template->param(branchloop => \@branch_loop,
authorised_values=>\@authorised_value_list,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
today => C4::Dates->today(),
minlocation => $minlocation,
maxlocation => $maxlocation,
location=>$location,
ignoreissued=>$ignoreissued,
branchcode=>$branchcode,
+ branch => $branch,
offset => $offset,
pagesize => $pagesize,
datelastseen => $datelastseen,
# warn "$date";
my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
my $qonloan = $dbh->prepare($strsth);
- $strsth="select * from items where items.barcode =? and items.wthdrawn = 1";
- my $qwthdrawn = $dbh->prepare($strsth);
+ $strsth="select * from items where items.barcode =? and items.withdrawn = 1";
+ my $qwithdrawn = $dbh->prepare($strsth);
my @errorloop;
my $count=0;
while (my $barcode=<$uploadbarcodes>){
$barcode =~ s/\r?\n$//;
- if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){
+ if ($qwithdrawn->execute($barcode) &&$qwithdrawn->rows){
push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1};
}else{
my $item = GetItem('', $barcode);
}
}
$qonloan->finish;
- $qwthdrawn->finish;
+ $qwithdrawn->finish;
$template->param(date=>format_date($date),Number=>$count);
# $template->param(errorfile=>$errorfile) if ($errorfile);
$template->param(errorloop=>\@errorloop) if (@errorloop);
}
}
if ($markseen or $op) {
- $res = GetItemsForInventory($minlocation,$maxlocation,$location, $ignoreissued,$datelastseen,$branchcode,$offset,$pagesize,$staton);
+ $res = GetItemsForInventory( $minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $branch, $offset, $pagesize, $staton );
$template->param(loop =>$res,
nextoffset => ($offset+$pagesize),
prevoffset => ($offset?$offset-$pagesize:0),
);
}
- if ( ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){
+ if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){
if ( scalar @brcditems > scalar @$res ){
for my $brcditem (@brcditems) {
- if (! grep(/$brcditem->{barcode}/, @$res) ){
+ if (! grep( $_->{barcode} =~ /$brcditem->{barcode}/ , @$res) ){
$brcditem->{notfoundkoha} = 1;
push @$res, $brcditem;
}
} else {
my @notfound;
for my $item (@$res) {
- if ( ! grep(/$item->{barcode}/, @brcditems) ){
+ if ( ! grep( $_->{barcode} =~ /$item->{barcode}/ , @brcditems) ){
$item->{notfoundbarcode} = 1;
push @notfound, $item;
}
}
}
-if ($input->param('CSVexport') eq 'on'){
+if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){
eval {use Text::CSV};
my $csv = Text::CSV->new or
die Text::CSV->error_diag ();