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

(-)a/circ/circulation.pl (-40 / +49 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 136-148 my $barcode = $query->param('barcode') || q{}; Link Here
136
$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
134
$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
137
135
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');
141
my $issueconfirmed = $query->param('issueconfirmed');
139
my $restoreduedatespec  = $query->param('restoreduedatespec') || $session->param('stickyduedate');
142
my $cancelreserve  = $query->param('cancelreserve');
140
my $issueconfirmed      = $query->param('issueconfirmed');
143
my $print          = $query->param('print') || q{};
141
my $cancelreserve       = $query->param('cancelreserve');
144
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
142
my $print               = $query->param('print') || q{};
145
my $charges        = $query->param('charges') || q{};
143
my $debt_confirmed      = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
144
my $charges             = $query->param('charges') || q{};
146
145
147
# Check if stickyduedate is turned off
146
# Check if stickyduedate is turned off
148
if ( $barcode ) {
147
if ( $barcode ) {
Lines 541-578 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree Link Here
541
540
542
$template->param(%$borrower);
541
$template->param(%$borrower);
543
542
543
# Restore date if changed by holds
544
if ($restoreduedatespec) {
545
    $duedatespec = $restoreduedatespec;
546
547
    if ($stickyduedate eq 'on') {
548
        $session->param( 'stickyduedate', $duedatespec );
549
    }
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,
547
    all_messages_del  => C4::Context->preference('AllowAllMessageDeletion'),
555
    all_messages_del            => C4::Context->preference('AllowAllMessageDeletion'),
548
    findborrower      => $findborrower,
556
    findborrower                => $findborrower,
549
    borrower          => $borrower,
557
    borrower                    => $borrower,
550
    borrowernumber    => $borrowernumber,
558
    borrowernumber              => $borrowernumber,
551
    branch            => $branch,
559
    branch                      => $branch,
552
    branchname        => GetBranchName($borrower->{'branchcode'}),
560
    branchname                  => GetBranchName($borrower->{'branchcode'}),
553
    printer           => $printer,
561
    printer                     => $printer,
554
    printername       => $printer,
562
    printername                 => $printer,
555
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
563
    was_renewed                 => $query->param('was_renewed') ? 1 : 0,
556
    expiry            => format_date($borrower->{'dateexpiry'}),
564
    expiry                      => format_date($borrower->{'dateexpiry'}),
557
    roadtype          => $roadtype,
565
    roadtype                    => $roadtype,
558
    amountold         => $amountold,
566
    amountold                   => $amountold,
559
    barcode           => $barcode,
567
    barcode                     => $barcode,
560
    stickyduedate     => $stickyduedate,
568
    stickyduedate               => $stickyduedate,
561
    duedatespec       => $duedatespec,
569
    duedatespec                 => $duedatespec,
562
    message           => $message,
570
    restoreduedatespec          => $restoreduedatespec,
563
    totaldue          => sprintf('%.2f', $total),
571
    message                     => $message,
564
    inprocess         => $inprocess,
572
    totaldue                    => sprintf('%.2f', $total),
565
    is_child          => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
573
    inprocess                   => $inprocess,
566
    circview => 1,
574
    is_child                    => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
567
    soundon           => C4::Context->preference("SoundOn"),
575
    circview                    => 1,
568
    fast_cataloging   => $fast_cataloging,
576
    soundon                     => C4::Context->preference("SoundOn"),
569
    CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
577
    fast_cataloging             => $fast_cataloging,
570
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
578
    CircAutoPrintQuickSlip      => C4::Context->preference("CircAutoPrintQuickSlip"),
571
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
579
    activeBorrowerRelationship  => (C4::Context->preference('borrowerRelationship') ne ''),
572
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
580
    SuspendHoldsIntranet        => C4::Context->preference('SuspendHoldsIntranet'),
573
    RoutingSerials => C4::Context->preference('RoutingSerials'),
581
    AutoResumeSuspendedHolds    => C4::Context->preference('AutoResumeSuspendedHolds'),
574
    relatives_issues_count => $relatives_issues_count,
582
    RoutingSerials              => C4::Context->preference('RoutingSerials'),
575
    relatives_borrowernumbers => \@relatives,
583
    relatives_issues_count      => $relatives_issues_count,
584
    relatives_borrowernumbers   => \@relatives,
576
);
585
);
577
586
578
# save stickyduedate to session
587
# save stickyduedate to session
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +10 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
            $("input[name=restoreduedatespec]:hidden").val('[% duedatespec %]');
314
	});
