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

(-)a/circ/circulation.pl (-16 / +12 lines)
Lines 27-37 use CGI; Link Here
27
use C4::Output;
27
use C4::Output;
28
use C4::Print;
28
use C4::Print;
29
use C4::Auth qw/:DEFAULT get_session/;
29
use C4::Auth qw/:DEFAULT get_session/;
30
use C4::Dates qw/format_date/;
31
use C4::Branch; # GetBranches
30
use C4::Branch; # GetBranches
32
use C4::Koha;   # GetPrinter
31
use C4::Koha;   # GetPrinter
33
use C4::Circulation;
32
use C4::Circulation;
34
use C4::Overdues qw/CheckBorrowerDebarred/;
35
use C4::Members;
33
use C4::Members;
36
use C4::Biblio;
34
use C4::Biblio;
37
use C4::Reserves;
35
use C4::Reserves;
Lines 241-247 if ($borrowernumber) { Link Here
241
            flagged  => "1",
239
            flagged  => "1",
242
            noissues => "1",
240
            noissues => "1",
243
            expired => "1",
241
            expired => "1",
244
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
242
            renewaldate => "$renew_year-$renew_month-$renew_day",
245
        );
243
        );
246
    }
244
    }
247
    # check for NotifyBorrowerDeparture
245
    # check for NotifyBorrowerDeparture
Lines 250-256 if ($borrowernumber) { Link Here
250
            Date_to_Days( $today_year, $today_month, $today_day ) ) 
248
            Date_to_Days( $today_year, $today_month, $today_day ) ) 
