Fix for Bug 3015: Check-in screen displays branch name inconsistently

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/circ/returns.pl b/circ/returns.pl
index b736ecf..f28580e 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -340,6 +340,9 @@ if ( $messages->{'ResFound'}) {
             currentbranch  => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
             itemnumber       => $reserve->{'itemnumber'},
             barcode     => $barcode,
+            destbranchname =>
+              $branches->{ $reserve->{'branchcode'} }->{'branchname'},
+            destbranch    => $reserve->{'branchcode'},
         );
 
     }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 7658bd4..c60e2b7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -93,8 +93,14 @@ function Dopop(link) {
                        <!-- TMPL_IF NAME="boraddress2" --><!-- TMPL_VAR NAME="boraddress2" --><br /><!-- /TMPL_IF -->
             <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
            <!-- TMPL_IF NAME="borphone" --><li> <!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
-                  <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF --></ul>
-        </p>
+                  <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED</li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF --></ul>
+               <!-- TMPL_IF name="transfertodo" -->
+            <h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
+               <!-- TMPL_ELSE -->
+               <h4><strong>Hold at</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
+        <!-- /TMPL_IF -->
         <form method="post" action="returns.pl" class="confirm">
             <input type="submit" class="approve" value="Confirm" />
 
@@ -125,9 +131,11 @@ function Dopop(link) {
                         <!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
                                                <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF -->
                     </ul>
-            <!-- TMPL_IF name="transfertodo" -->
-                <h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
-            <!-- /TMPL_IF -->
+               <!-- TMPL_IF name="transfertodo" -->
+            <h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
+               <!-- TMPL_ELSE -->
+               <h4><strong>Hold at</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
+        <!-- /TMPL_IF -->
 
         <form method="post" action="returns.pl" class="confirm">
             <input type="submit" class="approve" value="Confirm" />
@@ -152,7 +160,7 @@ function Dopop(link) {
     <!-- TMPL_IF Name="needstransfer" -->
        <!-- transfer -->
        <div class="dialog message"><h3> This item needs to be transfered to <!-- TMPL_VAR Name="homebranch" --></h3>
-       <center>Transfer Now?<br />
+       Transfer Now?<br />
     <form method="post" action="returns.pl" name="mainform" id="mainform">              
        <input type="submit" name="dotransfer" value="Yes" class="submit" />
        <input type="submit" name="notransfer" value="No" class="submit" />
@@ -164,7 +172,7 @@ function Dopop(link) {
        <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" /> 
        <!-- /TMPL_LOOP -->                            
        <input type="hidden" name="barcode" value="0" />    
-       </form> </center>  </div>
+       </form>   </div>
        <!-- /TMPL_IF -->
        
     <!-- TMPL_IF Name="diffbranch" -->