From 8d4136c7663d351268e8647da7189acacfc1b050 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>
---
 admin/columns_settings.yml                                   | 5 +++++
 .../prog/en/includes/checkouts-table-footer.inc              | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 299fe97539..eacc02bdd8 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -534,6 +534,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 b831c1e507..d8f1abb438 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,6 +1,6 @@
 <tfoot>
 	<tr>
-        <td colspan="11" style="text-align: right; font-weight:bold;">Totals:</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>
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 d78e001da0..7b4b622762 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -19,6 +19,7 @@
                         <th scope="col">Collection</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.39.5