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 541-546 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree Link Here
541
540
542
$template->param(%$borrower);
541
$template->param(%$borrower);
543
542
543
unless ($stickyduedate eq 'on') {
544
    $duedatespec = '';
545
} else {
546
    if ($restoreduedatespec) {
547
        $duedatespec = $restoreduedatespec;
548
    }
549
    $session->param( 'stickyduedate', $duedatespec );
550
}
551
544
$template->param(
552
$template->param(
545
    lib_messages_loop => $lib_messages_loop,
553
    lib_messages_loop => $lib_messages_loop,
546
    bor_messages_loop => $bor_messages_loop,
554
    bor_messages_loop => $bor_messages_loop,
Lines 559-564 $template->param( Link Here
559
    barcode           => $barcode,
567
    barcode           => $barcode,
560
    stickyduedate     => $stickyduedate,
568
    stickyduedate     => $stickyduedate,
561
    duedatespec       => $duedatespec,
569
    duedatespec       => $duedatespec,
570
    restoreduedatespec => $restoreduedatespec,
562
    message           => $message,
571
    message           => $message,
563
    totaldue          => sprintf('%.2f', $total),
572
    totaldue          => sprintf('%.2f', $total),
564
    inprocess         => $inprocess,
573
    inprocess         => $inprocess,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +6 lines)
Lines 310-322 $(document).ready(function() { Link Here
310
[% IF HIGHHOLDS %]
310
[% IF HIGHHOLDS %]
311
	<script language="JavaScript" type="text/javascript">
311
	<script language="JavaScript" type="text/javascript">
312
	$(document).ready(function() {
312
	$(document).ready(function() {
313
		$("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
313
            $("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
314
	});
314
	});
315
	</script>
315
	</script>
316
[% END %]
316
[% END %]
317
317
318
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
318
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
319
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
319
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
320
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
320
321
321
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
322
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
322
323
Lines 381-386 $(document).ready(function() { Link Here
381
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
382
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
382
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
383
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
383
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
384
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
385
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
384
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
386
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
385
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
387
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
386
        [% IF ( RENEW_ISSUE ) %]
388
        [% IF ( RENEW_ISSUE ) %]
Lines 431-436 $(document).ready(function() { Link Here
431
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
433
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
432
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
434
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
433
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
435
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
436
                        <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
434
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
437
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
435
                        <input type="hidden" name="branch" value="[% branch %]" />
438
                        <input type="hidden" name="branch" value="[% branch %]" />
436
                        <input type="hidden" name="barcode" value="[% book.barcode %]" />
439
                        <input type="hidden" name="barcode" value="[% book.barcode %]" />
Lines 536-546 No patron matched <span class="ex">[% message %]</span> Link Here
536
</h4>
539
</h4>
537
[% END %]
540
[% END %]
538
541
539
540
[% IF ( borrowers ) %]
542
[% IF ( borrowers ) %]
541
[% INCLUDE 'patron-toolbar.inc' %]
543
[% INCLUDE 'patron-toolbar.inc' %]
542
544
543
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
545
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
546
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
544
<fieldset id="circ_circulation_selectborrower" class="brief">
547
<fieldset id="circ_circulation_selectborrower" class="brief">
545
    <legend>Patron selection</legend>
548
    <legend>Patron selection</legend>
546
549
Lines 591-598 No patron matched <span class="ex">[% message %]</span> Link Here
591
594
592
[% END %]
595
[% END %]
593
596
594
595
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
597
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
598
    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
596
[% IF ( issue ) %]
599
[% IF ( issue ) %]
597
    <fieldset id="circ_circulation_issue" class="lastchecked">
600
    <fieldset id="circ_circulation_issue" class="lastchecked">
598
[% ELSE %]
601
[% ELSE %]
Lines 776-783 No patron matched <span class="ex">[% message %]</span> Link Here
776
            </li>
779
            </li>
777
			[% END %]
780
			[% END %]
778
781
779
780
781
			</ul>
782
			</ul>
782
        </div>
783
        </div>
783
784
Lines 836-842 No patron matched <span class="ex">[% message %]</span> Link Here
836
     <!-- /If flagged -->[% END %]
837
     <!-- /If flagged -->[% END %]
837
838
838
	
839
	
839
840
</div>
840
</div>
841
</div>
841
</div>
842
842
Lines 950-957 No patron matched <span class="ex">[% message %]</span> Link Here
950
</div></div>
950
</div></div>
951
[% END %]
951
[% END %]
952
952
953
954
955
</div>
953
</div>
956
</div>
954
</div>
957
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
955
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
958
- 

Return to bug 10067