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

(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 421-427 sub build_issue_data { Link Here
421
        # Getting borrower details
421
        # Getting borrower details
422
        my $memberdetails = GetMemberDetails($it->{'borrowernumber'});
422
        my $memberdetails = GetMemberDetails($it->{'borrowernumber'});
423
        $it->{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
423
        $it->{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
424
424
        $it->{'cardnumber'} = $memberdetails->{'cardnumber'};
425
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
425
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
426
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
426
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
427
427
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-21 / +16 lines)
Lines 645-651 No patron matched <span class="ex">[% message %]</span> Link Here
645
            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
645
            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
646
    [% END %]</li>
646
    [% END %]</li>
647
[% IF ( displayrelissues ) %]
647
[% IF ( displayrelissues ) %]
648
<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives Issues</a></li>
648
<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives' Checkouts</a></li>
649
[% END %]
649
[% END %]
650
<li>[% IF ( countreserv ) %]
650
<li>[% IF ( countreserv ) %]
651
            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">[% countreserv %] Hold(s)</a>
651
            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">[% countreserv %] Hold(s)</a>
Lines 668-674 No patron matched <span class="ex">[% message %]</span> Link Here
668
        <th scope="col">Due date</th>
668
        <th scope="col">Due date</th>
669
        <th scope="col">Title</th>
669
        <th scope="col">Title</th>
670
        <th scope="col">Item Type</th>
670
        <th scope="col">Item Type</th>
671
        <th scope="col">Checked out on</th> 
671
        <th scope="col">Checked out on</th>
672
        <th scope="col">Call no</th>
672
        <th scope="col">Call no</th>
673
        <th scope="col">Charge</th>
673
        <th scope="col">Charge</th>
674
        <th scope="col">Price</th>
674
        <th scope="col">Price</th>
Lines 830-847 No patron matched <span class="ex">[% message %]</span> Link Here
830
830
831
[% IF ( displayrelissues ) %]
831
[% IF ( displayrelissues ) %]
832
<div id="relissues">
832
<div id="relissues">
833
<h2>Relatives issues</h2>
834
    <table id="relissuest">
833
    <table id="relissuest">
835
    <thead>
834
    <thead>
836
    <tr>
835
    <tr>
837
        <th scope="col">Due date</th>
836
        <th scope="col">Due date</th>
838
        <th scope="col">Title</th>
837
        <th scope="col">Title</th>
839
        <th scope="col">Item Type</th>
838
        <th scope="col">Item Type</th>
840
        <th scope="col">Branch</th>
839
        <th scope="col">Checked out on</th>
841
        <th scope="col">Checked out on</th> 
840
        <th scope="col">Call no</th>
842
        <th scope="col">Charge</th>
841
        <th scope="col">Charge</th>
843
	<th scope="col">Borrower</th>
842
        <th scope="col">Price</th>
844
        <th scope="col">Material</th>
843
        <th scope="col">Patron</th>
845
    </tr>
844
    </tr>
846
    </thead>
845
    </thead>
847
[% IF ( relissues ) %]	<tbody>
846
[% IF ( relissues ) %]	<tbody>
Lines 856-868 No patron matched <span class="ex">[% message %]</span> Link Here
856
            [% relissue.dd %]</td>
855
            [% relissue.dd %]</td>
857
        <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>
856
        <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>
858
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
857
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
859
	<td>[% relissue.branchdisplay %]
860
        [% IF ( relissue.itemcallnumber ) %]([% relissue.itemcallnumber %])[% END %]</td>
861
        <td>[% relissue.displaydate %]</td>
858
        <td>[% relissue.displaydate %]</td>
862
            <td>[% relissue.charge %]</td>
859
        <td>[% relissue.itemcallnumber %]</td>
863
            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %]</a></td>
860
        <td>[% relissue.charge %]</td>
864
            <td>[% relissue.materials %]</td>
861
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %] ([% relissue.cardnumber %])</a></td>
865
    </tr>
862
     </tr>
866
    [% END %] <!-- /loop todayissues -->
863
    [% END %] <!-- /loop todayissues -->
867
    <!-- /if todayissues -->[% END %]
864
    <!-- /if todayissues -->[% END %]
868
[% IF ( relprevissues ) %]
865
[% IF ( relprevissues ) %]
Lines 877-892 No patron matched <span class="ex">[% message %]</span> Link Here
877
        [% relprevissue.dd %]
874
        [% relprevissue.dd %]
878
        </td>
875
        </td>
879
        <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>
876
        <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>
880
        <td>
877
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
881
            [% relprevissue.itemtype %]
882
        </td>
883
	<td>[% relprevissue.branchdisplay %]
884
        [% IF ( relprevissue.itemcallnumber ) %]([% relprevissue.itemcallnumber %])[% END %]</td>
885
        <td>[% relprevissue.displaydate %]</td>
878
        <td>[% relprevissue.displaydate %]</td>
879
        <td>[% relprevissue.itemcallnumber %]</td>
886
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
880
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
887
        <td>[% relprevissue.charge %]</td>
881
        <td>[% relprevissue.charge %]</td>
888
	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.borrowername %]</a></td>
