From f81320082667e4450cbf9c9b949f2e8ac5ae46a3 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 14 Apr 2017 13:07:39 -0400
Subject: [PATCH] Bug 18435 - Language entered in Materials Specified does not
 display when items are checked out and checked in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This problem stems from bug 17642, if items.materials is not linked to
an authorized value the contents are being tossed out. We shuold display
them instead

To test:
1 - Ensure items.materials 952$3 is not mapped to an authorized value
2 - Add a value to an item
3 - Check the item out, note the materials does not display
4 - Check the item in, note the materials does not display
5 - Apply patch
6 - Check the item out, note the materials does display
7 - Check the item in, note the materials does display

Followed test plan, message about material displays as expected
whil checking out and in.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 circ/circulation.pl | 2 +-
 circ/returns.pl     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 941306a..ebb8d8b 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -383,7 +383,7 @@ if (@$barcodes) {
             #  Get the item title for more information
             my $materials = $iteminfo->{'materials'};
             my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $getmessageiteminfo->{frameworkcode}, kohafield => 'items.materials', authorised_value => $materials });
-            $materials = $descriptions->{lib} // '';
+            $materials = $descriptions->{lib} // $materials;
             $template_params->{additional_materials} = $materials;
             $template_params->{itemhomebranch} = $iteminfo->{'homebranch'};
 
diff --git a/circ/returns.pl b/circ/returns.pl
index 3ef887f..ba3707b 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -282,7 +282,7 @@ if ($barcode) {
 
     my $materials = $biblio->{'materials'};
     my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials });
-    $materials = $descriptions->{lib} // '';
+    $materials = $descriptions->{lib} // $materials;
 
     $template->param(
         title            => $biblio->{'title'},
-- 
2.9.3