Bug 21324: Fix column defs and spans

TO test:
1 - Open a bastket in acquisitions
2 - Order some items
3 - Close the basket
4 - Receive some items
5 - Note the columns are out of alingment on parcel.pl
6 - Note a JS error breaking datatable on 'Already received'
7 - Apply patch
8 - Things should be better

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 3eff906..1980e93 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -249,7 +249,7 @@
                 [% ELSE %]
                     <td colspan="6" class="total">(Tax exc.)</td>
                 [% END %]
-                <td colspan="2"><i>Subtotal for</i> [% key | html %]</td>
+                <td colspan="3"><i>Subtotal for</i> [% key | html %]</td>
                 <td>[% subtotal_for_funds.$key.ecost | $Price | html %]</td>
                 <td>[% subtotal_for_funds.$key.unitprice | $Price | html %]</td>
                 <td>&nbsp;</td>
@@ -257,19 +257,19 @@
             </tr>
         [% END %]
         <tr>
-            <th colspan="10" class="total">Total tax exc.</th>
+            <th colspan="11" class="total">Total tax exc.</th>
             <th>[% total_tax_excluded | $Price | html %]</th>
             <th></th>
         </tr>
         [% FOREACH book_foot IN book_foot_loop %]
             <tr>
-                <th colspan="10">Total (GST [% book_foot.tax_rate * 100 | html %]%)</th>
+                <th colspan="11">Total (GST [% book_foot.tax_rate * 100 | html %]%)</th>
                 <th>[% book_foot.tax_value | $Price | html %]</th>
                 <th></th>
             </tr>
         [% END %]
         <tr>
-            <th colspan="10" class="total">Total tax inc.</th>
+            <th colspan="11" class="total">Total tax inc.</th>
             <th>[% total_tax_included | $Price | html %]</th>
             <th></th>
         </tr>
@@ -516,6 +516,7 @@
                     null,
                     null,
                     null,
+                    null,
                     null
                 ],
                 "sPaginationType": "four_button"