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

(-)a/circ/circulation.pl (+1 lines)
Lines 438-443 sub build_issue_data { Link Here
438
        $it->{'can_confirm'} = !$can_renew && !$restype;
438
        $it->{'can_confirm'} = !$can_renew && !$restype;
439
        $it->{'renew_error'} = $restype;
439
        $it->{'renew_error'} = $restype;
440
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
440
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
441
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
441
442
442
        $totalprice += $it->{'replacementprice'};
443
        $totalprice += $it->{'replacementprice'};
443
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
444
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
<tfoot>
1
<tfoot>
2
	<tr>
2
	<tr>
3
        <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
3
        <td colspan="6" style="text-align: right; font-weight:bold;">Totals:</td>
4
		<td>[% totaldue %]</td>
4
		<td>[% totaldue %]</td>
5
		<td>[% totalprice %]</td>
5
		<td>[% totalprice %]</td>
6
		<td colspan="2">
6
		<td colspan="2">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +9 lines)
Lines 22-32 Link Here
22
		[% IF ( UseTablesortForCirc ) %]$.tablesorter.defaults.widgets = ['zebra'];
22
		[% IF ( UseTablesortForCirc ) %]$.tablesorter.defaults.widgets = ['zebra'];
23
		$("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
23
		$("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
24
		dateFormat: 'uk',[% END %]
24
		dateFormat: 'uk',[% END %]
25
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
25
		headers: { 1: { sorter: 'articles' },6: { sorter: false },7:{sorter:false},8:{sorter:false},9:{sorter:false}}
26
		});
26
		});
27
		$("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
27
		$("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
28
		dateFormat: 'uk',[% END %]
28
		dateFormat: 'uk',[% END %]
29
		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
29
		headers: { 1: { sorter: 'articles' },6: { sorter: false },7:{sorter:false},8:{sorter:false},9:{sorter:false}}
30
		});
30
		});
31
31
32
		//FIXME: Sorting does not work when there are previous checkouts only
32
		//FIXME: Sorting does not work when there are previous checkouts only
Lines 40-46 Link Here
40
		$("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
40
		$("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
41
		dateFormat: 'uk',[% END %]
41
		dateFormat: 'uk',[% END %]
42
			sortList: [[0,0]],
42
			sortList: [[0,0]],
43
			headers: { 1: { sorter: 'articles' }}
43
			headers: { 1: { sorter: 'articles' },5: { sorter: false }}
44
		});[% END %]
44
		});[% END %]
45
        [% IF ( AllowRenewalLimitOverride ) %]
45
        [% IF ( AllowRenewalLimitOverride ) %]
