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

(-)a/circ/circulation.pl (-3 / +7 lines)
Lines 96-101 my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( Link Here
96
96
97
my $branches = GetBranches();
97
my $branches = GetBranches();
98
98
99
my $force_allow_issue = $query->param('forceallow') || 0;
100
99
my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers 
101
my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers 
100
our %renew_failed = ();
102
our %renew_failed = ();
101
for (@failedrenews) { $renew_failed{$_} = 1; }
103
for (@failedrenews) { $renew_failed{$_} = 1; }
Lines 242-248 if ($borrowernumber) { Link Here
242
        #borrowercard expired, no issues
244
        #borrowercard expired, no issues
243
        $template->param(
245
        $template->param(
244
            flagged  => "1",
246
            flagged  => "1",
245
            noissues => "1",
247
            noissues => ($force_allow_issue) ? 0 : "1",
248
            forceallow => $force_allow_issue,
246
            expired => "1",
249
            expired => "1",
247
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
250
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
248
        );
251
        );
Lines 335-341 if ($barcode) { Link Here
335
        );
338
        );
336
        $blocker = 1;
339
        $blocker = 1;
337
    }
340
    }
338
    if( !$blocker ){
341
    if( !$blocker || $force_allow_issue ){
339
        my $confirm_required = 0;
342
        my $confirm_required = 0;
340
        unless($issueconfirmed){
343
        unless($issueconfirmed){
341
            #  Get the item title for more information
344
            #  Get the item title for more information
Lines 595-601 foreach my $flag ( sort keys %$flags ) { Link Here
595
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
598
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
596
    if ( $flags->{$flag}->{'noissues'} ) {
599
    if ( $flags->{$flag}->{'noissues'} ) {
597
        $template->param(
600
        $template->param(
598
            noissues => 'true',
601
            noissues => ($force_allow_issue) ? 0 : 'true',
602
            forceallow => $force_allow_issue,
599
        );
603
        );
600
        if ( $flag eq 'GNA' ) {
604
        if ( $flag eq 'GNA' ) {
601
            $template->param( gna => 'true' );
605
            $template->param( gna => 'true' );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +25 lines)
Lines 293-298 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
293
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
293
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
294
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
294
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
295
295
296
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
297
296
[% IF ( RESERVED ) %]
298
[% IF ( RESERVED ) %]
297
    <p>
299
    <p>
298
    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="cancel" />
300
    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="cancel" />
Lines 332-337 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
332
[% END %]
334
[% END %]
333
335
334
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
336
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
337
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
335
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
338
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
336
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
339
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
337
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
340
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 381-386 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
381
                [% FOREACH book IN options %]
384
                [% FOREACH book IN options %]
382
                    <br />
385
                    <br />
383
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
386
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
387
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
384
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
388
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
385
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
389
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
386
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
390
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 457-467 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
457
        [% END %]
461
        [% END %]
458
        </ul>
462
        </ul>
459
463
464
        [% IF (forceallow) %]
465
            <li>Debarment overridden temporarily</li>
466
        [% END %]
467
460
</div></div>
468
</div></div>
461
[% ELSE %]
469
[% ELSE %]
462
[% IF ( soundon ) %]
470
[% IF ( soundon ) %]
463
<audio src="[% interface %]/[% theme %]/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
471
<audio src="[% interface %]/[% theme %]/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
464
[% END %]
472
[% END %]
473
474
  [% IF (forceallow) %]
475
      <div id="overridden_debarment" class="dialog alert">Debarment overridden temporarily</div>
476
  [% END %]
477
465
    [% END %] <!-- /impossible -->
478
    [% END %] <!-- /impossible -->
466
479
467
[% IF ( issued ) %]
480
[% IF ( issued ) %]
Lines 483-488 No patron matched <span class="ex">[% message %]</span> Link Here
483
<fieldset id="circ_circulation_selectborrower" class="brief">
496
<fieldset id="circ_circulation_selectborrower" class="brief">
484
    <legend>Patron selection</legend>
497
    <legend>Patron selection</legend>
485
498
499
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
486
    <input type="hidden" name="branch" value="[% branch %]" />
500
    <input type="hidden" name="branch" value="[% branch %]" />
487
    <input type="hidden" name="printer" value="[% printer %]" />
501
    <input type="hidden" name="printer" value="[% printer %]" />
488
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
502
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
Lines 517-522 No patron matched <span class="ex">[% message %]</span> Link Here
517
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
531
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
518
    [% END %]
532
    [% END %]
519
533
534
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
535
520
    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
536
    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
521
537
522
	<div class="hint">Enter item barcode:</div>
538
	<div class="hint">Enter item barcode:</div>
Lines 565-570 No patron matched <span class="ex">[% message %]</span> Link Here
565
		<h3>[% IF ( noissues ) %]
581
		<h3>[% IF ( noissues ) %]
566
		        Cannot check out!
582
		        Cannot check out!
567
		[% ELSE %]Attention:[% END %]</h3>
583
		[% ELSE %]Attention:[% END %]</h3>
584
585
568
		<ul>
586
		<ul>
569
587
570
			[% IF ( warndeparture ) %]
588
			[% IF ( warndeparture ) %]
Lines 633-638 No patron matched <span class="ex">[% message %]</span> Link Here
633
651
634
652
635
			</ul>
653
			</ul>
654
655
[% IF (noissues && borrowernumber) %]
656
<div class="override_debarment">
657
<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% borrowernumber %]" class="btn btn-small">Override debarment temporarily</a>
658
</div>
659
[% END %]
660
636
        </div>
661
        </div>
637
662
638
			[% IF ( WaitingReserveLoop ) %]
663
			[% IF ( WaitingReserveLoop ) %]
639
- 

Return to bug 643