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

(-)a/C4/Reserves.pm (-2 / +2 lines)
Lines 1874-1885 available within the slip: Link Here
1874
=cut
1874
=cut
1875
1875
1876
sub ReserveSlip {
1876
sub ReserveSlip {
1877
    my ($branch, $borrowernumber, $biblionumber) = @_;
1877
    my ($branch, $borrowernumber, $biblionumber, $itemnumber) = @_;
1878
1878
1879
#   return unless ( C4::Context->boolean_preference('printreserveslips') );
1879
#   return unless ( C4::Context->boolean_preference('printreserveslips') );
1880
    my $patron = Koha::Patrons->find( $borrowernumber );
1880
    my $patron = Koha::Patrons->find( $borrowernumber );
1881
1881
1882
    my $hold = Koha::Holds->search({biblionumber => $biblionumber, borrowernumber => $borrowernumber })->next;
1882
    my $hold = Koha::Holds->search({biblionumber => $biblionumber, borrowernumber => $borrowernumber, itemnumber => $itemnumber })->next;
1883
    return unless $hold;
1883
    return unless $hold;
1884
    my $reserve = $hold->unblessed;
1884
    my $reserve = $hold->unblessed;
1885
1885
(-)a/circ/circulation.pl (+1 lines)
Lines 346-351 if (@$barcodes) { Link Here
346
    $template_params->{messages} = $messages;
346
    $template_params->{messages} = $messages;
347
347
348
    my $item = Koha::Items->find({ barcode => $barcode });
348
    my $item = Koha::Items->find({ barcode => $barcode });
349
    $template->param( item => $item );
349
    my ( $biblio, $mss );
350
    my ( $biblio, $mss );
350
351
351
    if ( $item ) {
352
    if ( $item ) {
(-)a/circ/hold-transfer-slip.pl (-2 / +3 lines)
Lines 35-41 my $input = new CGI; Link Here
35
my $sessionID = $input->cookie("CGISESSID");
35
my $sessionID = $input->cookie("CGISESSID");
36
my $session = get_session($sessionID);
36
my $session = get_session($sessionID);
37
37
38
my $biblionumber = $input->param('biblionumber');
38
my $itemnumber     = $input->param('itemnumber');
39
my $biblionumber   = $input->param('biblionumber');
39
my $borrowernumber = $input->param('borrowernumber');
40
my $borrowernumber = $input->param('borrowernumber');
40
41
41
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
42
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 51-57 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
51
52
52
my $userenv = C4::Context->userenv;
53
my $userenv = C4::Context->userenv;
53
my ($slip, $is_html);
54
my ($slip, $is_html);
54
if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber) ) {
55
if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $borrowernumber, $biblionumber, $itemnumber) ) {
55
    $slip = $letter->{content};
56
    $slip = $letter->{content};
56
    $is_html = $letter->{is_html};
57
    $is_html = $letter->{is_html};
57
}
58
}
(-)a/circ/returns.pl (-1 / +5 lines)
Lines 279-288 if ($barcode) { Link Here
279
        my $checkout = $item->checkout;
279
        my $checkout = $item->checkout;
280
        my $biblio   = $item->biblio;
280
        my $biblio   = $item->biblio;
281
        $template->param(
281
        $template->param(
282
            item             => $item,
283
            borrower         => $borrower,
284
285
            returnbranch     => $returnbranch,
286
282
            title            => $biblio->title,
287
            title            => $biblio->title,
283
            homebranch       => $item->homebranch,
288
            homebranch       => $item->homebranch,
284
            holdingbranch    => $item->holdingbranch,
289
            holdingbranch    => $item->holdingbranch,
285
            returnbranch     => $returnbranch,
286
            author           => $biblio->author,
290
            author           => $biblio->author,
287
            itembarcode      => $item->barcode,
291
            itembarcode      => $item->barcode,
288
            itemtype         => $item->effective_itemtype,
292
            itemtype         => $item->effective_itemtype,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 256-262 Link Here
256
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
256
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
257
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
257
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
258
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
258
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
259
    <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>
259
    <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>
260
</form>
260
</form>
261
[% END %]
261
[% END %]
262
262
Lines 266-272 Link Here
266
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
266
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
267
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
267
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
268
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
268
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
269
    <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>
269
    <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>
270
</form>
270
</form>
271
[% END %]
271
[% END %]
272
272
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 711-717 Link Here
711
            $(".modal").on('hidden.bs.modal', function (e) { $("#barcode").focus(); });
711
            $(".modal").on('hidden.bs.modal', function (e) { $("#barcode").focus(); });
712
712
713
            [% IF print_slip %]
713
            [% IF print_slip %]
714
                Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber %]&amp;biblionumber=[% biblionumber %]');
714
                Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item.itemnumber %]');
715
            [% END %]
715
            [% END %]
716
716
717
            var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) %]
717
            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