View | Details | Raw Unified | Return to bug 26485
Collapse All | Expand All

(-)a/circ/returns.pl (-12 / +3 lines)
Lines 136-143 if ($query->param('WT-itemNumber')){ Link Here
136
	updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
136
	updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
137
}
137
}
138
138
139
my $itemnumber = $query->param('itemnumber');
139
if ( $query->param('reserve_id') ) {
140
if ( $query->param('reserve_id') ) {
140
    my $itemnumber     = $query->param('itemnumber');
141
    my $borrowernumber = $query->param('borrowernumber');
141
    my $borrowernumber = $query->param('borrowernumber');
142
    my $reserve_id     = $query->param('reserve_id');
142
    my $reserve_id     = $query->param('reserve_id');
143
    my $diffBranchReturned = $query->param('diffBranch');
143
    my $diffBranchReturned = $query->param('diffBranch');
Lines 165-171 if ( $query->param('reserve_id') ) { Link Here
165
    if ( $messages->{'transfert'} ) {
165
    if ( $messages->{'transfert'} ) {
166
        $template->param(
166
        $template->param(
167
            itemtitle      => $biblio->title,
167
            itemtitle      => $biblio->title,
168
            itemnumber     => $item->itemnumber,
169
            itembiblionumber => $biblio->biblionumber,
168
            itembiblionumber => $biblio->biblionumber,
170
            iteminfo       => $biblio->author,
169
            iteminfo       => $biblio->author,
171
            name           => $name,
170
            name           => $name,
Lines 179-185 my $borrower; Link Here
179
my $returned = 0;
178
my $returned = 0;
180
my $messages;
179
my $messages;
181
my $issue;
180
my $issue;
182
my $itemnumber;
183
my $barcode     = $query->param('barcode');
181
my $barcode     = $query->param('barcode');
184
my $exemptfine  = $query->param('exemptfine');
182
my $exemptfine  = $query->param('exemptfine');
185
if (
183
if (
Lines 231-237 if ($dotransfer){ Link Here
231
}
229
}
232
230
233
if ($canceltransfer){
231
if ($canceltransfer){
234
    $itemnumber=$query->param('itemnumber');
235
    DeleteTransfer($itemnumber);
232
    DeleteTransfer($itemnumber);
236
    if($dest eq "ttr"){
233
    if($dest eq "ttr"){
237
        print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
234
        print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
Lines 361-367 if ($barcode) { Link Here
361
}
358
}
362
$template->param( inputloop => \@inputloop );
359
$template->param( inputloop => \@inputloop );
363
360
364
365
my $found    = 0;
361
my $found    = 0;
366
my $waiting  = 0;
362
my $waiting  = 0;
367
my $reserved = 0;
363
my $reserved = 0;
Lines 373-379 if ( $messages->{'WasTransfered'} ) { Link Here
373
    $template->param(
369
    $template->param(
374
        found          => 1,
370
        found          => 1,
375
        transfer       => 1,
371
        transfer       => 1,
376
        itemnumber     => $itemnumber,
377
    );
372
    );
378
}
373
}
379
374
Lines 382-388 if ( $messages->{'NeedsTransfer'} ){ Link Here
382
        found          => 1,
377
        found          => 1,
383
        needstransfer  => $messages->{'NeedsTransfer'},
378
        needstransfer  => $messages->{'NeedsTransfer'},
384
        trigger        => $messages->{'TransferTrigger'},
379
        trigger        => $messages->{'TransferTrigger'},
385
        itemnumber     => $itemnumber,
386
    );
380
    );
387
}
381
}
388
382
Lines 400-406 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
400
        WrongTransfer  => 1,
394
        WrongTransfer  => 1,
401
        TransferWaitingAt => $messages->{'WrongTransfer'},
395
        TransferWaitingAt => $messages->{'WrongTransfer'},
402
        WrongTransferItem => $messages->{'WrongTransferItem'},
396
        WrongTransferItem => $messages->{'WrongTransferItem'},
403
        itemnumber => $itemnumber,
404
    );
397
    );
405
398
406
    my $reserve    = $messages->{'ResFound'};
399
    my $reserve    = $messages->{'ResFound'};
Lines 436-442 if ( $messages->{'ResFound'}) { Link Here
436
            hold_auto_filled => 1,
429
            hold_auto_filled => 1,
437
            print_slip       => C4::Context->preference('HoldsAutoFillPrintSlip'),
430
            print_slip       => C4::Context->preference('HoldsAutoFillPrintSlip'),
438
            reserve_id       => $nextreservinfo->{reserve_id},
431
            reserve_id       => $nextreservinfo->{reserve_id},
439
            itemnumber       => $itemnumber,
440
        );
432
        );
441
433
442
        if ( $messages->{'transfert'} ) {
434
        if ( $messages->{'transfert'} ) {
Lines 459-465 if ( $messages->{'ResFound'}) { Link Here
459
                transfertodo => $branchCheck ? undef : 1,
451
                transfertodo => $branchCheck ? undef : 1,
460
                reserve_id   => $reserve->{reserve_id},
452
                reserve_id   => $reserve->{reserve_id},
461
                reserved     => 1,
453
                reserved     => 1,
462
                itemnumber   => $itemnumber,
463
            );
454
            );
464
        }
455
        }
465
456
Lines 650-662 if ( $barcode ) { Link Here
650
                $template->param(
641
                $template->param(
651
                  collectionItemNeedsTransferred => 1,
642
                  collectionItemNeedsTransferred => 1,
652
                  collectionBranch => $collectionBranch,
643
                  collectionBranch => $collectionBranch,
653
                  itemnumber => $itemnumber,
654
                );
644
                );
655
            }
645
            }
656
        }
646
        }
657
    }
647
    }
658
}
648
}
659
649
650
$template->param( itemnumber => $itemnumber );
651
660
# Checking if there is a Fast Cataloging Framework
652
# Checking if there is a Fast Cataloging Framework
661
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
653
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
662
654
663
- 

Return to bug 26485