From 538dbc73db823c7537d236d788ad2e3d1c6be054 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 7 Nov 2018 12:16:08 +0000
Subject: [PATCH] Bug 21777: Fix circulation table alignment

TO test:
1 - Check out an item to a patron
2 - Note the columns are misaligned
3 - Apply patch
4 - Updatedatabase
5 - Reload the patron
6 - Note the table is fixed

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8d4136c7663d351268e8647da7189acacfc1b050)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 admin/columns_settings.yml                                | 5 +++++
 .../prog/en/includes/checkouts-table-footer.inc           | 8 ++++----
 .../intranet-tmpl/prog/en/includes/checkouts-table.inc    | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 8f0628f06d..fb09826c7e 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -388,6 +388,11 @@ modules:
           columnname: location
         -
           columnname: homebranch
+        -
+          columnname: checkout_on_unformatted
+          cannot_be_toggled: 1
+          cannot_be_modified: 1
+          is_hidden: 1
         -
           columnname: checkout_on
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
index 3adbfa326a..40b7223161 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
@@ -1,9 +1,9 @@
 <tfoot>
 	<tr>
-        <td colspan="11" style="text-align: right; font-weight:bold;">Totals:</td>
-        <td id="totaldue" style="text-align: right;">[% totaldue %]</td>
-        <td id="totalfine" style="text-align: right;">[% finetotal %]</td>
-        <td id="totalprice" style="text-align: right;">[% totalprice %]</td>
+        <td colspan="12" style="text-align: right; font-weight:bold;">Totals:</td>
+        <td id="totaldue" style="text-align: right;">[% totaldue | html %]</td>
+        <td id="totalfine" style="text-align: right;">[% finetotal | html %]</td>
+        <td id="totalprice" style="text-align: right;">[% totalprice | html %]</td>
                 <td colspan="3"><div class="date-select">
             <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" />
 </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index 03b9663214..0a60e25976 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -18,6 +18,7 @@
                         <th scope="col">Item type</th>
                         <th scope="col">Location</th>
                         <th scope="col">Home library</th>
+                        <th scope="col">&nbsp;</th>
                         <th scope="col">Checked out on</th>
                         <th scope="col">Checked out from</th>
                         <th scope="col">Call no</th>
-- 
2.20.1