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::Items;
+use C4::Dates qw/format_date format_date_in_iso/;
use C4::Koha;
use C4::Branch; # GetBranches
my $input = new CGI;
-my $minlocation=$input->param('minlocation') || 'A';
+my $minlocation=$input->param('minlocation') || '';
my $maxlocation=$input->param('maxlocation');
-$maxlocation=$minlocation.'Z' unless $maxlocation;
+$maxlocation=$minlocation.'Z' unless ( $maxlocation || ! $minlocation );
+my $location=$input->param('location');
+my $itemtype=$input->param('itemtype');
+my $ignoreissued=$input->param('ignoreissued');
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;
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,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {tools => 1},
+ flagsrequired => {tools => 'inventory'},
debug => 1,
});
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)};
}
+
+
+my $itemtypes = GetItemTypes;
+my @itemtypesloop;
+foreach my $thisitemtype (sort keys %$itemtypes) {
+ my $selected = 1 if $thisitemtype eq $itemtype;
+ my %row =(value => $thisitemtype,
+ selected => $selected,
+ description => $itemtypes->{$thisitemtype}->{'description'},
+ );
+ push @itemtypesloop, \%row;
+}
+$template->param(itemtypeloop => \@itemtypesloop);
+
+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(branchloop => \@branch_loop,
- DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+ authorised_values=>\@authorised_value_list,
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
minlocation => $minlocation,
maxlocation => $maxlocation,
+ location=>$location,
+ ignoreissued=>$ignoreissued,
+ 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";
+ my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
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 items.wthdrawn = 1";
my $qwthdrawn = $dbh->prepare($strsth);
my @errorloop;
my $count=0;
while (my $barcode=<$uploadbarcodes>){
- chomp $barcode;
-# warn "$barcode";
+ $barcode =~ s/\r?\n$//;
if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){
push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1};
}else{
- $qupdate->execute($barcode);
- $count += $qupdate->rows;
-# warn "$count";
- if ($count){
+ my $item = GetItem('', $barcode);
+ if (defined $item && $item->{'itemnumber'}){
+ ModItem({ datelastseen => $date }, undef, $item->{'itemnumber'});
+ $count++;
$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}}
}
}
}
}
- $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,$itemtype,$ignoreissued,$datelastseen,$branchcode,$offset,$pagesize);
$template->param(loop =>$res,
nextoffset => ($offset+$pagesize),
prevoffset => ($offset?$offset-$pagesize:0),
projects / koha.git / blobdiff