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

(-)a/circ/circulation.pl (-8 / +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 156-162 $findborrower =~ s|,| |g; Link Here
156
$branch  = C4::Context->userenv->{'branch'};  
155
$branch  = C4::Context->userenv->{'branch'};  
157
$printer = C4::Context->userenv->{'branchprinter'};
156
$printer = C4::Context->userenv->{'branchprinter'};
158
157
159
160
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
158
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
161
if (C4::Context->preference("AutoLocation") != 1) {
159
if (C4::Context->preference("AutoLocation") != 1) {
162
    $template->param(ManualLocation => 1);
160
    $template->param(ManualLocation => 1);
Lines 176-182 my $stickyduedate = $query->param('stickyduedate') || $session->param('stickydu Link Here
176
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
174
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
177
$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); }
175
$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); }
178
    if ( $duedatespec );
176
    if ( $duedatespec );
179
177
my $restoreduedatespec  = $query->param('restoreduedatespec') || $session->param('stickyduedate');
180
my $issueconfirmed = $query->param('issueconfirmed');
178
my $issueconfirmed = $query->param('issueconfirmed');
181
my $cancelreserve  = $query->param('cancelreserve');
179
my $cancelreserve  = $query->param('cancelreserve');
182
my $print          = $query->param('print') || q{};
180
my $print          = $query->param('print') || q{};
Lines 577-582 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree Link Here
577
575
578
$template->param(%$borrower);
576
$template->param(%$borrower);
579
577
578
# Restore date if changed by holds and/or save stickyduedate to session
579
if ($restoreduedatespec || $stickyduedate) {
580
    $duedatespec = $restoreduedatespec || $duedatespec;
581
582
    if ($stickyduedate) {
583
        $session->param( 'stickyduedate', $duedatespec );
584
    }
585
}
586
580
$template->param(
587
$template->param(
581
    lib_messages_loop => $lib_messages_loop,
588
    lib_messages_loop => $lib_messages_loop,
582
    bor_messages_loop => $bor_messages_loop,
589
    bor_messages_loop => $bor_messages_loop,
Lines 595-600 $template->param( Link Here
595
    barcodes          => $barcodes,
602
    barcodes          => $barcodes,
596
    stickyduedate     => $stickyduedate,
603
    stickyduedate     => $stickyduedate,
597
    duedatespec       => $duedatespec,
604
    duedatespec       => $duedatespec,
605
    restoreduedatespec => $restoreduedatespec,
598
    message           => $message,
606
    message           => $message,
599
    totaldue          => sprintf('%.2f', $total),
607
    totaldue          => sprintf('%.2f', $total),
600
    inprocess         => $inprocess,
608
    inprocess         => $inprocess,
Lines 612-622 $template->param( Link Here
612
    relatives_borrowernumbers => \@relatives,
620
    relatives_borrowernumbers => \@relatives,
613
);
621
);
614
622
615
# save stickyduedate to session
616
if ($stickyduedate) {
617
    $session->param( 'stickyduedate', $duedatespec );
618
}
619
620
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
623
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
621
$template->param( picture => 1 ) if $picture;
624
$template->param( picture => 1 ) if $picture;
622
625
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +9 lines)
Lines 315-327 $(document).ready(function() { Link Here
315
[% IF HIGHHOLDS %]
315
[% IF HIGHHOLDS %]
316
	<script language="JavaScript" type="text/javascript">
316
	<script language="JavaScript" type="text/javascript">
317
	$(document).ready(function() {
317
	$(document).ready(function() {
318
		$("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
318
            $("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
319
            $("input[name=restoreduedatespec]:hidden").val('[% duedatespec %]');
319
	});
320
	});
320
	</script>
321
	</script>
321
[% END %]
322
[% END %]
322
323
323
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
324
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
324
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
325
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
326
    <input type="hidden" name="restoreduedatespec" />
325
327
326
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
328
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
327
329
Lines 366-371 $(document).ready(function() { Link Here
366
368
367
[% IF ( RESERVED ) %]
369
[% IF ( RESERVED ) %]
368
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
370
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
371
    <input type="hidden" name="restoreduedatespec" />
369
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
372
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
370
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
373
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
371
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
374
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 375-380 $(document).ready(function() { Link Here
375
378
376
[% IF ( RESERVE_WAITING ) %]
379
[% IF ( RESERVE_WAITING ) %]
377
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
380
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
381
    <input type="hidden" name="restoreduedatespec" />
378
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
382
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
379
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
383
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
380
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
384
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 386-391 $(document).ready(function() { Link Here
386
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
390
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
387
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
391
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
388
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
392
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
393
    <input type="hidden" name="restoreduedatespec" />
389
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
394
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
390
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
395
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
391
        [% IF ( RENEW_ISSUE ) %]
396
        [% IF ( RENEW_ISSUE ) %]
Lines 434-439 $(document).ready(function() { Link Here
434
                    <br />
439
                    <br />
435
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
440
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
436
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
441
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
442
                        <input type="hidden" name="restoreduedatespec" />
437
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
443
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
438
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
444
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
439
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
445
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 545-555 No patron matched <span class="ex">[% message %]</span> Link Here
545
</h4>
551
</h4>
546
[% END %]
552
[% END %]
547
553
548
549
[% IF ( borrowers ) %]
554
[% IF ( borrowers ) %]
550
[% INCLUDE 'patron-toolbar.inc' %]
555
[% INCLUDE 'patron-toolbar.inc' %]
551
556
552
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
557
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
558
    <input type="hidden" name="restoreduedatespec" />
553
<fieldset id="circ_circulation_selectborrower" class="brief">
559
<fieldset id="circ_circulation_selectborrower" class="brief">
554
    <legend>Patron selection</legend>
560
    <legend>Patron selection</legend>
555
561
Lines 605-612 No patron matched <span class="ex">[% message %]</span> Link Here
605
611
606
[% END %]
612
[% END %]
607
613
608
609
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
614
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
615
    <input type="hidden" name="restoreduedatespec" />
610
[% IF ( issue ) %]
616
[% IF ( issue ) %]
611
    <fieldset id="circ_circulation_issue" class="lastchecked">
617
    <fieldset id="circ_circulation_issue" class="lastchecked">
612
[% ELSE %]
618
[% ELSE %]
Lines 791-798 No patron matched <span class="ex">[% message %]</span> Link Here
791
            </li>
797
            </li>
792
			[% END %]
798
			[% END %]
793
799
794
795
796
			</ul>
800
			</ul>
797
        </div>
801
        </div>
798
802
Lines 860-866 No patron matched <span class="ex">[% message %]</span> Link Here
860
     <!-- /If flagged -->[% END %]
864
     <!-- /If flagged -->[% END %]
861
865
862
	
866
	
863
864
</div>
867
</div>
865
</div>
868
</div>
866
869
Lines 976-983 No patron matched <span class="ex">[% message %]</span> Link Here
976
</div></div>
979
</div></div>
977
[% END %]
980
[% END %]
978
981
979
980
981
</div>
982
</div>
982
</div>
983
</div>
983
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
984
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
984
- 

Return to bug 10067