From 34cefcd46bcc1433ea27846671fc13abbfed936f 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

Signed-off-by: Devinim <kohadevinim@devinim.com.tr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/columns_settings.yml                              | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 8ef33f045c..96b3a31a68 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1113,6 +1113,8 @@ modules:
               columnname: record_type
             -
               columnname: itype
+            -
+              columnname: ccode
             -
               columnname: borrower
             -
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 eb027621ee..0647470a5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -791,6 +791,7 @@
                                         <th class="ci-dateaccessioned">Date acquired</th>
                                         <th class="ci-recordlevelitemtype">Record-level itemtype</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>
@@ -844,7 +845,10 @@
                                             [% ItemTypes.GetDescription( riloo.recordtype ) | html %]
                                         </td>
                                         <td class="ci-itemtype">
-                                            [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]
+                                            [% ItemTypes.GetDescription( riloo.itemtype ) | html %]
+                                        </td>
+                                        <td class="ci-collection">
+                                            [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]
                                         </td>
                                         <td class="ci-patron">
                                             [% IF ( riloo.duedate ) %]
-- 
2.39.5