Fix for returns error message always displaying

diff --git a/circ/returns.pl b/circ/returns.pl
index 5d210af..83d37f7 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -255,7 +255,9 @@ foreach my $code (keys %$messages) {
     } else {
                die "Unknown error code $code"; # XXX
     }
+    if (%err){
        push (@errmsgloop, \%err);
+       }
 last if $exit_required_p;
 }
 $template->param(errmsgloop => \@errmsgloop);

diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
index 5cb2c8e..373be91 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
@@ -126,6 +126,7 @@ Phone: <TMPL_VAR Name="borphone">
        </td>
        <td valign=top align=left>
 </TMPL_IF>
+<TMPL_IF NAME="errmsgloop">
                <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
                <tr><th  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Messages</font></th></tr>
                <tr><td>
@@ -150,6 +151,7 @@ Phone: <TMPL_VAR Name="borphone">
                                <BR>
                        </TMPL_LOOP>
                </td></tr></table>
+               </TMPL_IF>
        </td>
        </tr>
 <TMPL_IF Name="returned">