From f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 27 Jan 2015 16:25:18 -0600
Subject: Ticket #30613: Can't Send E-mail

---
 httemplate/misc/email-customers.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate')

diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index 15926308e..c74c15b1e 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -103,7 +103,8 @@ Template:
     <& /elements/tr-td-label.html, 'label' => 'From:' &>
       <TD><& /elements/input-text.html,
               'field' => 'from_name',
-              'value' => $conf->config('company_name', $agent_virt_agentnum), #?
+              'value' => $conf->config('invoice_from_name', $agent_virt_agentnum) ||
+                         $conf->config('company_name', $agent_virt_agentnum), #?
               'size'  => 20,
           &>&nbsp;&lt;\
           <& /elements/input-text.html,
-- 
cgit v1.2.1