251
    {
249
    {
252
        # borrower card soon to expire warn librarian
250
        # borrower card soon to expire warn librarian
253
        $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
251
        $template->param("warndeparture" => $borrower->{dateexpiry},
254
        flagged       => "1",);
252
        flagged       => "1",);
255
        if (C4::Context->preference('ReturnBeforeExpiry')){
253
        if (C4::Context->preference('ReturnBeforeExpiry')){
256
            $template->param("returnbeforeexpiry" => 1);
254
            $template->param("returnbeforeexpiry" => 1);
Lines 262-273 if ($borrowernumber) { Link Here
262
        finetotal    => $fines
260
        finetotal    => $fines
263
    );
261
    );
264
262
265
    my $debar = CheckBorrowerDebarred($borrowernumber);
263
    my $debar = $borrower->{debarred};
266
    if ($debar) {
264
    if ($debar) {
267
        $template->param( 'userdebarred'    => 1 );
265
        $template->param( 'userdebarred'    => 1 );
268
        $template->param( 'debarredcomment' => $borrower->{debarredcomment} );
266
        $template->param( 'debarredcomment' => $borrower->{debarredcomment} );
269
        if ( $debar ne "9999-12-31" ) {
267
        if ( $debar ne "9999-12-31" ) {
270
            $template->param( 'userdebarreddate' => C4::Dates::format_date($debar) );
268
            $template->param( 'userdebarreddate' => $debar );
271
        }
269
        }
272
    }
270
    }
273
271
Lines 351-357 if ($borrowernumber) { Link Here
351
        $getreserv{transfered}    = 0;
349
        $getreserv{transfered}    = 0;
352
        $getreserv{nottransfered} = 0;
350
        $getreserv{nottransfered} = 0;
353
351
354
        $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
352
        $getreserv{reservedate}    = $num_res->{'reservedate'};
355
        $getreserv{reservenumber}  = $num_res->{'reservenumber'};
353
        $getreserv{reservenumber}  = $num_res->{'reservenumber'};
356
        $getreserv{title}          = $getiteminfo->{'title'};
354
        $getreserv{title}          = $getiteminfo->{'title'};
357
        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
355
        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
Lines 371-377 if ($borrowernumber) { Link Here
371
        $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'};
369
        $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'};
372
        $getWaitingReserveInfo{itemtype}     = $itemtypeinfo->{'description'};
370
        $getWaitingReserveInfo{itemtype}     = $itemtypeinfo->{'description'};
373
        $getWaitingReserveInfo{author}       = $getiteminfo->{'author'};
371
        $getWaitingReserveInfo{author}       = $getiteminfo->{'author'};
374
        $getWaitingReserveInfo{reservedate}  = format_date( $num_res->{'reservedate'} );
372
        $getWaitingReserveInfo{reservedate}  = $num_res->{'reservedate'};
375
        $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
373
        $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
376
        $getWaitingReserveInfo{waitinghere}  = 1 if $num_res->{'branchcode'} eq $branch;
374
        $getWaitingReserveInfo{waitinghere}  = 1 if $num_res->{'branchcode'} eq $branch;
377
        }
375
        }
Lines 379-385 if ($borrowernumber) { Link Here
379
        if ($transfertwhen) {
377
        if ($transfertwhen) {
380
            $getreserv{color}      = 'transfered';
378
            $getreserv{color}      = 'transfered';
381
            $getreserv{transfered} = 1;
379
            $getreserv{transfered} = 1;
382
            $getreserv{datesent}   = format_date($transfertwhen);
380
            $getreserv{datesent}   = $transfertwhen;
383
            $getreserv{frombranch} = GetBranchName($transfertfrom);
381
            $getreserv{frombranch} = GetBranchName($transfertfrom);
384
        } elsif ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) {
382
        } elsif ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) {
385
            $getreserv{nottransfered}   = 1;
383
            $getreserv{nottransfered}   = 1;
Lines 450-465 sub build_issue_data { Link Here
450
        $it->{'can_renew'} = $can_renew;
448
        $it->{'can_renew'} = $can_renew;
451
        $it->{'can_confirm'} = !$can_renew && !$restype;
449
        $it->{'can_confirm'} = !$can_renew && !$restype;
452
        $it->{'renew_error'} = $restype;
450
        $it->{'renew_error'} = $restype;
453
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
451
        $it->{'checkoutdate'} = $it->{'issuedate'};
452
        $it->{'duedate'} = $it->{'date_due'};
453
        $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
454
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
454
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
455
455
456
        $totalprice += $it->{'replacementprice'};
456
        $totalprice += $it->{'replacementprice'};
457
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
457
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
458
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
458
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
459
        $it->{'dd'} = output_pref($it->{'date_due'});
460
        $it->{'displaydate'} = output_pref($it->{'issuedate'});
461
        #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
462
        $it->{'od'} = $it->{'overdue'};
463
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
459
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
464
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
460
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
465
461
Lines 673-680 $template->param( Link Here
673
    surname           => $borrower->{'surname'},
669
    surname           => $borrower->{'surname'},
674
    showname          => $borrower->{'showname'},
670
    showname          => $borrower->{'showname'},
675
    category_type     => $borrower->{'category_type'},
671
    category_type     => $borrower->{'category_type'},
676
    dateexpiry        => format_date($newexpiry),
672
    dateexpiry        => $newexpiry,
677
    expiry            => format_date($borrower->{'dateexpiry'}),
673
    expiry            => $borrower->{'dateexpiry'},
678
    categorycode      => $borrower->{'categorycode'},
674
    categorycode      => $borrower->{'categorycode'},
679
    categoryname      => $borrower->{description},
675
    categoryname      => $borrower->{description},
680
    address           => $address,
676
    address           => $address,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-12 / +11 lines)
Lines 226-232 function refocus(calendar) { Link Here
226
</form>
226
</form>
227
</div>
227
</div>
228
228
229
[% IF ( dateexpiry ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
229
[% IF ( dateexpiry ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
230
230
231
[% IF additional_materials %]
231
[% IF additional_materials %]
232
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
232
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
Lines 258-264 function refocus(calendar) { Link Here
258
[% END %]
258
[% END %]
259
259
260
[% IF ( RESERVED ) %]
260
[% IF ( RESERVED ) %]
261
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]</li>
261
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate | $KohaDates %]</li>
262
[% END %]
262
[% END %]
263
263
264
[% IF ( ISSUED_TO_ANOTHER ) %]
264
[% IF ( ISSUED_TO_ANOTHER ) %]
Lines 554-560 No patron matched <span class="ex">[% message %]</span> Link Here
554
554
555
			[% IF ( warndeparture ) %]
555
			[% IF ( warndeparture ) %]
556
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
556
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
557
			Patron's card expires on [% expiry %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
557
			Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
558
558
559
			</li>
559
			</li>
560
			[% END %]
560
			[% END %]
Lines 567-573 No patron matched <span class="ex">[% message %]</span> Link Here
567
567
568
			[% IF ( expired ) %]
568
			[% IF ( expired ) %]
569
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
569
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
570
			[% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
570
			[% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>
571
571
572
			</li>
572
			</li>
573
			[% END %]
573
			[% END %]
Lines 582-588 No patron matched <span class="ex">[% message %]</span> Link Here
582
582
583
            [% IF ( userdebarred ) %]
583
            [% IF ( userdebarred ) %]
584
               <li class="blocker">
584
               <li class="blocker">
585
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
585
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate | $KohaDates %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
586
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
586
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
587
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
587
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
588
	                <input type="hidden" name="destination" value="circ" />
588
	                <input type="hidden" name="destination" value="circ" />
Lines 619-625 No patron matched <span class="ex">[% message %]</span> Link Here
619
		    <h4>Holds waiting:</h4>
619
		    <h4>Holds waiting:</h4>
620
			        [% FOREACH WaitingReserveLoo IN WaitingReserveLoop %]
620
			        [% FOREACH WaitingReserveLoo IN WaitingReserveLoop %]
621
			            <ul>
621
			            <ul>
622
			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% WaitingReserveLoo.biblionumber %]">[% WaitingReserveLoo.title |html %]</a> ([% WaitingReserveLoo.itemtype %]), [% IF ( WaitingReserveLoo.author ) %]by [% WaitingReserveLoo.author %][% END %] Hold placed on [% WaitingReserveLoo.reservedate %].
622
			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% WaitingReserveLoo.biblionumber %]">[% WaitingReserveLoo.title |html %]</a> ([% WaitingReserveLoo.itemtype %]), [% IF ( WaitingReserveLoo.author ) %]by [% WaitingReserveLoo.author %][% END %] Hold placed on [% WaitingReserveLoo.reservedate | $KohaDates %].
623
			            [% IF ( WaitingReserveLoo.waitingat ) %]
623
			            [% IF ( WaitingReserveLoo.waitingat ) %]
624
			                <br />[% IF ( WaitingReserveLoo.waitinghere ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]Waiting at [% WaitingReserveLoo.waitingat %]</strong>
624
			                <br />[% IF ( WaitingReserveLoo.waitinghere ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]Waiting at [% WaitingReserveLoo.waitingat %]</strong>
625
			            [% END %]
625
			            [% END %]
Lines 724-734 No patron matched <span class="ex">[% message %]</span> Link Here
724
    <tr class="highlight">
724
    <tr class="highlight">
725
    [% END %]
725
    [% END %]
726
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
726
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
727
        [% todayissue.dd %]
727
        [% todayissue.duedate | $KohaDates %]
728
        </td>
728
        </td>
729
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
729
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
730
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
730
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
731
        <td>[% todayissue.checkoutdate %]</td>
731
        <td>[% todayissue.checkoutdate | $KohaDates %]</td>
732
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
732
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
733
        <td>[% todayissue.issuingbranchname %]</td>
733
        <td>[% todayissue.issuingbranchname %]</td>
734
        <td>[% todayissue.itemcallnumber %]</td>
734
        <td>[% todayissue.itemcallnumber %]</td>
Lines 797-809 No patron matched <span class="ex">[% message %]</span> Link Here
797
        <tr class="highlight">
797
        <tr class="highlight">
798
    [% END %]
798
    [% END %]
799
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
799
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
800
        [% previssue.dd %]
800
        [% previssue.duedate | $KohaDates %]
801
        </td>
801
        </td>
802
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
802
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
803
        <td>
803
        <td>
804
            [% previssue.itemtype %]
804
            [% previssue.itemtype %]
805
        </td>
805
        </td>
806
        <td>[% previssue.displaydate %]</td>
806
        <td>[% previssue.issuedate | $KohaDates %]</td>
807
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
807
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
808
        <td>[% previssue.issuingbranchname %]</td>
808
        <td>[% previssue.issuingbranchname %]</td>
809
        <td>[% previssue.itemcallnumber %]</td>
809
        <td>[% previssue.itemcallnumber %]</td>
Lines 965-971 No patron matched <span class="ex">[% message %]</span> Link Here
965
		<tbody>
965
		<tbody>
966
        [% FOREACH reservloo IN reservloop %]
966
        [% FOREACH reservloo IN reservloop %]
967
        <tr class="[% reservloo.color %]">
967
        <tr class="[% reservloo.color %]">
968
                    <td>[% reservloo.reservedate %]</td>
968
                    <td>[% reservloo.reservedate | $KohaDates %]</td>
969
                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]"><strong>[% reservloo.title |html %]</strong></a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]</td>
969
                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]"><strong>[% reservloo.title |html %]</strong></a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]</td>
970
                    <td>[% reservloo.itemcallnumber %]</td>
970
                    <td>[% reservloo.itemcallnumber %]</td>
971
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
971
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
972
- 

Return to bug 7444