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

(-)a/C4/Circulation.pm (-2 / +7 lines)
Lines 641-647 reserved for someone else. Link Here
641
641
642
=head3 INVALID_DATE
642
=head3 INVALID_DATE
643
643
644
sticky due date is invalid
644
sticky due date is invalid or due date in the past
645
645
646
=head3 TOO_MANY
646
=head3 TOO_MANY
647
647
Lines 679-685 sub CanBookBeIssued { Link Here
679
        # Offline circ calls AddIssue directly, doesn't run through here
679
        # Offline circ calls AddIssue directly, doesn't run through here
680
        #  So issuingimpossible should be ok.
680
        #  So issuingimpossible should be ok.
681
    }
681
    }
682
    $issuingimpossible{INVALID_DATE} = $duedate->output('syspref') unless ( $duedate && $duedate->output('iso') ge C4::Dates->today('iso') );
682
    if ($duedate) {
683
        $needsconfirmation{INVALID_DATE} = $duedate->output('syspref')
684
          unless $duedate->output('iso') ge C4::Dates->today('iso');
685
    } else {
686
        $issuingimpossible{INVALID_DATE} = $duedate->output('syspref');
687
    }
683
688
684
    #
689
    #
685
    # BORROWER STATUS
690
    # BORROWER STATUS
(-)a/circ/circulation.pl (-6 / +6 lines)
Lines 142-154 if($duedatespec_allow){ Link Here
142
    if ($duedatespec) {
142
    if ($duedatespec) {
143
        if ($duedatespec =~ C4::Dates->regexp('syspref')) {
143
        if ($duedatespec =~ C4::Dates->regexp('syspref')) {
144
            my $tempdate = C4::Dates->new($duedatespec);
144
            my $tempdate = C4::Dates->new($duedatespec);
145
            if ($tempdate and $tempdate->output('iso') gt C4::Dates->new()->output('iso')) {
145
#           if ($tempdate and $tempdate->output('iso') gt C4::Dates->new()->output('iso')) {
146
                # i.e., it has to be later than today/now
146
#               # i.e., it has to be later than today/now
147
                $datedue = $tempdate;
147
                $datedue = $tempdate;
148
            } else {
148
#           } else {
149
                $invalidduedate = 1;
149
#               $invalidduedate = 1;
150
                $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
150
#               $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
151
            }
151
#           }
152
        } else {
152
        } else {
153
            $invalidduedate = 1;
153
            $invalidduedate = 1;
154
            $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
154
            $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl (-4 / +10 lines)
Lines 267-273 function refocus(calendar) { Link Here
267
    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
267
    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
268
    <input type="hidden" name="issueconfirmed" value="1" />
268
    <input type="hidden" name="issueconfirmed" value="1" />
269
    <!-- TMPL_IF NAME="DEBT" --><input type="hidden" name="debt_confirmed" value="1" /><!-- /TMPL_IF -->
269
    <!-- TMPL_IF NAME="DEBT" --><input type="hidden" name="debt_confirmed" value="1" /><!-- /TMPL_IF -->
270
    <!-- TMPL_IF NAME="INVALID_DATE" -->
271
    <p>
272
    <input type="text" size="10" id="duedatespec" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" />
273
    <label for="duedatespec">Due Date</label>
274
    </p>
275
    <!-- TMPL_ELSE -->
270
    <input type="hidden" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" />
276
    <input type="hidden" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" />
277
    <!-- /TMPL_IF -->
271
    <input type="hidden" name="stickyduedate" value="<!-- TMPL_VAR NAME="stickyduedate" -->" />
278
    <input type="hidden" name="stickyduedate" value="<!-- TMPL_VAR NAME="stickyduedate" -->" />
272
    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
279
    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
273
    <input type="submit" class="approve" value="Yes, Check Out (Y)" accesskey="y" />
280
    <input type="submit" class="approve" value="Yes, Check Out (Y)" accesskey="y" />
Lines 420-426 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
420
    <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
427
    <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
421
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
428
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
422
    <!-- TMPL_ELSE -->
429
    <!-- TMPL_ELSE -->
423
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
430
	    <!-- TMPL_IF NAME="barcode" -->><input type="text" name="barcode" id="barcode" class="barcode focus" size="14" value="<!-- TMPL_VAR NAME="barcode" -->"/><!-- TMPL_ELSE --><input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /><!-- /TMPL_IF -->
424
    <!-- /TMPL_IF -->
431
    <!-- /TMPL_IF -->
425
    <input type="submit" value="Check Out" />
432
    <input type="submit" value="Check Out" />
426
433
Lines 449-456 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
449
                             inputField : "duedatespec",
456
                             inputField : "duedatespec",
450
                             ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
457
                             ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
451
                             button : "CalendarDueDate",
458
                             button : "CalendarDueDate",
452
                             disableFunc : validate1,
459
//                           disableFunc : validate1,
453
                             dateStatusFunc : validate1,
460
//                           dateStatusFunc : validate1,
454
                             onClose : refocus
461
                             onClose : refocus
455
                           }
462
                           }
456
                        );
463
                        );
457
- 

Return to bug 2965