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

(-)a/C4/Reserves.pm (-2 / +2 lines)
Lines 1974-1985 available within the slip: Link Here
1974
=cut
1974
=cut
1975
1975
1976
sub ReserveSlip {
1976
sub ReserveSlip {
1977
    my ($branch, $borrowernumber, $biblionumber) = @_;
1977
    my ($branch, $borrowernumber, $biblionumber, $itemnumber) = @_;
1978
1978
1979
#   return unless ( C4::Context->boolean_preference('printreserveslips') );
1979
#   return unless ( C4::Context->boolean_preference('printreserveslips') );
1980
    my $patron = Koha::Patrons->find( $borrowernumber );
1980
    my $patron = Koha::Patrons->find( $borrowernumber );
1981
1981
1982
    my $hold = Koha::Holds->search({biblionumber => $biblionumber, borrowernumber => $borrowernumber })->next;
1982
    my $hold = Koha::Holds->search({biblionumber => $biblionumber, borrowernumber => $borrowernumber, itemnumber => $itemnumber })->next;
1983
    return unless $hold;
1983
    return unless $hold;
1984
    my $reserve = $hold->unblessed;
1984
    my $reserve = $hold->unblessed;
1985
1985
(-)a/circ/circulation.pl (+1 lines)
Lines 331-336 if (@$barcodes) { Link Here
331
    $template_params->{messages} = $messages;
331
    $template_params->{messages} = $messages;
332
332
333
    my $item = Koha::Items->find({ barcode => $barcode });
333
    my $item = Koha::Items->find({ barcode => $barcode });
334
    $template->param( item => $item );
334
    my ( $biblio, $mss );
335
    my ( $biblio, $mss );
335
336
336
    if ( $item ) {
337
    if ( $item ) {
(-)a/circ/hold-transfer-slip.pl (-2 / +3 lines)
Lines 36-42 my $input = new CGI; Link Here
36
my $sessionID = $input->cookie("CGISESSID");
36
my $sessionID = $input->cookie("CGISESSID");
37
my $session = get_session($sessionID);
37
my $session = get_session($sessionID);
38
38
39
my $biblionumber = $input->param('biblionumber');
39
my $itemnumber     = $input->param('itemnumber');
40
my $biblionumber   = $input->param('biblionumber');
40
my $borrowernumber = $input->param('borrowernumber');
41
my $borrowernumber = $input->param('borrowernumber');
41
42
42
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
43
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 52-58 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
52
53
53
my $userenv = C4::Context->userenv;
54
my $userenv = C4::Context->userenv;
54
my ($slip, $is_html);
55
my ($slip, $is_html);
55
if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber) ) {
56
if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber, $itemnumber) ) {
56
    $slip = $letter->{content};
57
    $slip = $letter->{content};
57
    $is_html = $letter->{is_html};
58
    $is_html = $letter->{is_html};
58
}
59
}
(-)a/circ/returns.pl (-4 / +7 lines)
Lines 288-306 if ($barcode) { Link Here
288
288
289
        my $biblio = $item->biblio;
289
        my $biblio = $item->biblio;
290
        $template->param(
290
        $template->param(
291
            item             => $item,
292
            issue            => $issue,
293
            borrower         => $borrower,
294
295
            additional_materials => $materials,
296
            returnbranch     => $returnbranch,
297
291
            title            => $biblio->title,
298
            title            => $biblio->title,
292
            homebranch       => $item->homebranch,
299
            homebranch       => $item->homebranch,
293
            holdingbranch    => $item->holdingbranch,
300
            holdingbranch    => $item->holdingbranch,
294
            returnbranch     => $returnbranch,
295
            author           => $biblio->author,
301
            author           => $biblio->author,
296
            itembarcode      => $item->barcode,
302
            itembarcode      => $item->barcode,
297
            itemtype         => $item->effective_itemtype,
303
            itemtype         => $item->effective_itemtype,
298
            ccode            => $item->ccode,
304
            ccode            => $item->ccode,
299
            itembiblionumber => $biblio->biblionumber,
305
            itembiblionumber => $biblio->biblionumber,
300
            biblionumber     => $biblio->biblionumber,
306
            biblionumber     => $biblio->biblionumber,
301
            borrower         => $borrower,
302
            additional_materials => $materials,
303
            issue            => $issue,
304
        );
307
        );
305
    } # FIXME else we should not call AddReturn but set BadBarcode directly instead
308
    } # FIXME else we should not call AddReturn but set BadBarcode directly instead
306
309
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 381-387 $(document).ready(function() { Link Here
381
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
381
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
382
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
382
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
383
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
383
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
384
    <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
384
    <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?itemnumber=[% item.itemnumber %]&amp;borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
385
</form>
385
</form>
386
[% END %]
386
[% END %]
387
387
Lines 391-397 $(document).ready(function() { Link Here
391
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
391
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
392
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
392
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
393
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
393
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
394
    <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
394
    <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?itemnumber=[% item.itemnumber %]&amp;borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
395
</form>
395
</form>
396
[% END %]
396
[% END %]
397
397
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 55-61 $(document).ready(function () { Link Here
55
    $(".modal").on('hidden.bs.modal', function (e) { $("#barcode").focus(); });
55
    $(".modal").on('hidden.bs.modal', function (e) { $("#barcode").focus(); });
56
56
57
    [% IF print_slip %]
57
    [% IF print_slip %]
58
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% biblionumber %]');
58
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item.itemnumber %]');
59
    [% END %]
59
    [% END %]
60
60
61
    var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) %]
61
    var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) %]
(-)a/t/db_dependent/Reserves.t (-2 / +1 lines)
Lines 387-393 is( Link Here
387
    'item that is captured to fill a hold cannot be deleted',
387
    'item that is captured to fill a hold cannot be deleted',
388
);
388
);
389
389
390
my $letter = ReserveSlip($branch_1, $requesters{$branch_1}, $bibnum);
390
my $letter = ReserveSlip($branch_1, $requesters{$branch_1}, $bibnum, $itemnumber);
391
ok(defined($letter), 'can successfully generate hold slip (bug 10949)');
391
ok(defined($letter), 'can successfully generate hold slip (bug 10949)');
392
392
393
# Tests for bug 9788: Does Koha::Item->current_holds return a future wait?
393
# Tests for bug 9788: Does Koha::Item->current_holds return a future wait?
394
- 

Return to bug 19549