enhance contacts: contact classes, RT#16819

5 files changed, 11 insertions, 7 deletions

diff --git a/httemplate/browse/contact_class.html b/httemplate/browse/contact_class.html
index 88df24b40..58215a090 100644
--- a/httemplate/browse/contact_class.html
+++ b/httemplate/browse/contact_class.html
@@ -1,7 +1,7 @@
 <% include( 'elements/browse.html',
-                 'title'       => 'Contact classes',
+                 'title'       => 'Contact types',
                  'html_init'   => $html_init,
-                 'name'        => 'contact classes',
+                 'name'        => 'contact types',
                  'disableable' => 1,
                  'disabled_statuspos' => 1,
                  'query'       => { 'table'     => 'contact_class',
@@ -21,7 +21,7 @@ die "access denied"
 
 my $html_init = 
   'Contact classes define types for contacts.<BR><BR>'.
-  qq!<A HREF="${p}edit/contact_class.html"><I>Add a contact class</I></A><BR><BR>!;
+  qq!<A HREF="${p}edit/contact_class.html"><I>Add a contact type</I></A><BR><BR>!;
 
 my $count_query = 'SELECT COUNT(*) FROM contact_class';
 
diff --git a/httemplate/edit/contact_class.html b/httemplate/edit/contact_class.html
index 2e0965dab..1ab52e5d6 100644
--- a/httemplate/edit/contact_class.html
+++ b/httemplate/edit/contact_class.html
@@ -1,6 +1,10 @@
 <% include( 'elements/class_Common.html',
-              'name'   => 'Contact Class',
+              'name'   => 'Contact Type',
               'table'  => 'contact_class',
 	      'nocat' => 1,
+              'addl_labels' => { 'classnum'  => 'Type number',
+                                 'classname' => 'Type name',
+                                 'disabled'  => 'Disable type',
+                               },
           )
 %>
diff --git a/httemplate/edit/process/prospect_main.html b/httemplate/edit/process/prospect_main.html
index 49481d44f..7c8cc276e 100644
--- a/httemplate/edit/process/prospect_main.html
+++ b/httemplate/edit/process/prospect_main.html
@@ -34,7 +34,7 @@ my $args_callback = sub {
 
 };
 
-my @contact_fields = qw( first last title comment emailaddress );
+my @contact_fields = qw( classnum first last title comment emailaddress );
 foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
   push @contact_fields, 'phonetypenum'.$phone_type->phonetypenum;
 }
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index f096dd889..3b0969f5c 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -492,7 +492,7 @@ tie my %config_cust, 'Tie::IxHash',
   'Customer classes'    =>  [ $fsurl.'browse/cust_class.html', 'Customer classes define groups of customers for reporting.' ],
   'Customer categories' =>  [ $fsurl.'browse/cust_category.html', 'Customer categories define groups of customer classes.' ],
   'separator'     => '', #its a separator!
-  'Contact classes'    =>  [ $fsurl.'browse/contact_class.html', 'Contact classes define types for contacts.' ],
+  'Contact types'    =>  [ $fsurl.'browse/contact_class.html', ''], #XXX useful description
 ;
   
 $config_cust{'Note classes'} = [ $fsurl.'browse/cust_note_class.html', 'Note classes define groups of customer notes for reporting.' ]
diff --git a/httemplate/view/prospect_main.html b/httemplate/view/prospect_main.html
index 1c8195672..9e85348af 100644
--- a/httemplate/view/prospect_main.html
+++ b/httemplate/view/prospect_main.html
@@ -32,7 +32,7 @@
 
 % foreach my $contact ( $prospect_main->contact ) {
     <TR>
-      <TD ALIGN="right">Contact</TD>
+      <TD ALIGN="right"><% $contact->contact_classname %> Contact</TD>
       <TD BGCOLOR="#FFFFFF"><% $contact->line %></TD>
     </TR>
 %}