fix bulk sending of customer notices, RT#6778

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2c01e18..4837730 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2528,7 +2528,7 @@ plans support this feature (they tend to charge 0).
 
 =item invoice_terms
 
-Options terms to be printed on this invoice.  Otherwise, customer-specific
+Optional terms to be printed on this invoice.  Otherwise, customer-specific
 terms or the default terms are used.
 
 =back
@@ -8431,13 +8431,20 @@ sub search_sql {
   # amounts
   ##
 
-  #my $balance_sql = $class->balance_sql();
-  my $balance_sql = FS::cust_main->balance_sql();
+  if ( $params->{'current_balance'} ) {
 
-  my @current_balance = @{ $params->{'current_balance'} };
+    #my $balance_sql = $class->balance_sql();
+    my $balance_sql = FS::cust_main->balance_sql();
 
-  push @where, map { s/current_balance/$balance_sql/; $_ }
-                   @current_balance;
+    my @current_balance =
+      ref( $params->{'current_balance'} )
+      ? @{ $params->{'current_balance'} }
+      :  ( $params->{'current_balance'} );
+
+    push @where, map { s/current_balance/$balance_sql/; $_ }
+                     @current_balance;
+
+  }
 
   ##
   # custbatch

diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index f644db9..46bf3b4 100644 (file)
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -4,7 +4,7 @@
 % foreach my $key ( keys %search ) {
 %   my @values = ref($search{$key}) ? @{$search{$key}} : ( $search{$key} );
 %   foreach my $value ( @values ) {
-      <INPUT TYPE="hidden" NAME="<% $key |h %>" VALUE="<% $value |h %>">
+      <INPUT TYPE="hidden" NAME="<% $key %>" VALUE="<% $value %>">
 %   }
 % }