Win32 support: Switch DEBUG off and corrected warning bug.

[koha.git] / tools / inventory.pl

diff --git a/tools/inventory.pl b/tools/inventory.pl
index a029009..6c33008 100755 (executable)
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -23,7 +23,7 @@ use C4::Auth;
 use C4::Context;
 use C4::Output;
 use C4::Biblio;
-use C4::Date;
+use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Koha;
 use C4::Branch; # GetBranches
 
@@ -54,7 +54,7 @@ my ($template, $borrowernumber, $cookie)
 
 my $branches = GetBranches();
 my @branch_loop;
-push @branch_loop, {value => "", branchname => "All Branches", };
+push @branch_loop, {value => "", branchname => "All Locations", };
 for my $branch_hash (keys %$branches) {
        push @branch_loop, {value => "$branch_hash",
                           branchname => $branches->{$branch_hash}->{'branchname'}, 
@@ -86,7 +86,7 @@ while (my ($fwkcode)=$rq->fetchrow){
  
 $template->param(branchloop => \@branch_loop,
                 authorised_values=>\@authorised_value_list,   
-                DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+                DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
                 minlocation => $minlocation,
                 maxlocation => $maxlocation,
                 location=>$location,
@@ -94,20 +94,16 @@ $template->param(branchloop => \@branch_loop,
                 offset => $offset,
                 pagesize => $pagesize,
                 datelastseen => $datelastseen,
-                intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-                intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-                IntranetNav => C4::Context->preference("IntranetNav"),
                 );
 if ($uploadbarcodes && length($uploadbarcodes)>0){
     my $dbh=C4::Context->dbh;
-    my $date=format_date_in_iso($input->param('setdate'));
-    $date = format_date_in_iso("today") unless $date;
+    my $date = format_date_in_iso($input->param('setdate')) || C4::Dates->today('iso');
 #      warn "$date";
     my $strsth="update items set (datelastseen = $date) where items.barcode =?";
     my $qupdate = $dbh->prepare($strsth);
-    my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =? and issues.returndate is null";
+    $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =? and issues.returndate is null";
     my $qonloan = $dbh->prepare($strsth);
-    my $strsth="select * from items where items.barcode =? and issues.wthdrawn=1";
+    $strsth="select * from items where items.barcode =? and issues.wthdrawn=1";
     my $qwthdrawn = $dbh->prepare($strsth);
     my @errorloop;
     my $count=0;
@@ -141,18 +137,11 @@ if ($uploadbarcodes && length($uploadbarcodes)>0){
     $template->param(errorloop=>\@errorloop) if (@errorloop);
 }else{
     if ($markseen) {
-        foreach my $field ($input->param) {
-            if ($field =~ /SEEN-(.*)/) {
-                &ModDateLastSeen($1);
-            }
+        foreach ($input->param) {
+            /SEEN-(.+)/ and &ModDateLastSeen($1);
         }
-        my $res = GetItemsForInventory($minlocation,$maxlocation,$location,$datelastseen,$branchcode,$offset,$pagesize);
-        $template->param(loop =>$res,
-                        nextoffset => ($offset+$pagesize),
-                        prevoffset => ($offset?$offset-$pagesize:0),
-                        );
     }
-    if ($op) {
+    if ($markseen or $op) {
         my $res = GetItemsForInventory($minlocation,$maxlocation,$location,$datelastseen,$branchcode,$offset,$pagesize);
         $template->param(loop =>$res,
                         nextoffset => ($offset+$pagesize),