Lines 145-167
if ($item && $tab eq 'holdsover' && !@cancel_result) {
Link Here
|
145 |
exit; |
145 |
exit; |
146 |
|
146 |
|
147 |
sub cancel { |
147 |
sub cancel { |
148 |
my ($item, $borrowernumber, $fbr, $tbr, $skip_transfers ) = @_; |
148 |
my ( $itemnumber, $borrowernumber, $fbr, $tbr, $skip_transfers ) = @_; |
149 |
|
149 |
|
150 |
my $transfer = $fbr ne $tbr; # XXX && !$nextreservinfo; |
150 |
my $transfer = $fbr ne $tbr; # XXX && !$nextreservinfo; |
|
|
151 |
my $item = Koha::Items->find( $itemnumber ); |
151 |
|
152 |
|
152 |
return if $transfer && $skip_transfers; |
153 |
return if $transfer && $skip_transfers; |
153 |
|
154 |
|
154 |
my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber ); |
155 |
my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $itemnumber, $borrowernumber ); |
155 |
|
156 |
|
156 |
# if the document is not in his homebranch location and there is not reservation after, we transfer it |
157 |
# if the document is not in his homebranch location and there is not reservation after, we transfer it |
157 |
if ($transfer && !$nextreservinfo) { |
158 |
if ( $transfer && !$nextreservinfo && !$item->itemlost ) { |
158 |
ModItemTransfer( $item, $fbr, $tbr, 'CancelReserve' ); |
159 |
ModItemTransfer( $itemnumber, $fbr, $tbr, 'CancelReserve' ); |
159 |
} |
160 |
} |
160 |
# if we have a result |
161 |
# if we have a result |
161 |
if ($nextreservinfo) { |
162 |
if ($nextreservinfo) { |
162 |
my %res; |
163 |
my %res; |
163 |
my $patron = Koha::Patrons->find( $nextreservinfo ); |
164 |
my $patron = Koha::Patrons->find( $nextreservinfo ); |
164 |
my $title = Koha::Items->find( $item )->biblio->title; |
165 |
my $title = $item->biblio->title; |
165 |
if ( $messages->{'transfert'} ) { |
166 |
if ( $messages->{'transfert'} ) { |
166 |
$res{messagetransfert} = $messages->{'transfert'}; |
167 |
$res{messagetransfert} = $messages->{'transfert'}; |
167 |
$res{branchcode} = $messages->{'transfert'}; |
168 |
$res{branchcode} = $messages->{'transfert'}; |
Lines 171-177
sub cancel {
Link Here
|
171 |
$res{nextreservnumber} = $nextreservinfo; |
172 |
$res{nextreservnumber} = $nextreservinfo; |
172 |
$res{nextreservsurname} = $patron->surname; |
173 |
$res{nextreservsurname} = $patron->surname; |
173 |
$res{nextreservfirstname} = $patron->firstname; |
174 |
$res{nextreservfirstname} = $patron->firstname; |
174 |
$res{nextreservitem} = $item; |
175 |
$res{nextreservitem} = $itemnumber; |
175 |
$res{nextreservtitle} = $title; |
176 |
$res{nextreservtitle} = $title; |
176 |
$res{waiting} = $messages->{'waiting'} ? 1 : 0; |
177 |
$res{waiting} = $messages->{'waiting'} ? 1 : 0; |
177 |
|
178 |
|
178 |
- |
|
|