Bug 21427: Format prices on ordered/spent lists consistently

Some price information on the spent and ordered list already
used the $Price filter. With this patch all amounts should be
formatted according to the CurrencyFormat system preference.

Signed-off-by: Jack Kelliher <jke0429@stacmail.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 5cc5ae7..fc25300 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -68,7 +68,7 @@
         <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
        </td>
     <td class="data cell">
-           [% order.subtotal | html %]
+           [% order.subtotal | $Price %]
        </td>
     </tr>
 [% END %]
@@ -79,7 +79,7 @@
                 <tr>
                     <td></td>
                     <td colspan="6">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
-                    <td class="data total">[% adjustment.adjustment | html %]</td>
+                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
                 </tr>
             [% END %]
 
@@ -93,7 +93,7 @@
         <td> </td>
        <td> </td>
         <td class="data">
-            [% total | html %]
+            [% total | $Price %]
         </td>
     </tr>
     </tfoot>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 5aeedab..b57f2f5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -72,7 +72,7 @@
                 <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
             </td>
             <td class="data cell">
-                [% order.rowtotal | html %]
+                [% order.rowtotal | $Price %]
             </td>
         </tr>
     [% END %]
@@ -81,7 +81,7 @@
         [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
             <tr>
                 <td colspan="9"> Sub total </td>
-                <td class="data"> [% subtotal | html %] </td>
+                <td class="data"> [% subtotal | $Price %] </td>
             </tr>
         [% END %]
         [% IF shipmentcosts.size %]
@@ -89,7 +89,7 @@
                 <tr>
                     <td></td>
                     <td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber | html %]</td>
-                    <td class="data total">[% shipmentcost.shipmentcost | html %]</td>
+                    <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td>
                 </tr>
             [% END %]
         [% END %]
@@ -98,13 +98,13 @@
                 <tr>
                     <td></td>
                     <td colspan="8">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
-                    <td class="data total">[% adjustment.adjustment | html %]</td>
+                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
                 </tr>
             [% END %]
         [% END %]
         <tr>
             <td colspan="9">TOTAL</td>
-            <td class="data total">[% total | html %]</td>
+            <td class="data total">[% total | $Price %]</td>
         </tr>
     </tfoot>
 </table>