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

(-)a/circ/circulation.pl (-3 / +15 lines)
Lines 97-102 my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( Link Here
97
97
98
my $branches = GetBranches();
98
my $branches = GetBranches();
99
99
100
my $force_allow_issue = $query->param('forceallow') || 0;
101
102
my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers 
103
our %renew_failed = ();
104
for (@failedrenews) { $renew_failed{$_} = 1; }
105
106
my @failedreturns = $query->param('failedreturn');
107
our %return_failed = ();
108
for (@failedreturns) { $return_failed{$_} = 1; }
109
100
my $findborrower = $query->param('findborrower') || q{};
110
my $findborrower = $query->param('findborrower') || q{};
101
$findborrower =~ s|,| |g;
111
$findborrower =~ s|,| |g;
102
my $borrowernumber = $query->param('borrowernumber');
112
my $borrowernumber = $query->param('borrowernumber');
Lines 231-237 if ($borrowernumber) { Link Here
231
        #borrowercard expired, no issues
241
        #borrowercard expired, no issues
232
        $template->param(
242
        $template->param(
233
            flagged  => "1",
243
            flagged  => "1",
234
            noissues => "1",
244
            noissues => ($force_allow_issue) ? 0 : "1",
245
            forceallow => $force_allow_issue,
235
            expired => "1",
246
            expired => "1",
236
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
247
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
237
        );
248
        );
Lines 324-330 if ($barcode) { Link Here
324
        );
335
        );
325
        $blocker = 1;
336
        $blocker = 1;
326
    }
337
    }
327
    if( !$blocker ){
338
    if( !$blocker || $force_allow_issue ){
328
        my $confirm_required = 0;
339
        my $confirm_required = 0;
329
        unless($issueconfirmed){
340
        unless($issueconfirmed){
330
            #  Get the item title for more information
341
            #  Get the item title for more information
Lines 395-401 foreach my $flag ( sort keys %$flags ) { Link Here
395
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
406
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
396
    if ( $flags->{$flag}->{'noissues'} ) {
407
    if ( $flags->{$flag}->{'noissues'} ) {
397
        $template->param(
408
        $template->param(
398
            noissues => 'true',
409
            noissues => ($force_allow_issue) ? 0 : 'true',
410
            forceallow => $force_allow_issue,
399
        );
411
        );
400
        if ( $flag eq 'GNA' ) {
412
        if ( $flag eq 'GNA' ) {
401
            $template->param( gna => 'true' );
413
            $template->param( gna => 'true' );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +25 lines)
Lines 250-255 $(document).ready(function() { Link Here
250
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
250
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
251
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
251
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
252
252
253
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
254
253
[% IF ( RESERVED ) %]
255
[% IF ( RESERVED ) %]
254
    <p>
256
    <p>
255
    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="cancel" />
257
    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="cancel" />
Lines 289-294 $(document).ready(function() { Link Here
289
[% END %]
291
[% END %]
290
292
291
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
293
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
294
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
292
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
295
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
293
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
296
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
294
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
297
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 338-343 $(document).ready(function() { Link Here
338
                [% FOREACH book IN options %]
341
                [% FOREACH book IN options %]
339
                    <br />
342
                    <br />
340
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
343
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
344
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
341
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
345
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
342
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
346
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
343
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
347
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 414-424 $(document).ready(function() { Link Here
414
        [% END %]
418
        [% END %]
415
        </ul>
419
        </ul>
416
420
421
        [% IF (forceallow) %]
422
            <li>Debarment overridden temporarily</li>
423
        [% END %]
424
417
</div></div>
425
</div></div>
418
[% ELSE %]
426
[% ELSE %]
419
[% IF ( soundon ) %]
427
[% IF ( soundon ) %]
420
<audio src="[% interface %]/[% theme %]/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
428
<audio src="[% interface %]/[% theme %]/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
421
[% END %]
429
[% END %]
430
431
  [% IF (forceallow) %]
432
      <div id="overridden_debarment" class="dialog alert">Debarment overridden temporarily</div>
433
  [% END %]
434
422
    [% END %] <!-- /impossible -->
435
    [% END %] <!-- /impossible -->
423
436
424
[% IF ( issued ) %]
437
[% IF ( issued ) %]
Lines 440-445 No patron matched <span class="ex">[% message %]</span> Link Here
440
<fieldset id="circ_circulation_selectborrower" class="brief">
453
<fieldset id="circ_circulation_selectborrower" class="brief">
441
    <legend>Patron selection</legend>
454
    <legend>Patron selection</legend>
442
455
456
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
443
    <input type="hidden" name="branch" value="[% branch %]" />
457
    <input type="hidden" name="branch" value="[% branch %]" />
444
    <input type="hidden" name="printer" value="[% printer %]" />
458
    <input type="hidden" name="printer" value="[% printer %]" />
445
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
459
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
Lines 478-483 No patron matched <span class="ex">[% message %]</span> Link Here
478
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
492
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
479
    [% END %]
493
    [% END %]
480
494
495
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
496
481
    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
497
    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
482
498
483
	<div class="hint">Enter item barcode:</div>
499
	<div class="hint">Enter item barcode:</div>
Lines 526-531 No patron matched <span class="ex">[% message %]</span> Link Here
526
		<h3>[% IF ( noissues ) %]
542
		<h3>[% IF ( noissues ) %]
527
		        Cannot check out!
543
		        Cannot check out!
528
		[% ELSE %]Attention:[% END %]</h3>
544
		[% ELSE %]Attention:[% END %]</h3>
545
546
529
		<ul>
547
		<ul>
530
548
531
			[% IF ( warndeparture ) %]
549
			[% IF ( warndeparture ) %]
Lines 594-599 No patron matched <span class="ex">[% message %]</span> Link Here
594
612
595
613
596
			</ul>
614
			</ul>
615
616
[% IF (noissues && borrowernumber) %]
617
<div class="override_debarment">
618
<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% borrowernumber %]" class="btn btn-small">Override debarment temporarily</a>
619
</div>
620
[% END %]
621
597
        </div>
622
        </div>
598
623
599
			[% IF ( WaitingReserveLoop ) %]
624
			[% IF ( WaitingReserveLoop ) %]
600
- 

Return to bug 643