315
	});
315
	</script>
316
	</script>
316
[% END %]
317
[% END %]
317
318
318
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
319
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
319
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
320
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
321
    <input type="hidden" name="restoreduedatespec" />
320
322
321
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
323
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
322
324
Lines 361-366 $(document).ready(function() { Link Here
361
363
362
[% IF ( RESERVED ) %]
364
[% IF ( RESERVED ) %]
363
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
365
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
366
    <input type="hidden" name="restoreduedatespec" />
364
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
367
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
365
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
368
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
366
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
369
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 370-375 $(document).ready(function() { Link Here
370
373
371
[% IF ( RESERVE_WAITING ) %]
374
[% IF ( RESERVE_WAITING ) %]
372
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
375
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
376
    <input type="hidden" name="restoreduedatespec" />
373
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
377
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
374
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
378
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
375
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
379
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 379-386 $(document).ready(function() { Link Here
379
383
380
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
384
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
381
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
385
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
386
    <input type="hidden" name="restoreduedatespec" />
382
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
387
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
383
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
388
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
389
    <input type="hidden" name="restoreduedatespec" />
384
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
390
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
385
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
391
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
386
        [% IF ( RENEW_ISSUE ) %]
392
        [% IF ( RENEW_ISSUE ) %]
Lines 429-434 $(document).ready(function() { Link Here
429
                    <br />
435
                    <br />
430
                    <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">
431
                    [% 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" />
432
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
439
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
433
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
440
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
434
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
441
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 536-546 No patron matched <span class="ex">[% message %]</span> Link Here
536
</h4>
543
</h4>
537
[% END %]
544
[% END %]
538
545
539
540
[% IF ( borrowers ) %]
546
[% IF ( borrowers ) %]
541
[% INCLUDE 'patron-toolbar.inc' %]
547
[% INCLUDE 'patron-toolbar.inc' %]
542
548
543
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
549
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
550
    <input type="hidden" name="restoreduedatespec" />
544
<fieldset id="circ_circulation_selectborrower" class="brief">
551
<fieldset id="circ_circulation_selectborrower" class="brief">
545
    <legend>Patron selection</legend>
552
    <legend>Patron selection</legend>
546
553
Lines 591-598 No patron matched <span class="ex">[% message %]</span> Link Here
591
598
592
[% END %]
599
[% END %]
593
600
594
595
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
601
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
602
    <input type="hidden" name="restoreduedatespec" />
596
[% IF ( issue ) %]
603
[% IF ( issue ) %]
597
    <fieldset id="circ_circulation_issue" class="lastchecked">
604
    <fieldset id="circ_circulation_issue" class="lastchecked">
598
[% ELSE %]
605
[% ELSE %]
Lines 776-783 No patron matched <span class="ex">[% message %]</span> Link Here
776
            </li>
783
            </li>
777
			[% END %]
784
			[% END %]
778
785
779
780
781
			</ul>
786
			</ul>
782
        </div>
787
        </div>
783
788
Lines 836-842 No patron matched <span class="ex">[% message %]</span> Link Here
836
     <!-- /If flagged -->[% END %]
841
     <!-- /If flagged -->[% END %]
837
842
838
	
843
	
839
840
</div>
844
</div>
841
</div>
845
</div>
842
846
Lines 950-957 No patron matched <span class="ex">[% message %]</span> Link Here
950
</div></div>
954
</div></div>
951
[% END %]
955
[% END %]
952
956
953
954
955
</div>
957
</div>
956
</div>
958
</div>
957
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
959
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
958
- 

Return to bug 10067