[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 229b67b82cbd4f1b70cad07c0da33d12f2a114c0

Thu Feb 23 10:34:31 PST 2012

The branch, FREESIDE_2_3_BRANCH has been updated
       via  229b67b82cbd4f1b70cad07c0da33d12f2a114c0 (commit)
       via  558af464b550a135753e73b40b71a4d3fa9ae3cc (commit)
      from  6d6cf28bf8896e27ab323cbe85bd78d0f8d87584 (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 229b67b82cbd4f1b70cad07c0da33d12f2a114c0
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Feb 23 10:24:23 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 558af464b550a135753e73b40b71a4d3fa9ae3cc
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Feb 23 10:23:28 2012 -0800

    remove gray background in HTML messages, #15593

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 3cc920f..0da7d43 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(-)


