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

(-)a/circ/circulation.pl (-15 / +12 lines)
Lines 25-35 use strict; Link Here
25
use CGI;
25
use CGI;
26
use C4::Output;
26
use C4::Output;
27
use C4::Auth qw/:DEFAULT get_session/;
27
use C4::Auth qw/:DEFAULT get_session/;
28
use C4::Dates qw/format_date/;
29
use C4::Branch; # GetBranches
28
use C4::Branch; # GetBranches
30
use C4::Koha;   # GetPrinter
29
use C4::Koha;   # GetPrinter
31
use C4::Circulation;
30
use C4::Circulation;
32
use C4::Overdues qw/CheckBorrowerDebarred/;
33
use C4::Members;
31
use C4::Members;
34
use C4::Biblio;
32
use C4::Biblio;
35
use C4::Reserves;
33
use C4::Reserves;
Lines 240-246 if ($borrowernumber) { Link Here
240
            flagged  => "1",
238
            flagged  => "1",
241
            noissues => "1",
239
            noissues => "1",
242
            expired => "1",
240
            expired => "1",
243
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
241
            renewaldate => "$renew_year-$renew_month-$renew_day",
244
        );
242
        );
245
    }
243
    }
246
    # check for NotifyBorrowerDeparture
244
    # check for NotifyBorrowerDeparture
Lines 249-255 if ($borrowernumber) { Link Here
249
            Date_to_Days( $today_year, $today_month, $today_day ) ) 
247
            Date_to_Days( $today_year, $today_month, $today_day ) ) 
