From 65073cf6c21b406b529a7e6407b9e4ed7ee0caf5 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 1 Nov 2018 15:11:36 +0000
Subject: [PATCH] Bug 21750: Move collection code to its own column on checkins
 table

To test:
 1 - Set 'ShowAllCheckins' to show
 2 - Set a collcection code for an item
 3 - Check it in
 4 - Note it displays in the the 'Item type' column
 5 - Apply patch
 6 - Check it in again
 7 - Note the new 'Collection' column
 8 - Hide/show the column using column visibility on the checkins page
 9 - Go to Admin->Configure columns
10 - Test the various settings for this column and check in the item to
make sure they work as expected
---
 admin/columns_settings.yml                          |  2 ++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt   | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index d2d8dd3f0e..7a1044cc27 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -546,6 +546,8 @@ modules:
         -
           columnname: itype
         -
+          columnname: ccode
+        -
           columnname: borrower
         -
           columnname: itemnote
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index b490889695..b60bbfccb4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -683,7 +683,23 @@
 [% IF ( riloop ) %]
     <h2>Checked-in items</h2>
     <table id="checkedintable">
-    <thead><tr><th class="ci-duedate">Due date</th><th class="ci-title">Title</th><th class="ci-author">Author</th><th class="ci-barcode">Barcode</th><th class="ci-homelibrary">Home library</th><th class="ci-holdinglibrary">Holding library</th><th class="ci-shelvinglocation">Shelving location</th><th class="ci-callnumber">Call number</th><th class="ci-dateaccessioned">Date acquired</th><th class="ci-recodtype">Record type</th><th class="ci-itemtype">Item type</th><th class="ci-patron">Patron</th><th class="ci-note">Note</th></tr></thead>
+    <thead>
+        <tr>
+            <th class="ci-duedate">Due date</th>
+            <th class="ci-title">Title</th>
+            <th class="ci-author">Author</th>
+            <th class="ci-barcode">Barcode</th>
+            <th class="ci-homelibrary">Home library</th>
+            <th class="ci-holdinglibrary">Holding library</th>
+            <th class="ci-shelvinglocation">Shelving location</th>
+            <th class="ci-callnumber">Call number</th>
+            <th class="ci-dateaccessioned">Date acquired</th>
+            <th class="ci-recodtype">Record type</th>
+            <th class="ci-itemtype">Item type</th>
+            <th class="ci-collection">Collection</th>
+            <th class="ci-patron">Patron</th><th class="ci-note">Note</th>
+        </tr>
+    </thead>
 
         [% FOREACH riloo IN riloop %]
             <tr>
@@ -711,7 +727,8 @@
             <td class="ci-callnumber">[% riloo.itemcallnumber | html %]</td>
             <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
             <td class="ci-recordtype">[% ItemTypes.GetDescription( riloo.recordtype ) | html %]</td>
-            <td class="ci-itemtype">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
+            <td class="ci-itemtype">[% ItemTypes.GetDescription( riloo.itemtype ) | html %]</td>
+            <td class="ci-collection">[% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
             <td class="ci-patron">[% IF ( riloo.duedate ) %]
                 <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">
                     [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
-- 
2.11.0