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

(-)a/circ/circulation.pl (-7 / +11 lines)
Lines 56-62 use Date::Calc qw( Link Here
56
);
56
);
57
use List::MoreUtils qw/uniq/;
57
use List::MoreUtils qw/uniq/;
58
58
59
60
#
59
#
61
# PARAMETERS READING
60
# PARAMETERS READING
62
#
61
#
Lines 123-129 my $borrowernumber = $query->param('borrowernumber'); Link Here
123
$branch  = C4::Context->userenv->{'branch'};  
122
$branch  = C4::Context->userenv->{'branch'};  
124
$printer = C4::Context->userenv->{'branchprinter'};
123
$printer = C4::Context->userenv->{'branchprinter'};
125
124
126
127
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
125
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
128
if (C4::Context->preference("AutoLocation") != 1) {
126
if (C4::Context->preference("AutoLocation") != 1) {
129
    $template->param(ManualLocation => 1);
127
    $template->param(ManualLocation => 1);
Lines 139-144 $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace Link Here
139
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
137
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
140
my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
138
my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
141
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
139
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
140
my $restoreduedatespec  = $query->param('restoreduedatespec') || $session->param('stickyduedate');
142
my $issueconfirmed = $query->param('issueconfirmed');
141
my $issueconfirmed = $query->param('issueconfirmed');
143
my $cancelreserve  = $query->param('cancelreserve');
142
my $cancelreserve  = $query->param('cancelreserve');
144
my $print          = $query->param('print') || q{};
143
my $print          = $query->param('print') || q{};
Lines 519-524 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree Link Here
519
518
520
$template->param(%$borrower);
519
$template->param(%$borrower);
521
520
521
# Restore date if changed by holds and/or save stickyduedate to session
522
if ($restoreduedatespec || $stickyduedate) {
523
    $duedatespec = $restoreduedatespec || $duedatespec;
524
525
    if ($stickyduedate) {
526
        $session->param( 'stickyduedate', $duedatespec );
527
    }
528
}
529
522
$template->param(
530
$template->param(
523
    lib_messages_loop => $lib_messages_loop,
531
    lib_messages_loop => $lib_messages_loop,
524
    bor_messages_loop => $bor_messages_loop,
532
    bor_messages_loop => $bor_messages_loop,
Lines 537-542 $template->param( Link Here
537
    barcode           => $barcode,
545
    barcode           => $barcode,
538
    stickyduedate     => $stickyduedate,
546
    stickyduedate     => $stickyduedate,
539
    duedatespec       => $duedatespec,
547
    duedatespec       => $duedatespec,
548
    restoreduedatespec => $restoreduedatespec,
540
    message           => $message,
549
    message           => $message,
541
    totaldue          => sprintf('%.2f', $total),
550
    totaldue          => sprintf('%.2f', $total),
542
    inprocess         => $inprocess,
551
    inprocess         => $inprocess,
Lines 553-563 $template->param( Link Here
553
    relatives_borrowernumbers => \@relatives,
562
    relatives_borrowernumbers => \@relatives,
554
);
563
);
555
564
556
# save stickyduedate to session
557
if ($stickyduedate) {
558
    $session->param( 'stickyduedate', $duedatespec );
559
}
560
561
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
565
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
562
$template->param( picture => 1 ) if $picture;
566
$template->param( picture => 1 ) if $picture;
563
567
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +9 lines)
Lines 311-323 $(document).ready(function() { Link Here
311
[% IF HIGHHOLDS %]
311
[% IF HIGHHOLDS %]
312
	<script language="JavaScript" type="text/javascript">
312
	<script language="JavaScript" type="text/javascript">
313
	$(document).ready(function() {
313
	$(document).ready(function() {
314
		$("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
314
            $("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
315
            $("input[name=restoreduedatespec]:hidden").val('[% duedatespec %]');
315
	});
316
	});
316
	</script>
317
	</script>
317
[% END %]
318
[% END %]
318
319
319
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
320
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
320
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
321
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
322
    <input type="hidden" name="restoreduedatespec" />
321
323
322
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
324
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
323
325
Lines 362-367 $(document).ready(function() { Link Here
362
364
363
[% IF ( RESERVED ) %]
365
[% IF ( RESERVED ) %]
364
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
366
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
367
    <input type="hidden" name="restoreduedatespec" />
365
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
368
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
366
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
369
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
367
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
370
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 371-376 $(document).ready(function() { Link Here
371
374
372
[% IF ( RESERVE_WAITING ) %]
375
[% IF ( RESERVE_WAITING ) %]
373
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
376
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
377
    <input type="hidden" name="restoreduedatespec" />
374
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
378
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
375
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
379
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
376
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
380
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 382-387 $(document).ready(function() { Link Here
382
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
386
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
383
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
387
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
384
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
388
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
389
    <input type="hidden" name="restoreduedatespec" />
385
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
390
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
386
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
391
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
387
        [% IF ( RENEW_ISSUE ) %]
392
        [% IF ( RENEW_ISSUE ) %]
Lines 430-435 $(document).ready(function() { Link Here
430
                    <br />
435
                    <br />
431
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
436
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
432
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
437
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
438
                        <input type="hidden" name="restoreduedatespec" />
433
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
439
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
434
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
440
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
435
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
441
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 541-551 No patron matched <span class="ex">[% message %]</span> Link Here
541
</h4>
547
</h4>
542
[% END %]
548
[% END %]
543
549
544
545
[% IF ( borrowers ) %]
550
[% IF ( borrowers ) %]
546
[% INCLUDE 'patron-toolbar.inc' %]
551
[% INCLUDE 'patron-toolbar.inc' %]
547
552
548
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
553
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
554
    <input type="hidden" name="restoreduedatespec" />
549
<fieldset id="circ_circulation_selectborrower" class="brief">
555
<fieldset id="circ_circulation_selectborrower" class="brief">
550
    <legend>Patron selection</legend>
556
    <legend>Patron selection</legend>
551
557
Lines 601-608 No patron matched <span class="ex">[% message %]</span> Link Here
601
607
602
[% END %]
608
[% END %]
603
609
604
605
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
610
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
611
    <input type="hidden" name="restoreduedatespec" />
606
[% IF ( issue ) %]
612
[% IF ( issue ) %]
607
    <fieldset id="circ_circulation_issue" class="lastchecked">
613
    <fieldset id="circ_circulation_issue" class="lastchecked">
608
[% ELSE %]
614
[% ELSE %]
Lines 786-793 No patron matched <span class="ex">[% message %]</span> Link Here
786
            </li>
792
            </li>
787
			[% END %]
793
			[% END %]
788
794
789
790
791
			</ul>
795
			</ul>
792
        </div>
796
        </div>
793
797
Lines 855-861 No patron matched <span class="ex">[% message %]</span> Link Here
855
     <!-- /If flagged -->[% END %]
859
     <!-- /If flagged -->[% END %]
856
860
857
	
861
	
858
859
</div>
862
</div>
860
</div>
863
</div>
861
864
Lines 971-978 No patron matched <span class="ex">[% message %]</span> Link Here
971
</div></div>
974
</div></div>
972
[% END %]
975
[% END %]
973
976
974
975
976
</div>
977
</div>
977
</div>
978
</div>
978
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
979
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
979
- 

Return to bug 10067