important: DBD::mysql 4.004 or later required

[koha_ffzg] / tools / inventory.pl

diff --git a/tools/inventory.pl b/tools/inventory.pl
index 94983f6..6c33008 100755 (executable)
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -22,9 +22,8 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Circulation::Circ2;
-use C4::Date;
+use C4::Biblio;
+use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Koha;
 use C4::Branch; # GetBranches
 
@@ -32,8 +31,8 @@ my $input = new CGI;
 my $minlocation=$input->param('minlocation') || 'A';
 my $maxlocation=$input->param('maxlocation');
 $maxlocation=$minlocation.'Z' unless $maxlocation;
+my $location=$input->param('location');
 my $datelastseen = $input->param('datelastseen');
-$datelastseen = format_date_in_iso($datelastseen);
 my $offset = $input->param('offset');
 my $markseen = $input->param('markseen');
 $offset=0 unless $offset;
@@ -43,7 +42,7 @@ my $uploadbarcodes = $input->param('uploadbarcodes');
 my $branchcode = $input->param('branchcode');
 my $op = $input->param('op');
 # warn "uploadbarcodes : ".$uploadbarcodes;
-
+# use Data::Dumper; warn Dumper($input);
 my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "tools/inventory.tmpl",
                 query => $input,
@@ -55,33 +54,56 @@ 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'}, 
                           selected => ($branch_hash eq $branchcode?1:0)};      
 }
-$template->param(branchloop => \@branch_loop,);
+ 
+my @authorised_value_list;
+my $authorisedvalue_categories;
+
+my $dbh=C4::Context->dbh;
+my $rqauthcategorie=$dbh->prepare("select authorised_value from marc_subfield_structure where frameworkcode=? and kohafield='items.location'");
+my $rq=$dbh->prepare("select frameworkcode from biblio_framework");
+$rq->execute;
+while (my ($fwkcode)=$rq->fetchrow){
+  $rqauthcategorie->execute($fwkcode);
+  while (my ($authcat)=$rqauthcategorie->fetchrow){
+    if ($authcat && $authorisedvalue_categories!~/\b$authcat\W/){
+      $authorisedvalue_categories.="$authcat ";
+      my $data=GetAuthorisedValues($authcat);
+      foreach my $value (@$data){
+        $value->{selected}=1 if ($value->{authorised_value} eq ($location));
+      }      
+      push @authorised_value_list,@$data;
+    }  
+  }
+}
 
-$template->param(minlocation => $minlocation,
+
+ 
+$template->param(branchloop => \@branch_loop,
+                authorised_values=>\@authorised_value_list,   
+                DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+                minlocation => $minlocation,
                 maxlocation => $maxlocation,
+                location=>$location,
+                branchcode=>$branchcode,      
                 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($input->param('setdate'));
-    $date = format_date("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;
@@ -98,7 +120,7 @@ if ($uploadbarcodes && length($uploadbarcodes)>0){
                 $qonloan->execute($barcode);
                 if ($qonloan->rows){
                     my $data = $qonloan->fetchrow_hashref;
-                    my ($doreturn, $messages, $iteminformation, $borrower) =returnbook($barcode, $data->{homebranch});
+                    my ($doreturn, $messages, $iteminformation, $borrower) =AddReturn($barcode, $data->{homebranch});
                     if ($doreturn){push @errorloop, {'barcode'=>$barcode,'ERR_ONLOAN_RET'=>1}}
                     else {push @errorloop, {'barcode'=>$barcode,'ERR_ONLOAN_NOT_RET'=>1}}
                 }
@@ -110,19 +132,17 @@ if ($uploadbarcodes && length($uploadbarcodes)>0){
     $qupdate->finish;
     $qonloan->finish;
     $qwthdrawn->finish;
-    $template->param(date=>$date,Number=>$count);
+    $template->param(date=>format_date($date),Number=>$count);
 #      $template->param(errorfile=>$errorfile) if ($errorfile);
     $template->param(errorloop=>\@errorloop) if (@errorloop);
 }else{
     if ($markseen) {
-        foreach my $field ($input->param) {
-            if ($field =~ /SEEN-(.*)/) {
-                &itemseen($1);
-            }
+        foreach ($input->param) {
+            /SEEN-(.+)/ and &ModDateLastSeen($1);
         }
     }
-    if ($op) {
-        my $res = C4::Circulation::Circ2::GetItemsForInventory($minlocation,$maxlocation,$datelastseen,$branchcode,$offset,$pagesize);
+    if ($markseen or $op) {
+        my $res = GetItemsForInventory($minlocation,$maxlocation,$location,$datelastseen,$branchcode,$offset,$pagesize);
         $template->param(loop =>$res,
                         nextoffset => ($offset+$pagesize),
                         prevoffset => ($offset?$offset-$pagesize:0),