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

(-)a/circ/circulation.pl (-1 / +3 lines)
Lines 392-397 if ($borrowernumber) { Link Here
392
        $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
392
        $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
393
        $getreserv{reserve_id}  = $num_res->{'reserve_id'};
393
        $getreserv{reserve_id}  = $num_res->{'reserve_id'};
394
        $getreserv{title}          = $getiteminfo->{'title'};
394
        $getreserv{title}          = $getiteminfo->{'title'};
395
        $getreserv{subtitle}       = GetRecordValue('subtitle', GetMarcBiblio($getiteminfo->{biblionumber}), GetFrameworkCode($getiteminfo->{biblionumber}));
395
        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
396
        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
396
        $getreserv{author}         = $getiteminfo->{'author'};
397
        $getreserv{author}         = $getiteminfo->{'author'};
397
        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
398
        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
Lines 431-436 if ($borrowernumber) { Link Here
431
432
432
            $getreserv{color}           = 'inwait';
433
            $getreserv{color}           = 'inwait';
433
            $getreserv{title}           = $getbibinfo->{'title'};
434
            $getreserv{title}           = $getbibinfo->{'title'};
435
            $getreserv{subtitle}        = GetRecordValue('subtitle', GetMarcBiblio($num_res->{biblionumber}), GetFrameworkCode($num_res->{biblionumber}));
434
            $getreserv{nottransfered}   = 0;
436
            $getreserv{nottransfered}   = 0;
435
            $getreserv{itemtype}        = $itemtypeinfo->{'description'};
437
            $getreserv{itemtype}        = $itemtypeinfo->{'description'};
436
            $getreserv{author}          = $getbibinfo->{'author'};
438
            $getreserv{author}          = $getbibinfo->{'author'};
Lines 502-508 sub build_issue_data { Link Here
502
        $it->{'displaydate'} = output_pref($it->{'issuedate'});
504
        $it->{'displaydate'} = output_pref($it->{'issuedate'});
503
        #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
505
        #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
504
        $it->{'od'} = $it->{'overdue'};
506
        $it->{'od'} = $it->{'overdue'};
505
        $it->{'author'} ||= ' ';
507
        $it->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($it->{biblionumber}), GetFrameworkCode($it->{biblionumber}));
506
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
508
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
507
        $it->{'return_failed'} = $return_failed{$it->{'barcode'}};
509
        $it->{'return_failed'} = $return_failed{$it->{'barcode'}};
508
510
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-5 / +5 lines)
Lines 852-858 No patron matched <span class="ex">[% message %]</span> Link Here
852
                <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', todayissue.damaged ) %]</span>
852
                <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', todayissue.damaged ) %]</span>
853
            [% END %]
853
            [% END %]
854
        </td>
854
        </td>
855
        <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>
855
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% FOREACH subtitl IN todayissue.subtitle %] [% subtitl.subfield %][% END %][% 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>
856
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
856
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
857
        <td><span title="[% todayissue.displaydate_sort %]">[% todayissue.checkoutdate %]</span></td>
857
        <td><span title="[% todayissue.displaydate_sort %]">[% todayissue.checkoutdate %]</span></td>
858
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
858
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
Lines 939-945 No patron matched <span class="ex">[% message %]</span> Link Here
939
                <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', previssue.damaged ) %]</span>
939
                <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', previssue.damaged ) %]</span>
940
            [% END %]
940
            [% END %]
941
        </td>
941
        </td>
942
        <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>
942
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% FOREACH subtitl IN previssue.subtitle %] [% subtitl.subfield %][% END %][% 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>
943
        <td>
943
        <td>
944
            [% previssue.itemtype %]
944
            [% previssue.itemtype %]
945
        </td>
945
        </td>
Lines 1077-1083 No patron matched <span class="ex">[% message %]</span> Link Here
1077
                <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', relissue.damaged ) %]</span>
1077
                <span class="dmg">[% KohaAuthorisedValues.GetByCode( 'DAMAGED', relissue.damaged ) %]</span>
1078
            [% END %]
1078
            [% END %]
1079
        </td>
1079
        </td>
1080
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
1080
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% FOREACH subtitl IN relissue.subtitle %] [% subtitl.subfield %][% END %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
1081
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
1081
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
1082
        <td><span title="[% relissue.displaydate_sort %]">[% relissue.displaydate %]</span></td>
1082
        <td><span title="[% relissue.displaydate_sort %]">[% relissue.displaydate %]</span></td>
1083
        <td>[% relissue.issuingbranchname %]</td>
1083
        <td>[% relissue.issuingbranchname %]</td>
Lines 1098-1104 No patron matched <span class="ex">[% message %]</span> Link Here
1098
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
1098
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
1099
        <span title="[% relprevissue.dd_sort %]">[% relprevissue.dd %]</span>
1099
        <span title="[% relprevissue.dd_sort %]">[% relprevissue.dd %]</span>
1100
        </td>
1100
        </td>
1101
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
1101
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% FOREACH subtitl IN relprevissue.subtitle %] [% subtitl.subfield %][% END %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
1102
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
1102
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
1103
        <td><span title="[% relprevissue.displaydate_sort %]">[% relprevissue.displaydate %]</span></td>
1103
        <td><span title="[% relprevissue.displaydate_sort %]">[% relprevissue.displaydate %]</span></td>
1104
        <td>[% relprevissue.issuingbranchname %]</td>
1104
        <td>[% relprevissue.issuingbranchname %]</td>
Lines 1137-1143 No patron matched <span class="ex">[% message %]</span> Link Here
1137
        [% FOREACH reservloo IN reservloop %]
1137
        [% FOREACH reservloo IN reservloop %]
1138
        <tr class="[% reservloo.color %]">
1138
        <tr class="[% reservloo.color %]">
1139
                    <td>[% reservloo.reservedate %]</td>
1139
                    <td>[% reservloo.reservedate %]</td>
1140
                    <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>
1140
                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]"><strong>[% reservloo.title |html %]</strong></a>[% FOREACH subtitl IN reservloo.subtitle %] [% subtitl.subfield %][% END %][% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]</td>
