display notforloanvalue correctly

Not displaying Available if itemnotforloan is set (& item is not for loan)
The description of the status is enough (being repaired, excluded from loan, ...)

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Items.pm b/C4/Items.pm
index 1c6cf32..0c0077a 100644 (file)
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1163,7 +1163,7 @@ sub GetItemsInfo {
             $sthnflstatus->execute( $authorised_valuecode,
                 $data->{itemnotforloan} );
             my ($lib) = $sthnflstatus->fetchrow;
-            $data->{notforloan} = $lib;
+            $data->{notforloanvalue} = $lib;
         }
 
         # my stack procedures

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 59f41e8..a8e7120 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -194,7 +194,7 @@ function verify_images() {
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
 
-                <!-- TMPL_IF Name="notforloan" -->
+                <!-- TMPL_IF Name="itemnotforloan" -->
                     Not for loan 
                     <!-- TMPL_IF Name="notforloanvalue" -->
                         (<!-- TMPL_VAR NAME="notforloanvalue" -->)
@@ -218,9 +218,9 @@ function verify_images() {
                         <!-- TMPL_IF name="reservedate" --><!-- TMPL_VAR NAME="reservedate" --><!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
-                <!-- TMPL_UNLESS NAME="onloan" --><!-- TMPL_UNLESS NAME="itemlost" --><!-- TMPL_UNLESS NAME="wthdrawn" --><!-- TMPL_UNLESS NAME="damaged" --><!-- TMPL_UNLESS NAME="transfertwhen" --><!-- TMPL_UNLESS NAME="reservedate" -->
+                <!-- TMPL_UNLESS name="itemnotforloan" --><!-- TMPL_UNLESS NAME="onloan" --><!-- TMPL_UNLESS NAME="itemlost" --><!-- TMPL_UNLESS NAME="wthdrawn" --><!-- TMPL_UNLESS NAME="damaged" --><!-- TMPL_UNLESS NAME="transfertwhen" --><!-- TMPL_UNLESS NAME="reservedate" -->
                                         Available
-                <!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
+                <!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
                         
                     </td>
                     <td><!-- TMPL_VAR NAME="datelastseen" --></td>