X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fmsg_template.html;h=f1cbc555041b970288e08e9fbc31223672621cc6;hb=03870c8fda3909d8aeb9d7120bc1debc3935f1c3;hp=67eae185d905d24cdad4529eea30f3fa9980aa0d;hpb=a95bfdb0174c66cbf8444967efcd04cb638d727c;p=freeside.git

diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html
index 67eae185d..f1cbc5550 100644
--- a/httemplate/edit/msg_template.html
+++ b/httemplate/edit/msg_template.html
@@ -5,17 +5,19 @@
               'viewall_dir'   => 'browse',
               'agent_virt'    => 1,
               'agent_null'    => 1,
-              'agent_null_right' => 'Edit global templates',
+              'agent_null_right' => ['Edit global templates', 'Configuration'],
 
               'fields' => [ 'msgname',
-                            'subject',
-                            'from_addr',
+                            { field=>'from_addr', size=>60, },
+                            { field=>'bcc_addr',  size=>60, },
+                            { field=>'subject',   size=>80, },
                             { field=>'body', type=>'htmlarea', width=>763 },
                           ],
               'labels' => { 'msgnum'    => 'Template',
                             'msgname'   => 'Template name',
-                            'from_addr' => 'Return address',
-                            'subject'   => 'Message subject',
+                            'from_addr' => 'From: ',
+                            'bcc_addr'  => 'Bcc: ',
+                            'subject'   => 'Subject: ',
                             'body'      => 'Message template',
                           },
               'html_foot' => "</TD>$sidebar</TR></TABLE>",
@@ -46,11 +48,13 @@ my %substitutions = (
     '$classname'      => 'Customer class',
     '$categoryname'   => 'Customer category',
     '$balance'        => 'Current balance',
+    '$credit_limit'   => 'Credit limit',
     '$invoicing_list_emailonly' => 'Billing email address',
     '$cust_status'    => 'Status',
     '$ucfirst_cust_status'  => 'Status, capitalized',
     '$cust_statuscolor'     => 'Status color code',
     '$company_name'   => 'Our company name',
+    '$company_address'=> 'Our company address',
   ],
   'contact' => [ # duplicate this for shipping
     '$name'           => 'Company and contact name',
@@ -92,8 +96,10 @@ my %substitutions = (
     '$location_label' => 'Service location',
   ],
   'svc_acct'  => [
+    '$svcnum'         => 'Service#',
     '$username'       => 'Login name',
     '$password'       => 'Password',
+    '$domain'         => 'Domain name',
   ],
   'cust_pay'  => [
     '$paynum'         => 'Payment#',
@@ -101,6 +107,7 @@ my %substitutions = (
     '$payby'          => 'Payment method',
     '$date'           => 'Payment date',
     '$payinfo'        => 'Card/account# (masked)',
+    '$error'          => 'Decline reason',
   ],
 );
 my @c = @{ $substitutions{'contact'} };