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

(-)a/circ/circulation.pl (-40 / +49 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 137-149 my $barcode = $query->param('barcode') || q{}; Link Here
137
$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
135
$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
138
136
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');
142
my $issueconfirmed = $query->param('issueconfirmed');
140
my $restoreduedatespec  = $query->param('restoreduedatespec') || $session->param('stickyduedate');
143
my $cancelreserve  = $query->param('cancelreserve');
141
my $issueconfirmed      = $query->param('issueconfirmed');
144
my $print          = $query->param('print') || q{};
142
my $cancelreserve       = $query->param('cancelreserve');
145
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
143
my $print               = $query->param('print') || q{};
146
my $charges        = $query->param('charges') || q{};
144
my $debt_confirmed      = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
145
my $charges             = $query->param('charges') || q{};
147
146
148
# Check if stickyduedate is turned off
147
# Check if stickyduedate is turned off
149
if ( $barcode ) {
148
if ( $barcode ) {
Lines 519-556 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
522
if ($restoreduedatespec) {
523
    $duedatespec = $restoreduedatespec;
524
525
    if ($stickyduedate eq 'on') {
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,
525
    all_messages_del  => C4::Context->preference('AllowAllMessageDeletion'),
533
    all_messages_del            => C4::Context->preference('AllowAllMessageDeletion'),
526
    findborrower      => $findborrower,
534
    findborrower                => $findborrower,
527
    borrower          => $borrower,
535
    borrower                    => $borrower,
528
    borrowernumber    => $borrowernumber,
536
    borrowernumber              => $borrowernumber,
529
    branch            => $branch,
537
    branch                      => $branch,
530
    branchname        => GetBranchName($borrower->{'branchcode'}),
538
    branchname                  => GetBranchName($borrower->{'branchcode'}),
531
    printer           => $printer,
539
    printer                     => $printer,
532
    printername       => $printer,
540
    printername                 => $printer,
533
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
541
    was_renewed                 => $query->param('was_renewed') ? 1 : 0,
534
    expiry            => format_date($borrower->{'dateexpiry'}),
542
    expiry                      => format_date($borrower->{'dateexpiry'}),
535
    roadtype          => $roadtype,
543
    roadtype                    => $roadtype,
536
    amountold         => $amountold,
544
    amountold                   => $amountold,
537
    barcode           => $barcode,
545
    barcode                     => $barcode,
538
    stickyduedate     => $stickyduedate,
546
    stickyduedate               => $stickyduedate,
539
    duedatespec       => $duedatespec,
547
    duedatespec                 => $duedatespec,
540
    message           => $message,
548
    restoreduedatespec          => $restoreduedatespec,
541
    totaldue          => sprintf('%.2f', $total),
549
    message                     => $message,
542
    inprocess         => $inprocess,
550
    totaldue                    => sprintf('%.2f', $total),
543
    is_child          => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
551
    inprocess                   => $inprocess,
544
    circview => 1,
552
    is_child                    => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
545
    soundon           => C4::Context->preference("SoundOn"),
553
    circview                    => 1,
546
    fast_cataloging   => $fast_cataloging,
554
    soundon                     => C4::Context->preference("SoundOn"),
547
    CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
555
    fast_cataloging             => $fast_cataloging,
548
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
556
    CircAutoPrintQuickSlip      => C4::Context->preference("CircAutoPrintQuickSlip"),
549
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
557
    activeBorrowerRelationship  => (C4::Context->preference('borrowerRelationship') ne ''),
550
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
558
    SuspendHoldsIntranet        => C4::Context->preference('SuspendHoldsIntranet'),
551
    RoutingSerials => C4::Context->preference('RoutingSerials'),
559
    AutoResumeSuspendedHolds    => C4::Context->preference('AutoResumeSuspendedHolds'),
552
    relatives_issues_count => $relatives_issues_count,
560
    RoutingSerials              => C4::Context->preference('RoutingSerials'),
553
    relatives_borrowernumbers => \@relatives,
561
    relatives_issues_count      => $relatives_issues_count,
562
    relatives_borrowernumbers   => \@relatives,
554
);
563
);
555
564
556
# save stickyduedate to session
565
# save stickyduedate to session
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +10 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 380-387 $(document).ready(function() { Link Here
380
384
381
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
385
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
382
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
386
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
387
    <input type="hidden" name="restoreduedatespec" />
383
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
388
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
384
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
389
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
390
    <input type="hidden" name="restoreduedatespec" />
385
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
391
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
386
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
392
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
387
        [% IF ( RENEW_ISSUE ) %]
393
        [% IF ( RENEW_ISSUE ) %]
Lines 430-435 $(document).ready(function() { Link Here
430
                    <br />
436
                    <br />
431
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
437
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
432
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
438
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
439
                        <input type="hidden" name="restoreduedatespec" />
433
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
440
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
434
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
441
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
435
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
442
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 537-547 No patron matched <span class="ex">[% message %]</span> Link Here
537
</h4>
544
</h4>
538
[% END %]
545
[% END %]
539
546
540
541
[% IF ( borrowers ) %]
547
[% IF ( borrowers ) %]
542
[% INCLUDE 'patron-toolbar.inc' %]
548
[% INCLUDE 'patron-toolbar.inc' %]
543
549
544
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
550
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
551
    <input type="hidden" name="restoreduedatespec" />
545
<fieldset id="circ_circulation_selectborrower" class="brief">
552
<fieldset id="circ_circulation_selectborrower" class="brief">
546
    <legend>Patron selection</legend>
553
    <legend>Patron selection</legend>
547
554
Lines 592-599 No patron matched <span class="ex">[% message %]</span> Link Here
592
599
593
[% END %]
600
[% END %]
594
601
595
596
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
602
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
603
    <input type="hidden" name="restoreduedatespec" />
597
[% IF ( issue ) %]
604
[% IF ( issue ) %]
598
    <fieldset id="circ_circulation_issue" class="lastchecked">
605
    <fieldset id="circ_circulation_issue" class="lastchecked">
599
[% ELSE %]
606
[% ELSE %]
Lines 777-784 No patron matched <span class="ex">[% message %]</span> Link Here
777
            </li>
784
            </li>
778
			[% END %]
785
			[% END %]
779
786
780
781
782
			</ul>
787
			</ul>
783
        </div>
788
        </div>
784
789
Lines 846-852 No patron matched <span class="ex">[% message %]</span> Link Here
846
     <!-- /If flagged -->[% END %]
851
     <!-- /If flagged -->[% END %]
847
852
848
	
853
	
849
850
</div>
854
</div>
851
</div>
855
</div>
852
856
Lines 960-967 No patron matched <span class="ex">[% message %]</span> Link Here
960
</div></div>
964
</div></div>
961
[% END %]
965
[% END %]
962
966
963
964
965
</div>
967
</div>
966
</div>
968
</div>
967
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
969
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
968
- 

Return to bug 10067