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

(-)a/admin/columns_settings.yml (+4 lines)
Lines 786-791 modules: Link Here
786
            -
786
            -
787
              columnname: callno
787
              columnname: callno
788
            -
788
            -
789
              columnname: copynumber
790
            -
789
              columnname: charge
791
              columnname: charge
790
            -
792
            -
791
              columnname: fine
793
              columnname: fine
Lines 1049-1054 modules: Link Here
1049
            -
1051
            -
1050
              columnname: callno
1052
              columnname: callno
1051
            -
1053
            -
1054
              columnname: copynumber
1055
            -
1052
              columnname: charge
1056
              columnname: charge
1053
            -
1057
            -
1054
              columnname: fine
1058
              columnname: fine
(-)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="14" style="text-align: right; font-weight:bold;">Totals:</td>
3
        <td colspan="15" style="text-align: right; font-weight:bold;">Totals:</td>
4
        <td id="totaldue" style="text-align: right;"></td>
4
        <td id="totaldue" style="text-align: right;"></td>
5
        <td id="totalfine" style="text-align: right;"></td>
5
        <td id="totalfine" style="text-align: right;"></td>
6
        <td id="totalprice" style="text-align: right;"></td>
6
        <td id="totalprice" style="text-align: right;"></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (+1 lines)
Lines 24-29 Link Here
24
                        <th scope="col">Checked out on</th>
24
                        <th scope="col">Checked out on</th>
25
                        <th scope="col">Checked out from</th>
25
                        <th scope="col">Checked out from</th>
26
                        <th scope="col">Call no</th>
26
                        <th scope="col">Call no</th>
27
                        <th scope="col">Copy no</th>
27
                        <th scope="col">Charge</th>
28
                        <th scope="col">Charge</th>
28
                        <th scope="col">Fine</th>
29
                        <th scope="col">Fine</th>
29
                        <th scope="col">Price</th>
30
                        <th scope="col">Price</th>
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+10 lines)
Lines 392-397 $(document).ready(function() { Link Here
392
                },
392
                },
393
                {
393
                {
394
                    "mDataProp": function ( oObj ) {
394
                    "mDataProp": function ( oObj ) {
395
                        return ( oObj.copynumber ? oObj.copynumber.escapeHtml() : '' );
396
                    }
397
                },
398
                {
399
                    "mDataProp": function ( oObj ) {
395
                        if ( ! oObj.charge ) oObj.charge = 0;
400
                        if ( ! oObj.charge ) oObj.charge = 0;
396
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
401
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
397
                    }
402
                    }
Lines 761-766 $(document).ready(function() { Link Here
761
                    },
766
                    },
762
                    {
767
                    {
763
                        "mDataProp": function ( oObj ) {
768
                        "mDataProp": function ( oObj ) {
769
                            return ( oObj.copynumber ? oObj.copynumber.escapeHtml() : '' );
770
                        }
771
                    },
772
                    {
773
                        "mDataProp": function ( oObj ) {
764
                            if ( ! oObj.charge ) oObj.charge = 0;
774
                            if ( ! oObj.charge ) oObj.charge = 0;
765
                            return parseFloat(oObj.charge).toFixed(2);
775
                            return parseFloat(oObj.charge).toFixed(2);
766
                        }
776
                        }
(-)a/svc/checkouts (-2 / +3 lines)
Lines 85-90 my $sql = ' Link Here
85
        items.itemnotes,
85
        items.itemnotes,
86
        items.itemnotes_nonpublic,
86
        items.itemnotes_nonpublic,
87
        items.itemcallnumber,
87
        items.itemcallnumber,
88
        items.copynumber,
88
        items.replacementprice,
89
        items.replacementprice,
89
90
90
        issues.branchcode,
91
        issues.branchcode,
Lines 206-212 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
206
        itemnotes_nonpublic  => $c->{itemnotes_nonpublic},
207
        itemnotes_nonpublic  => $c->{itemnotes_nonpublic},
207
        branchcode           => $c->{branchcode},
208
        branchcode           => $c->{branchcode},
208
        branchname           => $c->{branchname},
209
        branchname           => $c->{branchname},
209
        itemcallnumber => $c->{itemcallnumber}   || q{},
210
        itemcallnumber       => $c->{itemcallnumber} || q{},
211
        copynumber           => $c->{copynumber} || q{},
210
        charge         => $charge,
212
        charge         => $charge,
211
        fine           => $fine,
213
        fine           => $fine,
212
        price          => $c->{replacementprice} || q{},
214
        price          => $c->{replacementprice} || q{},
213
- 

Return to bug 19351