1141
                    <td>[% reservloo.itemcallnumber %]</td>
1141
                    <td>[% reservloo.itemcallnumber %]</td>
1142
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
1142
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
1143
                        [% END %][% IF ( reservloo.waiting ) %] <strong>waiting at [% reservloo.waitingat %]</strong>
1143
                        [% END %][% IF ( reservloo.waiting ) %] <strong>waiting at [% reservloo.waitingat %]</strong>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +3 lines)
Lines 482-488 function validate1(date) { Link Here
482
                                        <span class="dmg">[% issueloo.itemdamaged %]</span>
482
                                        <span class="dmg">[% issueloo.itemdamaged %]</span>
483
                [% END %]
483
                [% END %]
484
</td>
484
</td>
485
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title |html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&amp;itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>
485
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title |html %]</strong></a>[% FOREACH subtitl IN issueloo.subtitle %] [% subtitl.subfield %][% END %][% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&amp;itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>
486
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
486
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
487
            <td><span title="[% issueloo.issuedate %]">[% issueloo.issuedate | $KohaDates%]</span></td>
487
            <td><span title="[% issueloo.issuedate %]">[% issueloo.issuedate | $KohaDates%]</span></td>
488
            <td>[% issueloo.issuingbranchname %]</td>
488
            <td>[% issueloo.issuingbranchname %]</td>
Lines 590-596 function validate1(date) { Link Here
590
                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
590
                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
591
                [% END %]
591
                [% END %]
592
</td>
592
</td>
593
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
593
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% FOREACH subtitl IN relissueloo.subtitle %] [% subtitl.subfield %][% END %][% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
594
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
594
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
595
            <td><span title="[% relissueloo.issuedate %]">[% relissueloo.issuedate | $KohaDates %]</span></td>
595
            <td><span title="[% relissueloo.issuedate %]">[% relissueloo.issuedate | $KohaDates %]</span></td>
596
            <td>[% relissueloo.issuingbranchname %]</td>
596
            <td>[% relissueloo.issuingbranchname %]</td>
Lines 633-639 function validate1(date) { Link Here
633
		<tr class="[% reservloo.color %]">
633
		<tr class="[% reservloo.color %]">
634
            <td><span title="[% reservloo.reservedate %]">[% reservloo.reservedate | $KohaDates %]</span></td>
634
            <td><span title="[% reservloo.reservedate %]">[% reservloo.reservedate | $KohaDates %]</span></td>
635
            <td>
635
            <td>
636
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]">[% reservloo.title |html %]</a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]
636
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]">[% reservloo.title |html %]</a>[% FOREACH subtitl IN reservloo.subtitle %] [% subtitl.subfield %][% END %][% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]
637
            </td>
637
            </td>
638
            <td>[% reservloo.itemcallnumber %]</td>
638
            <td>[% reservloo.itemcallnumber %]</td>
639
            <td>[% IF ( reservloo.waiting ) %]
639
            <td>[% IF ( reservloo.waiting ) %]
(-)a/members/moremember.pl (-3 / +4 lines)
Lines 302-307 if ($borrowernumber) { Link Here
302
            $getreserv{nottransferedby} =
302
            $getreserv{nottransferedby} =
303
                GetBranchName( $getiteminfo->{'holdingbranch'} );
303
                GetBranchName( $getiteminfo->{'holdingbranch'} );
304
        }
304
        }
