diff options
author | Alex Brelsfoard <alex@freeside.biz> | 2015-01-27 19:24:58 -0500 |
---|---|---|
committer | Alex Brelsfoard <alex@freeside.biz> | 2015-01-27 19:24:58 -0500 |
commit | 0b07929c5a6f2654d91db7f7ba8951e3c2a46093 (patch) | |
tree | e9831f477192aa7842a0e524297f5f61150f2987 /httemplate | |
parent | 05889be74afd7e845b24ed75252026a466fe1ff2 (diff) | |
parent | c21244410514448a34d732c802ca1d3325448dff (diff) |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate')
-rw-r--r-- | httemplate/misc/email-customers.html | 3 |
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, &> <\ <& /elements/input-text.html, |