Attachment #34523 for bug #12085

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




=cut

sub ReserveSlip {
    my ($branch, $borrowernumber, $biblionumber, $transfer, $reserve_id) = @_;

#   return unless ( C4::Context->boolean_preference('printreserveslips') );

    $reserve_id = GetReserveId({
        biblionumber => $biblionumber,
        borrowernumber => $borrowernumber
    }) or return unless $reserve_id;
    my $reserve = GetReserveInfo($reserve_id) or return;

    return  C4::Letters::GetPreparedLetter (

Lines 38-43 my $session = get_session($sessionID); Link Here

(-)a/circ/hold-transfer-slip.pl (-1 / +2 lines)
38		38
39	my $biblionumber = $input->param('biblionumber');	39	my $biblionumber = $input->param('biblionumber');
40	my $borrowernumber = $input->param('borrowernumber');	40	my $borrowernumber = $input->param('borrowernumber');
		41	my $reserve_id = $input->param('reserve_id');
41	my $transfer = $input->param('transfer');	42	my $transfer = $input->param('transfer');
42		43
43	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	44	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 53-59 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
53		54
54	my $userenv = C4::Context->userenv;	55	my $userenv = C4::Context->userenv;
55	my ($slip, $is_html);	56	my ($slip, $is_html);
56	if ( my $letter = ReserveSlip ($session->param('branch') \|\| $userenv->{branch}, $borrowernumber, $biblionumber) ) {	57	if ( my $letter = ReserveSlip ($session->param('branch') \|\| $userenv->{branch}, $borrowernumber, $biblionumber, $transfer, $reserve_id) ) {
57	$slip = $letter->{content};	58	$slip = $letter->{content};
58	$is_html = $letter->{is_html};	59	$is_html = $letter->{is_html};
59	}	60	}

Lines 412-418 if ( $messages->{'ResFound'}) { Link Here

(-)a/circ/returns.pl (-1 / +1 lines)
412	intransit => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),	412	intransit => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),
413	transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),	413	transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),
414	resbarcode => $barcode,	414	resbarcode => $barcode,
415	reserved => 1,	415	reserved => $reserve,
416	);	416	);
417	}	417	}
418		418

Lines 346-352 $(document).ready(function () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +1 lines)
346	<form method="post" action="returns.pl" class="confirm">	346	<form method="post" action="returns.pl" class="confirm">
347	[% IF ( transfertodo ) %]	347	[% IF ( transfertodo ) %]
348	<input type="submit" class="approve" value="Confirm hold and transfer" />	348	<input type="submit" class="approve" value="Confirm hold and transfer" />
349	<input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" />	349	<input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&reserve_id=[% reserved.reserve_id %]&op=slip'); this.form.submit();" />
350	[% ELSE %]	350	[% ELSE %]
351	<input type="submit" class="approve" value="Confirm hold" />	351	<input type="submit" class="approve" value="Confirm hold" />
352	<input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" />	352	<input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip'); this.form.submit();" />
353	-

Return to bug 12085

Lines 2208-2221 sub GetReserveNextEligible { Link Here

(-)a/C4/Reserves.pm (-3 / +3 lines)
2208	=cut	2208	=cut
2209		2209
2210	sub ReserveSlip {	2210	sub ReserveSlip {
2211	my ($branch, $borrowernumber, $biblionumber) = @_;	2211	my ($branch, $borrowernumber, $biblionumber, $transfer, $reserve_id) = @_;
2212		2212
2213	# return unless ( C4::Context->boolean_preference('printreserveslips') );	2213	# return unless ( C4::Context->boolean_preference('printreserveslips') );
2214		2214
2215	my $reserve_id = GetReserveId({	2215	$reserve_id = GetReserveId({
2216	biblionumber => $biblionumber,	2216	biblionumber => $biblionumber,
2217	borrowernumber => $borrowernumber	2217	borrowernumber => $borrowernumber
2218	}) or return;	2218	}) or return unless $reserve_id;
2219	my $reserve = GetReserveInfo($reserve_id) or return;	2219	my $reserve = GetReserveInfo($reserve_id) or return;
2220		2220
2221	return C4::Letters::GetPreparedLetter (	2221	return C4::Letters::GetPreparedLetter (