This fixes GST computation if prices are GST included

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / basket.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index b9265e6..a5c05db 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -229,15 +229,15 @@
                 <!-- /TMPL_LOOP -->
                 </tbody>
                 <tr>
-                    <td colspan="4" rowspan="3">
+                    <td colspan="2" rowspan="3">
                         <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
                         <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
                     </td>
-                    <th>SubTotal</th>
-                    <th><!-- TMPL_VAR NAME="sub_total_rrp" --></th>
-                    <th><!-- currently duplicative <!-- TMPL_VAR NAME="sub_total_est" --> --></th>
+                    <th colspan="2">Total GST Exc.</th>
+                    <th><!-- TMPL_VAR NAME="total_rrp_gste" --></th>
+                    <th>&nbsp;</th>
                     <th><!-- TMPL_VAR name="qty_total" --></th>
-                    <th><!-- TMPL_VAR NAME="sub_total" --></th>
+                    <th><!-- TMPL_VAR NAME="total_est_gste" --></th>
                         <!-- TMPL_IF name="active" -->
                             <!-- TMPL_IF name="closedate" -->
                             <td colspan="1" rowspan="3">&nbsp;</td>
@@ -247,22 +247,18 @@
                         <!-- /TMPL_IF -->
                 </tr>
                 <tr>
-                    <th>GST (<!-- TMPL_VAR NAME="gist_rate" -->)</th>
+                    <th colspan="2">GST (<!-- TMPL_VAR NAME="gist_rate" -->)</th>
                     <th><!-- TMPL_VAR NAME="gist_rrp" --></th>
-    <!-- TMPL_UNLESS NAME="listincgst" -->
-                    <th><!-- currently duplicative <!-- TMPL_VAR NAME="gist_est" --> --></th>
                     <th>&nbsp;</th>
-                    <th><!-- TMPL_VAR NAME="gist" --></th>
-    <!-- TMPL_ELSE -->
-                    <th colspan="3">**</th>
-    <!-- /TMPL_UNLESS -->
+                    <th>&nbsp;</th>
+                    <th><!-- TMPL_VAR NAME="gist_est" --></th>
                 </tr>
                 <tr>
-                    <th>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</th>
-                    <th><!-- TMPL_VAR NAME="grand_total_rrp" --></th>
+                    <th colspan="2">Total GST Inc. (<!-- TMPL_VAR NAME="currency" -->)</th>
+                    <th><!-- TMPL_VAR NAME="total_rrp_gsti" --></th>
                     <th>&nbsp;</th>
                     <th><!-- TMPL_VAR name="qty_total" --></th>
-                    <th><!-- TMPL_VAR NAME="grand_total" --></th>
+                    <th><!-- TMPL_VAR NAME="total_est_gsti" --></th>
                 </tr>
             </table>
         <!-- TMPL_ELSE -->