[freeside-commits] branch master updated. fe699b35b2e0e81ce025e3ced4211f823ba0655f

Thu Feb 23 10:33:02 PST 2012

The branch, master has been updated
       via  fe699b35b2e0e81ce025e3ced4211f823ba0655f (commit)
       via  ec2a4130eedbec0a08278456439605aaadbdda85 (commit)
      from  6cb124e556485bb695d4b466e5a9fa103904f5db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fe699b35b2e0e81ce025e3ced4211f823ba0655f
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Feb 23 10:29:30 2012 -0800

    fix bug with manual notices directly to customers

diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index 7fcb5b5..a067706 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -410,6 +410,7 @@ sub email_search_result {
   }
 
   my $sql_query = $class->search($param->{'search'});
+  $sql_query->{'select'} = $sql_query->{'table'} . '.*';
 
   my $count_query   = delete($sql_query->{'count_query'});
   my $count_sth = dbh->prepare($count_query)
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index b87a1bf..d26e402 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -188,6 +188,7 @@ if ( $cgi->param('action') eq 'preview' ) {
                              { msgnum => $cgi->param('msgnum') } )
         or die "template not found: ".$cgi->param('msgnum');
     $sql_query->{'extra_sql'} .= ' LIMIT 1';
+    $sql_query->{'select'} = "$table.*";
     $sql_query->{'order_by'} = '';
     my $object = qsearchs($sql_query);
     my $cust = $object->cust_main;

commit ec2a4130eedbec0a08278456439605aaadbdda85
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Feb 23 10:29:19 2012 -0800

    remove gray background in HTML messages, #15593

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 6f6f2e2..297e39f 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -375,7 +375,7 @@ sub generate_email {
                        '      '. encode_entities($return{'subject'}), 
                        '    </title>',
                        '  </head>',
-                       '  <body bgcolor="#e8e8e8">',
+                       '  <body bgcolor="#ffffff">',
                        @html_data,
                        '  </body>',
                        '</html>',

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Misc.pm                        |    2 +-
 FS/FS/cust_main_Mixin.pm             |    1 +
 httemplate/misc/email-customers.html |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)


