diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-02-24 00:12:31 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-02-24 00:12:31 -0800 |
| commit | 7cfa84ec05dd75cd550cbb2c1ddac4161518fd1e (patch) | |
| tree | 37e5cd3c14527633213db3ac7e51aae0dbff2f1b | |
| parent | 2594f387f6c9acf4df181e2f47ffb42ac0de5b52 (diff) | |
| parent | fe699b35b2e0e81ce025e3ced4211f823ba0655f (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
| -rw-r--r-- | FS/FS/Misc.pm | 2 | ||||
| -rw-r--r-- | FS/FS/cust_main_Mixin.pm | 1 | ||||
| -rw-r--r-- | httemplate/misc/email-customers.html | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 6f6f2e2e5..297e39fbc 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>', diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm index 7fcb5b5c7..a0677060e 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 b87a1bfbb..d26e40298 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; |