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

(-)a/circ/circulation.pl (-2 / +11 lines)
Lines 55-61 use Date::Calc qw( Link Here
55
);
55
);
56
use List::MoreUtils qw/uniq/;
56
use List::MoreUtils qw/uniq/;
57
57
58
59
#
58
#
60
# PARAMETERS READING
59
# PARAMETERS READING
61
#
60
#
Lines 122-128 my $borrowernumber = $query->param('borrowernumber'); Link Here
122
$branch  = C4::Context->userenv->{'branch'};  
121
$branch  = C4::Context->userenv->{'branch'};  
123
$printer = C4::Context->userenv->{'branchprinter'};
122
$printer = C4::Context->userenv->{'branchprinter'};
124
123
125
126
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
124
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
127
if (C4::Context->preference("AutoLocation") != 1) {
125
if (C4::Context->preference("AutoLocation") != 1) {
128
    $template->param(ManualLocation => 1);
126
    $template->param(ManualLocation => 1);
Lines 138-143 $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace Link Here
138
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
136
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
139
my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
137
my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
140
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
138
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
139
my $restoreduedatespec = $query->param('restoreduedatespec') || $session->param('stickyduedate');
141
my $issueconfirmed = $query->param('issueconfirmed');
140
my $issueconfirmed = $query->param('issueconfirmed');
142
my $cancelreserve  = $query->param('cancelreserve');
141
my $cancelreserve  = $query->param('cancelreserve');
143
my $print          = $query->param('print') || q{};
142
my $print          = $query->param('print') || q{};
Lines 534-539 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree Link Here
534
533
535
$template->param(%$borrower);
534
$template->param(%$borrower);
536
535
536
unless ($stickyduedate eq 'on') {
537
    $duedatespec = '';
538
} else {
539
    if ($restoreduedatespec) {
540
        $duedatespec = $restoreduedatespec;
541
    }
542
    $session->param( 'stickyduedate', $duedatespec );
543
}
544
537
$template->param(
545
$template->param(
538
    lib_messages_loop => $lib_messages_loop,
546
    lib_messages_loop => $lib_messages_loop,
539
    bor_messages_loop => $bor_messages_loop,
547
    bor_messages_loop => $bor_messages_loop,
Lines 552-557 $template->param( Link Here
552
    barcode           => $barcode,
560
    barcode           => $barcode,
553
    stickyduedate     => $stickyduedate,
561
    stickyduedate     => $stickyduedate,
554
    duedatespec       => $duedatespec,
562
    duedatespec       => $duedatespec,
563
    restoreduedatespec => $restoreduedatespec,
555
    message           => $message,
564
    message           => $message,
556
    totaldue          => sprintf('%.2f', $total),
565
    totaldue          => sprintf('%.2f', $total),
557
    inprocess         => $inprocess,
566
    inprocess         => $inprocess,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +6 lines)
Lines 300-312 $(document).ready(function() { Link Here
300
[% IF HIGHHOLDS %]
300
[% IF HIGHHOLDS %]
301
	<script language="JavaScript" type="text/javascript">
301
	<script language="JavaScript" type="text/javascript">
302
	$(document).ready(function() {
302
	$(document).ready(function() {
303
		$("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
303
            $("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
304
	});
304
	});
305
	</script>
305
	</script>
306
[% END %]
306
[% END %]
307
307
308
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
308
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
309
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
309
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
310
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
310
311
311
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
312
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
312
313
Lines 353-358 $(document).ready(function() { Link Here
353
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
354
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
354
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
355
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
355
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
356
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
357
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
356
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
358
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
357
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
359
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
358
        [% IF ( RENEW_ISSUE ) %]
360
        [% IF ( RENEW_ISSUE ) %]
Lines 403-408 $(document).ready(function() { Link Here
403
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
405
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
404
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
406
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
405
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
407
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
408
                        <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
406
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
409
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
407
                        <input type="hidden" name="branch" value="[% branch %]" />
410
                        <input type="hidden" name="branch" value="[% branch %]" />
408
                        <input type="hidden" name="barcode" value="[% book.barcode %]" />
411
                        <input type="hidden" name="barcode" value="[% book.barcode %]" />
Lines 508-518 No patron matched <span class="ex">[% message %]</span> Link Here
508
</h4>
511
</h4>
509
[% END %]
512
[% END %]
510
513
511
512
[% IF ( borrowers ) %]
514
[% IF ( borrowers ) %]
513
[% INCLUDE 'patron-toolbar.inc' %]
515
[% INCLUDE 'patron-toolbar.inc' %]
514
516
515
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
517
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
518
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
516
<fieldset id="circ_circulation_selectborrower" class="brief">
519
<fieldset id="circ_circulation_selectborrower" class="brief">
517
    <legend>Patron selection</legend>
520
    <legend>Patron selection</legend>
518
521
Lines 563-570 No patron matched <span class="ex">[% message %]</span> Link Here
563
566
564
[% END %]
567
[% END %]
565
568
566
567
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
569
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
570
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
568
[% IF ( issue ) %]
571
[% IF ( issue ) %]
569
    <fieldset id="circ_circulation_issue" class="lastchecked">
572
    <fieldset id="circ_circulation_issue" class="lastchecked">
570
[% ELSE %]
573
[% ELSE %]
Lines 748-755 No patron matched <span class="ex">[% message %]</span> Link Here
748
            </li>
751
            </li>
749
			[% END %]
752
			[% END %]
750
753
751
752
753
			</ul>
754
			</ul>
754
        </div>
755
        </div>
755
756
Lines 808-814 No patron matched <span class="ex">[% message %]</span> Link Here
808
     <!-- /If flagged -->[% END %]
809
     <!-- /If flagged -->[% END %]
809
810
810
	
811
	
811
812
</div>
812
</div>
813
</div>
813
</div>
814
814
Lines 922-929 No patron matched <span class="ex">[% message %]</span> Link Here
922
</div></div>
922
</div></div>
923
[% END %]
923
[% END %]
924
924
925
926
927
</div>
925
</div>
928
</div>
926
</div>
929
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
927
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
930
- 

Return to bug 10067