projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 11766 - Use validation plugin when creating new authority type
[koha_fer]
/
circ
/
waitingreserves.pl
diff --git
a/circ/waitingreserves.pl
b/circ/waitingreserves.pl
index
c9c9f0e
..
1ec6b2d
100755
(executable)
--- a/
circ/waitingreserves.pl
+++ b/
circ/waitingreserves.pl
@@
-73,7
+73,7
@@
if ($item) {
push @cancel_result, $res if $res;
}
push @cancel_result, $res if $res;
}
-if ( C4::Context->preference('Independ
a
ntBranches') ) {
+if ( C4::Context->preference('Independ
e
ntBranches') ) {
undef $all_branches;
} else {
$template->param( all_branches_link => $input->url . '?allbranches=1' )
undef $all_branches;
} else {
$template->param( all_branches_link => $input->url . '?allbranches=1' )
@@
-96,12
+96,6
@@
foreach my $num (@getreserves) {
my $holdingbranch = $gettitle->{'holdingbranch'};
my $homebranch = $gettitle->{'homebranch'};
my $holdingbranch = $gettitle->{'holdingbranch'};
my $homebranch = $gettitle->{'homebranch'};
- if ($cancelall) {
- my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all );
- push @cancel_result, $res if $res;
- next;
- }
-
my %getreserv = (
itemnumber => $itemnumber,
borrowernum => $borrowernum,
my %getreserv = (
itemnumber => $itemnumber,
borrowernum => $borrowernum,
@@
-139,8
+133,14
@@
foreach my $num (@getreserves) {
}
if ($today > $calcDate) {
}
if ($today > $calcDate) {
- push @overloop, \%getreserv;
- $overcount++;
+ if ($cancelall) {
+ my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all );
+ push @cancel_result, $res if $res;
+ next;
+ } else {
+ push @overloop, \%getreserv;
+ $overcount++;
+ }
}else{
push @reservloop, \%getreserv;
$reservcount++;
}else{
push @reservloop, \%getreserv;
$reservcount++;
@@
-155,7
+155,6
@@
$template->param(
overloop => \@overloop,
overcount => $overcount,
show_date => format_date(C4::Dates->today('iso')),
overloop => \@overloop,
overcount => $overcount,
show_date => format_date(C4::Dates->today('iso')),
- dateformat => C4::Context->preference("dateformat"),
ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
);
ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
);