fix for #342

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 27b6b90..0c19a85 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -102,5 +102,6 @@ $template->param(basket => $basket,
                                                sub_total => $sub_total,
                                                gist => $gist,
                                                grand_total =>$grand_total,
+                                               currency => $booksellers[0]->{'listprice'},
                                                );
 output_html_with_http_headers $query, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index 9f8db5c..51f3ec3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -35,15 +35,15 @@
                        To change any of the catalogue or accounting information attached to an order,  click on the title.<br>
                </td>
                <td><b>SubTotal</b></td>
-               <td>$<TMPL_VAR name="sub_total"></td>
+               <td><TMPL_VAR name="currency"><TMPL_VAR name="sub_total"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>GST</b></td>
-               <td>$<TMPL_VAR name="gist"></td>
+               <td><TMPL_VAR name="currency"><TMPL_VAR name="gist"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>TOTAL</b></td>
-               <td>$<TMPL_VAR name="grand_total"></td>
+               <td><TMPL_VAR name="currency"><TMPL_VAR name="grand_total"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=9>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index 4b5c036..2a78494 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -126,7 +126,7 @@ Shopping Basket For: <TMPL_VAR name="name">
                <td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">" onchange='update(this.form)'>
        </tr>
        <TR VALIGN=TOP>
-               <TD>Budgeted Cost<BR><FONT SIZE=2>(NZ\$ ex GST, inc discount)</FONT> </td>
+               <TD>Budgeted Cost<BR><FONT SIZE=2>(ex GST, inc discount)</FONT> </td>
                <td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">" onchange='update(this.form)'></td>
        </tr>
        <TR VALIGN=TOP>

diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
index 991d0dd..23269d1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
@@ -35,15 +35,15 @@
                        Pour changer un élément de cataloguage ou de comptabilité attaché à une commande, cliquer sur le titre<br>
                </td>
                <td><b>Sous-Total</b></td>
-               <td>?<input type=text name=subtotal size=10 value=<TMPL_VAR name="sub_total">></td>
+               <td><TMPL_VAR name="currency"><input type=text name=subtotal size=10 value=<TMPL_VAR name="sub_total">></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>TVA</b></td>
-               <td>?<input type=text name=gst size=10 value=<TMPL_VAR name="gist">></td>
+               <td><TMPL_VAR name="currency"><input type=text name=gst size=10 value=<TMPL_VAR name="gist">></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>TOTAL</b></td>
-               <td>?<input type=text name=grandtotal size=10 value=<TMPL_VAR name="grand_total">></td>
+               <td><TMPL_VAR name="currency"><input type=text name=grandtotal size=10 value=<TMPL_VAR name="grand_total">></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=9>