46
        $( '#override_limit' ).click( function () {
46
        $( '#override_limit' ).click( function () {
Lines 678-683 No patron matched <span class="ex">[% message %]</span> Link Here
678
        <th scope="col">Title</th>
678
        <th scope="col">Title</th>
679
        <th scope="col">Item Type</th>
679
        <th scope="col">Item Type</th>
680
        <th scope="col">Checked out on</th>
680
        <th scope="col">Checked out on</th>
681
        <th scope="col">Checked out from</th>
681
        <th scope="col">Call no</th>
682
        <th scope="col">Call no</th>
682
        <th scope="col">Charge</th>
683
        <th scope="col">Charge</th>
683
        <th scope="col">Price</th>
684
        <th scope="col">Price</th>
Lines 701-706 No patron matched <span class="ex">[% message %]</span> Link Here
701
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
702
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
702
        <td>[% todayissue.checkoutdate %]</td>
703
        <td>[% todayissue.checkoutdate %]</td>
703
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
704
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
705
        <td>[% todayissue.issuingbranchname %]</td>
704
        <td>[% todayissue.itemcallnumber %]</td>
706
        <td>[% todayissue.itemcallnumber %]</td>
705
            <td>[% todayissue.charge %]</td>
707
            <td>[% todayissue.charge %]</td>
706
            <td>[% todayissue.replacementprice %]</td>
708
            <td>[% todayissue.replacementprice %]</td>
Lines 775-780 No patron matched <span class="ex">[% message %]</span> Link Here
775
        </td>
777
        </td>
776
        <td>[% previssue.displaydate %]</td>
778
        <td>[% previssue.displaydate %]</td>
777
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.borrowername %]</td>[% END %]
779
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.borrowername %]</td>[% END %]
780
        <td>[% previssue.issuingbranchname %]</td>
778
        <td>[% previssue.itemcallnumber %]</td>
781
        <td>[% previssue.itemcallnumber %]</td>
779
        <td>[% previssue.charge %]</td>
782
        <td>[% previssue.charge %]</td>
780
        <td>[% previssue.replacementprice %]</td>
783
        <td>[% previssue.replacementprice %]</td>
Lines 859-864 No patron matched <span class="ex">[% message %]</span> Link Here
859
        <th scope="col">Title</th>
862
        <th scope="col">Title</th>
860
        <th scope="col">Item Type</th>
863
        <th scope="col">Item Type</th>
861
        <th scope="col">Checked out on</th>
864
        <th scope="col">Checked out on</th>
865
        <th scope="col">Checked out from</th>
862
        <th scope="col">Call no</th>
866
        <th scope="col">Call no</th>
863
        <th scope="col">Charge</th>
867
        <th scope="col">Charge</th>
864
        <th scope="col">Price</th>
868
        <th scope="col">Price</th>
Lines 878-883 No patron matched <span class="ex">[% message %]</span> Link Here
878
        <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>
882
        <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>
879
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
883
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
880
        <td>[% relissue.displaydate %]</td>
884
        <td>[% relissue.displaydate %]</td>
885
        <td>[% relissue.issuingbranchname %]</td>
881
        <td>[% relissue.itemcallnumber %]</td>
886
        <td>[% relissue.itemcallnumber %]</td>
882
        <td>[% relissue.charge %]</td>
887
        <td>[% relissue.charge %]</td>
883
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %] ([% relissue.cardnumber %])</a></td>
888
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %] ([% relissue.cardnumber %])</a></td>
Lines 898-903 No patron matched <span class="ex">[% message %]</span> Link Here
898
        <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>
903
        <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>
899
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
904
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
900
        <td>[% relprevissue.displaydate %]</td>
905
        <td>[% relprevissue.displaydate %]</td>
906
        <td>[% relprevissue.issuingbranchname %]</td>
901
        <td>[% relprevissue.itemcallnumber %]</td>
907
        <td>[% relprevissue.itemcallnumber %]</td>
902
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
908
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
903
        <td>[% relprevissue.charge %]</td>
909
        <td>[% relprevissue.charge %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +7 lines)
Lines 17-32 $(document).ready(function() { Link Here
17
	$.tablesorter.defaults.widgets = ['zebra'];
17
	$.tablesorter.defaults.widgets = ['zebra'];
18
	$("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
18
	$("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
19
		dateFormat: 'uk',[% END %]
19
		dateFormat: 'uk',[% END %]
20
        headers: { 1: { sorter: 'articles' }}
20
        headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }}
21
	}); 
21
	}); 
22
	$("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
22
	$("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
23
		dateFormat: 'uk',[% END %]
23
		dateFormat: 'uk',[% END %]
24
		headers: { 1: { sorter: 'articles' }}
24
		headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }}
25
	}); 
25
	}); 
26
	$("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
26
	$("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
27
		dateFormat: 'uk',[% END %]
27
		dateFormat: 'uk',[% END %]
28
		sortList: [[0,0]],
28
		sortList: [[0,0]],
29
		headers: { 1: { sorter: 'articles' },6: { sorter: false }}
29
		headers: { 1: { sorter: 'articles' },5: { sorter: false }}
30
	}); 
30
	}); 
31
    [% IF ( picture ) %]
31
    [% IF ( picture ) %]
