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

(-)a/circ/hold-transfer-slip.pl (-1 lines)
Lines 38-44 my $session = get_session($sessionID); Link Here
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 $transfer = $input->param('transfer');
42
41
43
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
42
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
44
    {   
43
    {   
(-)a/circ/returns.pl (+9 lines)
Lines 68-73 if ($session->param('branch') eq 'NO_LIBRARY_SET'){ Link Here
68
    exit;
68
    exit;
69
}
69
}
70
70
71
# Print a reserve slip on this page
72
if ( $query->param('print_slip') ) {
73
    $template->param(
74
        print_slip     => 1,
75
        borrowernumber => $query->param('borrowernumber'),
76
        biblionumber   => $query->param('biblionumber'),
77
    );
78
}
79
71
#####################
80
#####################
72
#Global vars
81
#Global vars
73
my $branches = GetBranches();
82
my $branches = GetBranches();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-7 / +21 lines)
Lines 18-23 function Dopop(link) { Link Here
18
    $("#barcode").focus();
18
    $("#barcode").focus();
19
}
19
}
20
$(document).ready(function () {
20
$(document).ready(function () {
21
22
    [% IF print_slip %]
23
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
24
    [% END %]
25
21
    $("#return_date_override").datetimepicker({
26
    $("#return_date_override").datetimepicker({
22
        onClose: function(dateText, inst) { $("#barcode").focus(); },
27
        onClose: function(dateText, inst) { $("#barcode").focus(); },
23
        defaultDate: -1,
28
        defaultDate: -1,
Lines 160-167 $(document).ready(function () { Link Here
160
            <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem %]" />
165
            <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem %]" />
161
            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" />
166
            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" />
162
            <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" />
167
            <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" />
163
        <input type="submit" class="approve" value="Confirm" />
168
            <input type="submit" class="approve" value="Confirm" />
164
            <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
169
            <input type="hidden" name="print_slip" value="0" />
170
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
171
            <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
172
            <input type="submit" value="Print slip and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
165
        <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
173
        <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
166
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
174
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
167
    </form>
175
    </form>
Lines 199-205 $(document).ready(function () { Link Here
199
        <form method="post" action="returns.pl" class="confirm">
207
        <form method="post" action="returns.pl" class="confirm">
200
            <input type="submit" class="approve" value="Confirm" />
208
            <input type="submit" class="approve" value="Confirm" />
201
209
202
            <input type="submit" value="Print and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
210
            <input type="hidden" name="print_slip" value="0" />
211
            <input type="submit" value="Print and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
203
            [% FOREACH inputloo IN inputloop %]
212
            [% FOREACH inputloo IN inputloop %]
204
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
213
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
205
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
214
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
Lines 207-212 $(document).ready(function () { Link Here
207
            [% END %]
216
            [% END %]
208
                <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
217
                <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
209
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
218
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
219
                <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
210
                <input type="hidden" name="resbarcode" value="[% barcode %]" />
220
                <input type="hidden" name="resbarcode" value="[% barcode %]" />
211
                <input type="hidden" name="diffBranch" value="[% destbranch %]" />
221
                <input type="hidden" name="diffBranch" value="[% destbranch %]" />
212
                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
222
                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
Lines 244-250 $(document).ready(function () { Link Here
244
254
245
        <form method="post" action="returns.pl" class="confirm">
255
        <form method="post" action="returns.pl" class="confirm">
246
            <input type="submit" class="approve" value="Confirm" />
256
            <input type="submit" class="approve" value="Confirm" />
247
            <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
257
            <input type="hidden" name="print_slip" value="0" />
258
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
259
            <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
260
            <input type="submit" value="Print slip and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
248
            [% FOREACH inputloo IN inputloop %]
261
            [% FOREACH inputloo IN inputloop %]
249
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
262
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
250
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
263
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
Lines 359-370 $(document).ready(function () { Link Here
359
		<h4><strong>Hold at</strong> [% destbranchname %]</h4>
372
		<h4><strong>Hold at</strong> [% destbranchname %]</h4>
360
        [% END %]
373
        [% END %]
361
        <form method="post" action="returns.pl" class="confirm">
374
        <form method="post" action="returns.pl" class="confirm">
375
            <input type="hidden" name="print_slip" value="0" />
362
            [% IF ( transfertodo ) %]
376
            [% IF ( transfertodo ) %]
363
                <input type="submit" class="approve" value="Confirm hold and transfer" />
377
                <input type="submit" class="approve" value="Confirm hold and transfer" />
364
                <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
378
                <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit()" />
365
            [% ELSE %]
379
            [% ELSE %]
366
                <input type="submit" class="approve" value="Confirm hold" />
380
                <input type="submit" class="approve" value="Confirm hold" />
367
                <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
381
                <input type="submit" value="Print slip and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
368
            [% END %]
382
            [% END %]
369
                <input type="submit" class="deny" value="Ignore" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;" />
383
                <input type="submit" class="deny" value="Ignore" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;" />
370
            [% FOREACH inputloo IN inputloop %]
384
            [% FOREACH inputloo IN inputloop %]
Lines 373-378 $(document).ready(function () { Link Here
373
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
387
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
374
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
388
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
375
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
389
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
390
            <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
376
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
391
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
377
            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
392
            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
378
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
393
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
379
- 

Return to bug 13482