305
        $getreserv{title}          = $getiteminfo->{'title'};
306
        $getreserv{subtitle}       = GetRecordValue('subtitle', GetMarcBiblio($getiteminfo->{biblionumber}), GetFrameworkCode($getiteminfo->{biblionumber}));
305
307
306
# 		if we don't have a reserv on item, we put the biblio infos and the waiting position
308
# 		if we don't have a reserv on item, we put the biblio infos and the waiting position
307
        if ( $getiteminfo->{'title'} eq '' ) {
309
        if ( $getiteminfo->{'title'} eq '' ) {
Lines 309-314 if ($borrowernumber) { Link Here
309
            my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
311
            my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
310
            $getreserv{color}           = 'inwait';
312
            $getreserv{color}           = 'inwait';
311
            $getreserv{title}           = $getbibinfo->{'title'};
313
            $getreserv{title}           = $getbibinfo->{'title'};
314
            $getreserv{subtitle}        = GetRecordValue('subtitle', GetMarcBiblio($num_res->{biblionumber}), GetFrameworkCode($num_res->{biblionumber}));
312
            $getreserv{nottransfered}   = 0;
315
            $getreserv{nottransfered}   = 0;
313
            $getreserv{itemtype}        = $getbibtype->{'description'};
316
            $getreserv{itemtype}        = $getbibtype->{'description'};
314
            $getreserv{author}          = $getbibinfo->{'author'};
317
            $getreserv{author}          = $getbibinfo->{'author'};
Lines 448-455 sub build_issue_data { Link Here
448
        if ($issue->{issuedate} ) {
451
        if ($issue->{issuedate} ) {
449
           $issuedate = $issue->{issuedate}->clone();
452
           $issuedate = $issue->{issuedate}->clone();
450
        }
453
        }
451
454
        $issue->{subtitle} = GetRecordValue('subtitle', GetMarcBiblio($issue->{biblionumber}), GetFrameworkCode($issue->{biblionumber}));
452
        my $biblionumber = $issue->{biblionumber};
453
        $issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
455
        $issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
454
        my %row          = %{$issue};
456
        my %row          = %{$issue};
455
        $totalprice += $issue->{replacementprice};
457
        $totalprice += $issue->{replacementprice};
456
- 

Return to bug 5652