32
    // new YAHOO.widget.Button("delpicture");   // FIXME: formatting mismatch between YUI and normal button
32
    // new YAHOO.widget.Button("delpicture");   // FIXME: formatting mismatch between YUI and normal button
Lines 422-427 function validate1(date) { Link Here
422
            <th scope="col">Title</th>
422
            <th scope="col">Title</th>
423
            <th scope="col">Item Type</th>
423
            <th scope="col">Item Type</th>
424
            <th scope="col">Checked out on</th> 
424
            <th scope="col">Checked out on</th> 
425
            <th scope="col">Checked out from</th> 
425
            <th scope="col">Call no</th>
426
            <th scope="col">Call no</th>
426
            <th scope="col">Charge</th>
427
            <th scope="col">Charge</th>
427
            <th scope="col">Price</th>
428
            <th scope="col">Price</th>
Lines 453-458 function validate1(date) { Link Here
453
            <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>
454
            <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>
454
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
455
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
455
            <td>[% issueloo.issuedate %]</td>
456
            <td>[% issueloo.issuedate %]</td>
457
            <td>[% issueloo.issuingbranchname %]</td>
456
	        <td>[% issueloo.itemcallnumber %]</td>
458
	        <td>[% issueloo.itemcallnumber %]</td>
457
            <td>[% issueloo.charge %]</td>
459
            <td>[% issueloo.charge %]</td>
458
            <td>[% issueloo.replacementprice %]</td>
460
            <td>[% issueloo.replacementprice %]</td>
Lines 529-534 function validate1(date) { Link Here
529
            <th scope="col">Title</th>
531
            <th scope="col">Title</th>
530
            <th scope="col">Item Type</th>
532
            <th scope="col">Item Type</th>
531
            <th scope="col">Checked out on</th> 
533
            <th scope="col">Checked out on</th> 
534
            <th scope="col">Checked out from</th>
532
            <th scope="col">Call no</th>
535
            <th scope="col">Call no</th>
533
            <th scope="col">Charge</th>
536
            <th scope="col">Charge</th>
534
            <th scope="col">Price</th>
537
            <th scope="col">Price</th>
Lines 559-564 function validate1(date) { Link Here
559
            <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>
562
            <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>
560
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
563
<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
561
            <td>[% relissueloo.issuedate %]</td>
564
            <td>[% relissueloo.issuedate %]</td>
565
            <td>[% relissueloo.issuingbranchname %]</td>
562
        <td>[% relissueloo.itemcallnumber %]</td>
566
        <td>[% relissueloo.itemcallnumber %]</td>
563
        <td>[% relissueloo.charge %]</td>
567
        <td>[% relissueloo.charge %]</td>
564
        <td>[% relissueloo.replacementprice %]</td>
568
        <td>[% relissueloo.replacementprice %]</td>
(-)a/members/moremember.pl (-1 / +1 lines)
Lines 268-273 sub build_issue_data { Link Here
268
        $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
268
        $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
269
        $issue->[$i]{'issuedate'} = C4::Dates->new($issue->[$i]{'issuedate'},'iso')->output('syspref');
269
        $issue->[$i]{'issuedate'} = C4::Dates->new($issue->[$i]{'issuedate'},'iso')->output('syspref');
270
        my $biblionumber = $issue->[$i]{'biblionumber'};
270
        my $biblionumber = $issue->[$i]{'biblionumber'};
271
        $issue->[$i]{'issuingbranchname'} = GetBranchName($issue->[$i]{'branchcode'});
271
        my %row = %{ $issue->[$i] };
272
        my %row = %{ $issue->[$i] };
272
        $totalprice += $issue->[$i]{'replacementprice'};
273
        $totalprice += $issue->[$i]{'replacementprice'};
273
        $row{'replacementprice'} = $issue->[$i]{'replacementprice'};
274
        $row{'replacementprice'} = $issue->[$i]{'replacementprice'};
274
- 

Return to bug 6887