From 44e4110d6ee712e0a78646590d6df12aa7d0449f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 1 Oct 2018 11:23:48 -0300
Subject: [PATCH] Bug 18355: Display permanent location with cart location

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/catalogue/detail.tt         | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index a569a45638..9b2d57dfd7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -266,7 +266,22 @@
                     <td class="location">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.branchcode ) | html %] [% END %]</td>
                     <td class="homebranch">
                         [% Branches.GetName(item.homebranch) | html %]
-                        <span class="shelvingloc">[% item.location | html %]</span>
+                        <span class="shelvingloc">
+                            [%# 1 - If permanent location is defined %]
+                            [%#   a - display the description if available, display the code if not %]
+                            [%#   b - display the current location in parens %]
+                            [%# 2 - If permanent location is not defined, but location is defined %]
+                            [%#   a - display the current location description if available, display the code if not %]
+                            [%# 3 - If neither are defined, show nothing %]
+                            [% IF item.permanent_location %]
+                                [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) | html %]
+                                [% IF item.location AND item.location != item.permanent_location %]
+                                    ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %])
+                                [% END %]
+                            [% ELSIF item.location %]
+                                [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) | html %]
+                            [% END %]
+                        </span>
                     </td>
                     [% IF ( itemdata_ccode ) %]<td>[% item.ccode | html %]</td>[% END %]
                     <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %]</td>
-- 
2.39.5