250
    {
248
    {
251
        # borrower card soon to expire warn librarian
249
        # borrower card soon to expire warn librarian
252
        $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
250
        $template->param("warndeparture" => $borrower->{dateexpiry},
253
        flagged       => "1",);
251
        flagged       => "1",);
254
        if (C4::Context->preference('ReturnBeforeExpiry')){
252
        if (C4::Context->preference('ReturnBeforeExpiry')){
255
            $template->param("returnbeforeexpiry" => 1);
253
            $template->param("returnbeforeexpiry" => 1);
Lines 261-272 if ($borrowernumber) { Link Here
261
        finetotal    => $fines
259
        finetotal    => $fines
262
    );
260
    );
263
261
264
    my $debar = CheckBorrowerDebarred($borrowernumber);
262
    my $debar = $borrower->{debarred};
265
    if ($debar) {
263
    if ($debar) {
266
        $template->param( 'userdebarred'    => 1 );
264
        $template->param( 'userdebarred'    => 1 );
267
        $template->param( 'debarredcomment' => $borrower->{debarredcomment} );
265
        $template->param( 'debarredcomment' => $borrower->{debarredcomment} );
268
        if ( $debar ne "9999-12-31" ) {
266
        if ( $debar ne "9999-12-31" ) {
269
            $template->param( 'userdebarreddate' => C4::Dates::format_date($debar) );
267
            $template->param( 'userdebarreddate' => $debar );
270
        }
268
        }
271
    }
269
    }
272
270
Lines 348-354 if ($borrowernumber) { Link Here
348
        $getreserv{transfered}    = 0;
346
        $getreserv{transfered}    = 0;
349
        $getreserv{nottransfered} = 0;
347
        $getreserv{nottransfered} = 0;
350
348
351
        $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
349
        $getreserv{reservedate}    = $num_res->{'reservedate'};
352
        $getreserv{reservenumber}  = $num_res->{'reservenumber'};
350
        $getreserv{reservenumber}  = $num_res->{'reservenumber'};
353
        $getreserv{title}          = $getiteminfo->{'title'};
351
        $getreserv{title}          = $getiteminfo->{'title'};
354
        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
352
        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
Lines 366-372 if ($borrowernumber) { Link Here
366
        $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'};
364
        $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'};
367
        $getWaitingReserveInfo{itemtype}     = $itemtypeinfo->{'description'};
365
        $getWaitingReserveInfo{itemtype}     = $itemtypeinfo->{'description'};
368
        $getWaitingReserveInfo{author}       = $getiteminfo->{'author'};
366
        $getWaitingReserveInfo{author}       = $getiteminfo->{'author'};
369
        $getWaitingReserveInfo{reservedate}  = format_date( $num_res->{'reservedate'} );
367
        $getWaitingReserveInfo{reservedate}  = $num_res->{'reservedate'};
370
        $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
368
        $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
371
        $getWaitingReserveInfo{waitinghere}  = 1 if $num_res->{'branchcode'} eq $branch;
369
        $getWaitingReserveInfo{waitinghere}  = 1 if $num_res->{'branchcode'} eq $branch;
372
        }
370
        }
Lines 374-380 if ($borrowernumber) { Link Here
374
        if ($transfertwhen) {
372
        if ($transfertwhen) {
375
            $getreserv{color}      = 'transfered';
373
            $getreserv{color}      = 'transfered';
376
            $getreserv{transfered} = 1;
374
            $getreserv{transfered} = 1;
377
            $getreserv{datesent}   = format_date($transfertwhen);
375
            $getreserv{datesent}   = $transfertwhen;
378
            $getreserv{frombranch} = GetBranchName($transfertfrom);
376
            $getreserv{frombranch} = GetBranchName($transfertfrom);
379
        } elsif ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) {
377
        } elsif ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) {
380
            $getreserv{nottransfered}   = 1;
378
            $getreserv{nottransfered}   = 1;
Lines 445-459 sub build_issue_data { Link Here
445
        $it->{'can_renew'} = $can_renew;
443
        $it->{'can_renew'} = $can_renew;
446
        $it->{'can_confirm'} = !$can_renew && !$restype;
444
        $it->{'can_confirm'} = !$can_renew && !$restype;
447
        $it->{'renew_error'} = $restype;
445
        $it->{'renew_error'} = $restype;
448
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
446
        $it->{'checkoutdate'} = $it->{'issuedate'};
447
        $it->{'duedate'} = $it->{'date_due'};
448
        $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
449
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
449
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
450
450
451
        $totalprice += $it->{'replacementprice'};
451
        $totalprice += $it->{'replacementprice'};
452
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
452
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
453
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
453
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
454
        $it->{'dd'} = format_date($it->{'date_due'});
455
        $it->{'displaydate'} = format_date($it->{'issuedate'});
456
        $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
457
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
454
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
458
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
455
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
459
456
Lines 667-674 $template->param( Link Here
667
    surname           => $borrower->{'surname'},
664
    surname           => $borrower->{'surname'},
668
    showname          => $borrower->{'showname'},
665
    showname          => $borrower->{'showname'},
669
    category_type     => $borrower->{'category_type'},
666
    category_type     => $borrower->{'category_type'},
670
    dateexpiry        => format_date($newexpiry),
667
    dateexpiry        => $newexpiry,
671
    expiry            => format_date($borrower->{'dateexpiry'}),
668
    expiry            => $borrower->{'dateexpiry'},
672
    categorycode      => $borrower->{'categorycode'},
669
    categorycode      => $borrower->{'categorycode'},
673
    categoryname      => $borrower->{description},
670
    categoryname      => $borrower->{description},
674
    address           => $address,
671
    address           => $address,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-12 / +12 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Circulation [% IF ( borrowernumber ) %] &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' %] [% END %]</title>
3
<title>Koha &rsaquo; Circulation [% IF ( borrowernumber ) %] &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' %] [% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 225-231 function refocus(calendar) { Link Here
225
</form>
226
</form>
226
</div>
227
</div>
227
228
228
[% 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 %]
229
230
230
[% IF additional_materials %]
231
[% IF additional_materials %]
231
    <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 253-259 function refocus(calendar) { Link Here
253
[% END %]
254
[% END %]
254
255
255
[% IF ( RESERVED ) %]
256
[% IF ( RESERVED ) %]
256
    <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>
257
    <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>
257
[% END %]
258
[% END %]
258
259
259
[% IF ( ISSUED_TO_ANOTHER ) %]
260
[% IF ( ISSUED_TO_ANOTHER ) %]
Lines 544-550 No patron matched <span class="ex">[% message %]</span> Link Here
544
545
545
			[% IF ( warndeparture ) %]
546
			[% IF ( warndeparture ) %]
546
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
547
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
547
			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>
548
			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>
548
549
549
			</li>
550
			</li>
550
			[% END %]
551
			[% END %]
Lines 557-563 No patron matched <span class="ex">[% message %]</span> Link Here
557
558
558
			[% IF ( expired ) %]
559
			[% IF ( expired ) %]
559
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
560
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
560
			[% 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>
561
			[% 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>
561
562
562
			</li>
563
			</li>
563
			[% END %]
564
			[% END %]
Lines 572-578 No patron matched <span class="ex">[% message %]</span> Link Here
572
573
573
            [% IF ( userdebarred ) %]
574
            [% IF ( userdebarred ) %]
574
               <li class="blocker">
575
               <li class="blocker">
575
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
576
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate | $KohaDates %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
576
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
577
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
577
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
578
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
578
	                <input type="hidden" name="destination" value="circ" />
579
	                <input type="hidden" name="destination" value="circ" />
Lines 609-615 No patron matched <span class="ex">[% message %]</span> Link Here
609
		    <h4>Holds waiting:</h4>
610
		    <h4>Holds waiting:</h4>
610
			        [% FOREACH WaitingReserveLoo IN WaitingReserveLoop %]
611
			        [% FOREACH WaitingReserveLoo IN WaitingReserveLoop %]
611
			            <ul>
612
			            <ul>
612
			                <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 %].
613
			                <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 %].
613
			            [% IF ( WaitingReserveLoo.waitingat ) %]
614
			            [% IF ( WaitingReserveLoo.waitingat ) %]
614
			                <br />[% IF ( WaitingReserveLoo.waitinghere ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]Waiting at [% WaitingReserveLoo.waitingat %]</strong>
615
			                <br />[% IF ( WaitingReserveLoo.waitinghere ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]Waiting at [% WaitingReserveLoo.waitingat %]</strong>
615
			            [% END %]
616
			            [% END %]
Lines 714-724 No patron matched <span class="ex">[% message %]</span> Link Here
714
    <tr class="highlight">
715
    <tr class="highlight">
715
    [% END %]
716
    [% END %]
716
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
717
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
717
        [% todayissue.dd %]
718
        [% todayissue.duedate | $KohaDates %]
718
        </td>
719
        </td>
719
        <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>
720
        <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>
720
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
721
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
721
        <td>[% todayissue.checkoutdate %]</td>
722
        <td>[% todayissue.checkoutdate | $KohaDates %]</td>
722
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
723
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
723
        <td>[% todayissue.issuingbranchname %]</td>
724
        <td>[% todayissue.issuingbranchname %]</td>
724
        <td>[% todayissue.itemcallnumber %]</td>
725
        <td>[% todayissue.itemcallnumber %]</td>
Lines 787-799 No patron matched <span class="ex">[% message %]</span> Link Here
787
        <tr class="highlight">
788
        <tr class="highlight">
788
    [% END %]
789
    [% END %]
789
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
790
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
790
        [% previssue.dd %]
791
        [% previssue.duedate | $KohaDates %]
791
        </td>
792
        </td>
792
        <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>
793
        <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>
793
        <td>
794
        <td>
794
            [% previssue.itemtype %]
795
            [% previssue.itemtype %]
795
        </td>
796
        </td>
796
        <td>[% previssue.displaydate %]</td>
797
        <td>[% previssue.issuedate | $KohaDates %]</td>
797
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
798
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
798
        <td>[% previssue.issuingbranchname %]</td>
799
        <td>[% previssue.issuingbranchname %]</td>
799
        <td>[% previssue.itemcallnumber %]</td>
800
        <td>[% previssue.itemcallnumber %]</td>
Lines 954-960 No patron matched <span class="ex">[% message %]</span> Link Here
954
		<tbody>
955
		<tbody>
955
        [% FOREACH reservloo IN reservloop %]
956
        [% FOREACH reservloo IN reservloop %]
956
        <tr class="[% reservloo.color %]">
957
        <tr class="[% reservloo.color %]">
957
                    <td>[% reservloo.reservedate %]</td>
958
                    <td>[% reservloo.reservedate | $KohaDates %]</td>
958
                    <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>
959
                    <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>
959
                    <td>[% reservloo.itemcallnumber %]</td>
960
                    <td>[% reservloo.itemcallnumber %]</td>
960
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
961
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
961
- 

Return to bug 7444