From: ivan <ivan>
Date: Sat, 17 Jul 2010 22:15:37 +0000 (+0000)
Subject: customer tags, RT#9192
X-Git-Tag: root_of_svc_elec_features~51
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=90d8aaced90a89974109de6a016a62bee4a7457c

customer tags, RT#9192
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 43d604c59..acbd229d5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3808,6 +3808,14 @@ and customer address. Include units.',
     },
   },
 
+  {
+    'key'         => 'cust_tag-location',
+    'section'     => 'UI',
+    'description' => 'Location where customer tags are displayed.',
+    'type'        => 'select',
+    'select_enum' => [ 'misc_info', 'top' ],
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index d854a01fa..a196c7510 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -15,7 +15,6 @@
                  ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"'
                  : ''
       %>><% $part_tag->tagname.': '. $part_tag->tagdesc |h %></FONT>
-      <BR>
   </TD>
 </TR>
 %   }
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 2243647a3..6e90a0b4c 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -11,7 +11,7 @@
 </TR>
 
 % my @part_tag = $cust_main->part_tag;
-% if ( @part_tag ) {
+% if ( $conf->config('cust_tag-location') =~ /^(cust_misc|)$/ && @part_tag ) {
 <TR>
   <TD ALIGN="right">Tags</TD>
   <TD BGCOLOR="#ffffff">