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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +3 lines)
Lines 481-487 Link Here
481
                [% FOREACH foot_loo IN book_foot_loop %]
481
                [% FOREACH foot_loo IN book_foot_loop %]
482
                    <tr>
482
                    <tr>
483
                        <th></th>
483
                        <th></th>
484
                        <th>Total (GST [% foot_loo.tax_rate * 100 | $Price %])</th>
484
                        <th>Total (GST [% foot_loo.tax_rate * 100 %])</th>
485
                        <th class="tax_excluded">&nbsp;</th>
485
                        <th class="tax_excluded">&nbsp;</th>
486
                        <th class="tax_excluded">&nbsp;</th>
486
                        <th class="tax_excluded">&nbsp;</th>
487
                        <th class="tax_included">&nbsp;</th>
487
                        <th class="tax_included">&nbsp;</th>
Lines 585-591 Link Here
585
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
585
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
586
                        <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
586
                        <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
587
                        <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
587
                        <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
588
                        <td class="number">[% books_loo.tax_rate * 100 | $Price %]</td>
588
                        <td class="number">[% books_loo.tax_rate * 100 %]</td>
589
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
589
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
590
                        <td>[% books_loo.budget_name %]</td>
590
                        <td>[% books_loo.budget_name %]</td>
591
                        <td>[% books_loo.suppliers_report %]</td>
591
                        <td>[% books_loo.suppliers_report %]</td>
Lines 698-704 Link Here
698
                    <td class="number">[% order.quantity %]</td>
698
                    <td class="number">[% order.quantity %]</td>
699
                    <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
699
                    <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
700
                    <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
700
                    <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
701
                    <td class="number">[% order.tax_rate * 100 | $Price %]</td>
701
                    <td class="number">[% order.tax_rate * 100 %]</td>
702
                    <td class="number">[% order.tax_value | $Price %]</td>
702
                    <td class="number">[% order.tax_value | $Price %]</td>
703
                    <td>[% order.budget_name %]
703
                    <td>[% order.budget_name %]
704
                  </tr>
704
                  </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +2 lines)
Lines 179-185 Link Here
179
                  <td class="number">[% order.quantity %]</td>
179
                  <td class="number">[% order.quantity %]</td>
180
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
180
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
181
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
181
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
182
                  <td class="number">[% order.tax_rate * 100 | $Price %]</td>
182
                  <td class="number">[% order.tax_rate * 100 %]</td>
183
                  <td class="number">[% order.tax_value | $Price %]</td>
183
                  <td class="number">[% order.tax_value | $Price %]</td>
184
                  <td>[% order.budget_name %]</td>
184
                  <td>[% order.budget_name %]</td>
185
                </tr>
185
                </tr>
Lines 188-194 Link Here
188
            <tfoot>
188
            <tfoot>
189
              [% FOR tf IN foot_loop %]
189
              [% FOR tf IN foot_loop %]
190
                <tr>
190
                <tr>
191
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 | $Price %] %)</th>
191
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 %] %)</th>
192
                    <th class="tax_excluded"/><th class="tax_included"/>
192
                    <th class="tax_excluded"/><th class="tax_included"/>
193
                    <th>[% tf.quantity %]</th>
193
                    <th>[% tf.quantity %]</th>
194
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
194
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +2 lines)
Lines 573-581 $(document).ready(function() Link Here
573
                        <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
573
                        <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
574
                        [% FOREACH gst IN gst_values %]
574
                        [% FOREACH gst IN gst_values %]
575
                          [% IF ( gst.option == tax_rate ) %]
575
                          [% IF ( gst.option == tax_rate ) %]
576
                            <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format("%.1f") %]%</option>
576
                            <option value="[% gst.option %]" selected="selected">[% gst.option * 100 %]%</option>
577
                          [% ELSE %]
577
                          [% ELSE %]
578
                            <option value="[% gst.option %]">[% gst.option * 100 | format("%.1f") %]%</option>
578
                            <option value="[% gst.option %]">[% gst.option * 100 %]%</option>
579
                          [% END %]
579
                          [% END %]
580
                        [% END %]
580
                        [% END %]
581
                        </select>
581
                        </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +2 lines)
Lines 335-343 Link Here
335
                <select name="tax_rate" id="tax_rate">
335
                <select name="tax_rate" id="tax_rate">
336
                [% FOREACH gst IN gst_values %]
336
                [% FOREACH gst IN gst_values %]
337
                    [% IF gst.option == tax_rate %]
337
                    [% IF gst.option == tax_rate %]
338
                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format("%.1f") %]%</option>
338
                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 %]%</option>
339
                    [% ELSE %]
339
                    [% ELSE %]
340
                        <option value="[% gst.option %]">[% gst.option * 100 | format("%.1f") %]%</option>
340
                        <option value="[% gst.option %]">[% gst.option * 100 %]%</option>
341
                    [% END %]
341
                    [% END %]
342
                [% END %]
342
                [% END %]
343
                </select>
343
                </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +1 lines)
Lines 379-385 Link Here
379
        </tr>
379
        </tr>
380
        [% FOREACH book_foot IN book_foot_loop %]
380
        [% FOREACH book_foot IN book_foot_loop %]
381
            <tr>
381
            <tr>
382
                <th colspan="10">Total (GST [% book_foot.tax_rate * 100 | $Price %]%)</th>
382
                <th colspan="10">Total (GST [% book_foot.tax_rate * 100 %]%)</th>
383
                <th>[% book_foot.tax_value | $Price %]</th>
383
                <th>[% book_foot.tax_value | $Price %]</th>
384
                <th></th>
384
                <th></th>
385
            </tr>
385
            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-4 / +3 lines)
Lines 291-299 function delete_contact(ev) { Link Here
291
                    <select name="tax_rate" id="tax_rate">
291
                    <select name="tax_rate" id="tax_rate">
292
                    [% FOREACH gst IN gst_values %]
292
                    [% FOREACH gst IN gst_values %]
293
                      [% IF ( tax_rate == gst.option ) %]
293
                      [% IF ( tax_rate == gst.option ) %]
294
                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format ("%.1f") %] %</option>
294
                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 %] %</option>
295
                      [% ELSE %]
295
                      [% ELSE %]
296
                        <option value="[% gst.option %]">[% gst.option * 100 | format ("%.1f") %] %</option>
296
                        <option value="[% gst.option %]">[% gst.option * 100 %] %</option>
297
                      [% END %]
297
                      [% END %]
298
                    [% END %]
298
                    [% END %]
299
                    </select>
299
                    </select>
Lines 353-359 function delete_contact(ev) { Link Here
353
                <p><strong>Discount: </strong>
353
                <p><strong>Discount: </strong>
354
                    [% discount | format("%.1f") %] %</p>
354
                    [% discount | format("%.1f") %] %</p>
355
                <p><strong>Tax rate: </strong>
355
                <p><strong>Tax rate: </strong>
356
                    [% 0 + tax_rate * 100 | format("%.1f") %] %</p>
356
                    [% 0 + tax_rate * 100 %] %</p>
357
                [% IF deliverytime.defined %]
357
                [% IF deliverytime.defined %]
358
                    <p><strong>Delivery time: </strong>
358
                    <p><strong>Delivery time: </strong>
359
                        [% deliverytime %] days</p>
359
                        [% deliverytime %] days</p>
360
- 

Return to bug 14541