From cfa8c720190613ba0a5d5e91a3bad4f4a25b364d Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 7 Sep 2018 11:33:44 +0000 Subject: [PATCH] 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 --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 --- 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 %] (Tax exc.) [% END %] - Subtotal for [% key | html %] + Subtotal for [% key | html %] [% subtotal_for_funds.$key.ecost | $Price | html %] [% subtotal_for_funds.$key.unitprice | $Price | html %]   @@ -257,19 +257,19 @@ [% END %] - Total tax exc. + Total tax exc. [% total_tax_excluded | $Price | html %] [% FOREACH book_foot IN book_foot_loop %] - Total (GST [% book_foot.tax_rate * 100 | html %]%) + Total (GST [% book_foot.tax_rate * 100 | html %]%) [% book_foot.tax_value | $Price | html %] [% END %] - Total tax inc. + Total tax inc. [% total_tax_included | $Price | html %] @@ -516,6 +516,7 @@ null, null, null, + null, null ], "sPaginationType": "four_button" -- 2.1.4