X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fmsg_template.pm;h=1c458a090cb02cf0faf79ca9402cd925e3b84128;hp=614c90fc2fc6aaff78d4d41d22385b78a34a9ba2;hb=167480801f938b021e2b06113cf9284bd3b6895b;hpb=4ecf0133faca10a1e959fd0eeb285ce4f9cae212

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 614c90fc2..1c458a090 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -635,8 +635,7 @@ sub _upgrade_data {
         my $new = new FS::msg_template({
           'msgname'   => $oldname,
           'agentnum'  => $agentnum,
-          'from_addr' => ($from && $conf->config($from, $agentnum)) || 
-                         $conf->config('invoice_from', $agentnum),
+          'from_addr' => ($from && $conf->config($from, $agentnum)) || '',
           'bcc_addr'  => ($bcc && $conf->config($from, $agentnum)) || '',
           'subject'   => ($subject && $conf->config($subject, $agentnum)) || '',
           'mime_type' => 'text/html',