[Koha-patches] [PATCH 16/55] bug3393 : take care of default rules in overdues

[Henri-Damien LAURENT]

new patch proposed
---
 C4/Overdues.pm                   |    2 +-
 misc/cronjobs/overdue_notices.pl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 04520b2..1d48526 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -956,7 +956,7 @@ returns a list of branch codes for branches with overdue rules defined.
 
 sub GetBranchcodesWithOverdueRules {
     my $dbh               = C4::Context->dbh;
-    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> ''");
+    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL ");
     $rqoverduebranches->execute;
     my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
     return @branches;
diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index a2f94a2..341844b 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -302,7 +302,7 @@ if (@branchcodes) {
     } else {
     
         $verbose and warn "No active overduerules for $branchcodes_word  '@branchcodes'\n";
-        ( scalar grep { '' eq $_ } @branches )
+        ( scalar grep { $_ eq ""} @overduebranches )
           or die "No active overduerules for DEFAULT either!";
         $verbose and warn "Falling back on default rules for @branchcodes\n";
         @branches = ('');
@@ -334,7 +334,7 @@ if ( defined $csvfilename ) {
 @branches = @overduebranches unless @branches;
 foreach my $branchcode (@branches) {
 
-    my $branch_details = C4::Branch::GetBranchDetail($branchcode);
+    my $branch_details = C4::Branch::GetBranchDetail($branchcode) unless ($branchcode eq "");
     my $admin_email_address = $branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
     my @output_chunks;    # may be sent to mail or stdout or csv file.
 
@@ -396,7 +396,7 @@ WHERE  issues.borrowernumber=borrowers.borrowernumber
 AND    borrowers.categorycode=categories.categorycode
 END_SQL
             my @borrower_parameters;
-            if ($branchcode) {
+            if ($branchcode && $branchcode ne "") {
                 $borrower_sql .= ' AND issues.branchcode=? ';
                 push @borrower_parameters, $branchcode;
             }
-- 
1.6.3.3