summaryrefslogtreecommitdiff
path: root/httemplate/misc
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2015-01-28 02:26:52 -0800
committerIvan Kohler <ivan@freeside.biz>2015-01-28 02:26:52 -0800
commit2e4fa975e054554beac71883436b143267d7aa12 (patch)
tree246c066d8497d8db3f47a809caddfbd2e67d2264 /httemplate/misc
parentf4b7701c4c1e574ebe29e05db694d131d2799b35 (diff)
parente43f8075d053e3f1d969d8f762ab510a2de126de (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/misc')
-rw-r--r--httemplate/misc/email-customers.html3
1 files changed, 2 insertions, 1 deletions
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,