882
        <td>[% relprevissue.replacementprice %]</td>
889
        <td>[% relprevissue.materials %]</td>
883
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.borrowername %] ([% relprevissue.cardnumber %])</a></td>
884
890
    </tr>
885
    </tr>
891
    <!-- /loop previssues -->[% END %]
886
    <!-- /loop previssues -->[% END %]
892
<!--/if previssues -->[% END %]
887
<!--/if previssues -->[% END %]
Lines 895-901 No patron matched <span class="ex">[% message %]</span> Link Here
895
</form>
890
</form>
896
891
897
</div>
892
</div>
898
[% END %]<!-- end displayrelissues --> 
893
[% END %]<!-- end displayrelissues -->
899
894
900
895
901
<div id="reserves">
896
<div id="reserves">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-15 / +8 lines)
Lines 397-403 function validate1(date) { Link Here
397
	<ul>
397
	<ul>
398
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li>
398
		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li>
399
    [% IF ( relissuecount ) %]
399
    [% IF ( relissuecount ) %]
400
        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives issues</a></li>
400
        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li>
401
    [% END %]
401
    [% END %]
402
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
402
		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
403
		<li>[% IF ( countreserv ) %]
403
		<li>[% IF ( countreserv ) %]
Lines 518-538 function validate1(date) { Link Here
518
518
519
[% IF ( relissuecount ) %]
519
[% IF ( relissuecount ) %]
520
<div id="relissues">
520
<div id="relissues">
521
	<h2>Relatives issues</h2>
522
 <table id="relissuest">
521
 <table id="relissuest">
523
    <thead>
522
    <thead>
524
	<tr>
523
	<tr>
525
            <th scope="col">Due date</th>
524
            <th scope="col">Due date</th>
526
            <th scope="col">Title</th>
525
            <th scope="col">Title</th>
527
            <th scope="col">Collection</th>
528
            <th scope="col">Stock number</th>
529
            <th scope="col">Barcode</th>
530
            <th scope="col">Item Type</th>
526
            <th scope="col">Item Type</th>
531
            <th scope="col">Checked out on</th> 
527
            <th scope="col">Checked out on</th> 
532
            <th scope="col">Borrower</th>
528
            <th scope="col">Call no</th>
533
	    <th scope="col">Call no</th>
534
            <th scope="col">Charge</th>
529
            <th scope="col">Charge</th>
535
            <th scope="col">Price</th>
530
            <th scope="col">Price</th>
531
            <th scope="col">Patron</th>
536
        </tr>
532
        </tr>
537
    </thead>
533
    </thead>
538
       <tbody>
534
       <tbody>
Lines 551-566 function validate1(date) { Link Here
551
                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
547
                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
552
                [% END %]
548
                [% END %]
553
</td>
549
</td>
554
            <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 %]</td>
550
            <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>
555
            <td>[% relissueloo.collection %]</td>
556
            <td>[% relissueloo.stocknumber %]</td>
557
            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
558
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
551
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
559
            <td>[% relissueloo.issuedate %]</td>
552
            <td>[% relissueloo.issuedate %]</td>
560
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %]</a></td>
553
        <td>[% relissueloo.itemcallnumber %]</td>
561
	    <td>[% relissueloo.itemcallnumber %]</td>
554
        <td>[% relissueloo.charge %]</td>
562
            <td>[% relissueloo.charge %]</td>
555
        <td>[% relissueloo.replacementprice %]</td>
563
            <td>[% relissueloo.replacementprice %]</td>
556
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %] ([% relissueloo.cardnumber %])</a></td>
564
        </tr>
557
        </tr>
565
  [% END %]
558
  [% END %]
566
        </tbody>
559
        </tbody>
(-)a/members/moremember.pl (-2 / +1 lines)
Lines 265-271 sub build_issue_data { Link Here
265
        # Getting borrower details
265
        # Getting borrower details
266
        my $memberdetails = GetMemberDetails($issue->[$i]{'borrowernumber'});
266
        my $memberdetails = GetMemberDetails($issue->[$i]{'borrowernumber'});
267
        $issue->[$i]{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
267
        $issue->[$i]{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
268
268
        $issue->[$i]{'cardnumber'} = $memberdetails->{'cardnumber'};
269
        my $datedue = $issue->[$i]{'date_due'};
269
        my $datedue = $issue->[$i]{'date_due'};
270
        my $issuedate = $issue->[$i]{'issuedate'};
270
        my $issuedate = $issue->[$i]{'issuedate'};
271
        $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
271
        $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
272
- 

Return to bug 5952