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 347-353 if ($barcode) { Link Here
347
}
344
}
348
$template->param( inputloop => \@inputloop );
345
$template->param( inputloop => \@inputloop );
349
346
350
351
my $found    = 0;
347
my $found    = 0;
352
my $waiting  = 0;
348
my $waiting  = 0;
353
my $reserved = 0;
349
my $reserved = 0;
Lines 359-365 if ( $messages->{'WasTransfered'} ) { Link Here
359
    $template->param(
355
    $template->param(
360
        found          => 1,
356
        found          => 1,
361
        transfer       => 1,
357
        transfer       => 1,
362
        itemnumber     => $itemnumber,
363
    );
358
    );
364
}
359
}
365
360
Lines 368-374 if ( $messages->{'NeedsTransfer'} ){ Link Here
368
        found          => 1,
363
        found          => 1,
369
        needstransfer  => $messages->{'NeedsTransfer'},
364
        needstransfer  => $messages->{'NeedsTransfer'},
370
        trigger        => $messages->{'TransferTrigger'},
365
        trigger        => $messages->{'TransferTrigger'},
371
        itemnumber     => $itemnumber,
372
    );
366
    );
373
}
367
}
374
368
Lines 386-392 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
386
        WrongTransfer  => 1,
380
        WrongTransfer  => 1,
387
        TransferWaitingAt => $messages->{'WrongTransfer'},
381
        TransferWaitingAt => $messages->{'WrongTransfer'},
388
        WrongTransferItem => $messages->{'WrongTransferItem'},
382
        WrongTransferItem => $messages->{'WrongTransferItem'},
389
        itemnumber => $itemnumber,
390
    );
383
    );
391
384
392
    my $reserve    = $messages->{'ResFound'};
385
    my $reserve    = $messages->{'ResFound'};
Lines 422-428 if ( $messages->{'ResFound'}) { Link Here
422
            hold_auto_filled => 1,
415
            hold_auto_filled => 1,
423
            print_slip       => C4::Context->preference('HoldsAutoFillPrintSlip'),
416
            print_slip       => C4::Context->preference('HoldsAutoFillPrintSlip'),
424
            reserve_id       => $nextreservinfo->{reserve_id},
417
            reserve_id       => $nextreservinfo->{reserve_id},
425
            itemnumber       => $itemnumber,
426
        );
418
        );
427
419
428
        if ( $messages->{'transfert'} ) {
420
        if ( $messages->{'transfert'} ) {
Lines 445-451 if ( $messages->{'ResFound'}) { Link Here
445
                transfertodo => $branchCheck ? undef : 1,
437
                transfertodo => $branchCheck ? undef : 1,
446
                reserve_id   => $reserve->{reserve_id},
438
                reserve_id   => $reserve->{reserve_id},
447
                reserved     => 1,
439
                reserved     => 1,
448
                itemnumber   => $itemnumber,
449
            );
440
            );
450
        }
441
        }
451
442
Lines 636-648 if ( $barcode ) { Link Here
636
                $template->param(
627
                $template->param(
637
                  collectionItemNeedsTransferred => 1,
628
                  collectionItemNeedsTransferred => 1,
638
                  collectionBranch => $collectionBranch,
629
                  collectionBranch => $collectionBranch,
639
                  itemnumber => $itemnumber,
640
                );
630
                );
641
            }
631
            }
642
        }
632
        }
643
    }
633
    }
644
}
634
}
645
635
636
$template->param( itemnumber => $itemnumber );
637
646
# Checking if there is a Fast Cataloging Framework
638
# Checking if there is a Fast Cataloging Framework
647
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
639
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
648
640
649
- 

Return to bug 26485