Merge remote-tracking branch 'origin/new/bug_7215'

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index c27a880..12a70bc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -420,7 +420,7 @@
         </li>
         <li class="radio">
 
-        <label for="show_mine">Show my<br /> funds only</label>
+        <label for="show_mine">Show my funds only</label>
             [% IF ( show_mine ) %]
                 <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
             [% ELSE %]

diff --git a/members/memberentry.pl b/members/memberentry.pl
index d169dbd..c047873 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -649,7 +649,7 @@ if (C4::Context->preference('uppercasesurnames')) {
 }
 
 $data{debarred} = C4::Overdues::CheckBorrowerDebarred($borrowernumber);
-$data{datedebarred} = $data{debarred} if ( $data{debarred} ne "9999-12-31" );
+$data{datedebarred} = $data{debarred} if ( $data{debarred} && $data{debarred} ne "9999-12-31" );
 foreach (qw(dateenrolled dateexpiry dateofbirth datedebarred)) {
        $data{$_} = format_date($data{$_});     # back to syspref for display
        $template->param( $_ => $data{$_});