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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-3 / +3 lines)
Lines 68-74 Link Here
68
        <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
68
        <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
69
	</td>
69
	</td>
70
    <td class="data cell">
70
    <td class="data cell">
71
	    [% order.subtotal | html %]
71
	    [% order.subtotal | $Price %]
72
	</td>
72
	</td>
73
    </tr>
73
    </tr>
74
[% END %]
74
[% END %]
Lines 79-85 Link Here
79
                <tr>
79
                <tr>
80
                    <td></td>
80
                    <td></td>
81
                    <td colspan="6">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
81
                    <td colspan="6">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
82
                    <td class="data total">[% adjustment.adjustment | html %]</td>
82
                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
83
                </tr>
83
                </tr>
84
            [% END %]
84
            [% END %]
85
85
Lines 93-99 Link Here
93
        <td> </td>
93
        <td> </td>
94
	<td> </td>
94
	<td> </td>
95
        <td class="data">
95
        <td class="data">
96
            [% total | html %]
96
            [% total | $Price %]
97
        </td>
97
        </td>
98
    </tr>
98
    </tr>
99
    </tfoot>
99
    </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-6 / +5 lines)
Lines 72-78 Link Here
72
                <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
72
                <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
73
            </td>
73
            </td>
74
            <td class="data cell">
74
            <td class="data cell">
75
                [% order.rowtotal | html %]
75
                [% order.rowtotal | $Price %]
76
            </td>
76
            </td>
77
        </tr>
77
        </tr>
78
    [% END %]
78
    [% END %]
Lines 81-87 Link Here
81
        [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
81
        [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
82
            <tr>
82
            <tr>
83
                <td colspan="9"> Sub total </td>
83
                <td colspan="9"> Sub total </td>
84
                <td class="data"> [% subtotal | html %] </td>
84
                <td class="data"> [% subtotal | $Price %] </td>
85
            </tr>
85
            </tr>
86
        [% END %]
86
        [% END %]
87
        [% IF shipmentcosts.size %]
87
        [% IF shipmentcosts.size %]
Lines 89-95 Link Here
89
                <tr>
89
                <tr>
90
                    <td></td>
90
                    <td></td>
91
                    <td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber | html %]</td>
91
                    <td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber | html %]</td>
92
                    <td class="data total">[% shipmentcost.shipmentcost | html %]</td>
92
                    <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td>
93
                </tr>
93
                </tr>
94
            [% END %]
94
            [% END %]
95
        [% END %]
95
        [% END %]
Lines 98-110 Link Here
98
                <tr>
98
                <tr>
99
                    <td></td>
99
                    <td></td>
100
                    <td colspan="8">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
100
                    <td colspan="8">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
101
                    <td class="data total">[% adjustment.adjustment | html %]</td>
101
                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
102
                </tr>
102
                </tr>
103
            [% END %]
103
            [% END %]
104
        [% END %]
104
        [% END %]
105
        <tr>
105
        <tr>
106
            <td colspan="9">TOTAL</td>
106
            <td colspan="9">TOTAL</td>
107
            <td class="data total">[% total | html %]</td>
107
            <td class="data total">[% total | $Price %]</td>
108
        </tr>
108
        </tr>
109
    </tfoot>
109
    </tfoot>
110
</table>
110
</table>
111
- 

Return to bug 21427