6 files changed, 99 insertions, 0 deletions
diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html
index 36add3721..916bac001 100644
--- a/httemplate/edit/cust_main/top_misc.html
+++ b/httemplate/edit/cust_main/top_misc.html
@@ -1,5 +1,12 @@
 <% &ntable("#cccccc") %>
 
+%# tags
+<% include('/elements/tr-select-cust_tag.html',
+             'custnum' => $custnum,
+             'cgi'     => $cgi,
+          )
+%>
+
 %# agent
 <% include('/elements/tr-select-agent.html', 
               'curr_value'    => $cust_main->agentnum,
diff --git a/httemplate/edit/part_tag.html b/httemplate/edit/part_tag.html
index 938e34256..56ba5672c 100644
--- a/httemplate/edit/part_tag.html
+++ b/httemplate/edit/part_tag.html
@@ -20,4 +20,12 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+#FF6666 red
+#FF9966 orange
+#FFFF66 yellow
+#66FF66 green
+#66FFFF cyan?
+#6666FF blue
+#FF66FF purple?  looks more like pink.  CC66FF?
+
 </%init>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 1311ba4f3..3158d7bbf 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -73,6 +73,8 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
   );
 }
 
+$new->tagnum( [ $cgi->param('tagnum') ] );
+
 my %usedatetime = ( 'birthdate' => 1 );
 
 foreach my $dfield (qw( birthdate signupdate )) {
diff --git a/httemplate/elements/select-cust_tag.html b/httemplate/elements/select-cust_tag.html
new file mode 100644
index 000000000..61d4dca3b
--- /dev/null
+++ b/httemplate/elements/select-cust_tag.html
@@ -0,0 +1,20 @@
+<% include( '/elements/select-table.html',
+                 'table'         => 'part_tag',
+                 'name_col'      => 'tagname', #tagname - tagdesc??
+                 'multiple'      => 1,
+                 #'value'         => $agentnum || '',
+                 #'agent_virt'    => 1,
+                 'hashref'       => { 'disabled' => '' },
+                 'order_by'      => ' ORDER BY tagname',
+                 %opt,
+             )
+%>
+<%init>
+
+my %opt = @_;
+#my $agentnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'records'} = delete $opt{'part_tag'}
+  if $opt{'part_tag'};
+
+</%init>
diff --git a/httemplate/elements/tr-select-cust_tag.html b/httemplate/elements/tr-select-cust_tag.html
new file mode 100644
index 000000000..d88f3a894
--- /dev/null
+++ b/httemplate/elements/tr-select-cust_tag.html
@@ -0,0 +1,46 @@
+% if ( $curuser->access_right('Edit customer tags') && @part_tag ) {
+
+  <TR>
+    <TD ALIGN="right"><% $opt{'label'} || 'Tags' %></TD>
+    <TD>
+      <% include( '/elements/select-cust_tag.html',
+                     'curr_value' => \@curr_tagnum,
+                     'part_tag'   => \@part_tag,
+                     %opt,
+                 )
+      %>
+    </TD>
+  </TR>
+
+% } else {
+
+%   foreach my $tagnum (@curr_tagnum) {
+      <INPUT TYPE="hidden" NAME="tagnum" VALUE="<% $tagnum %>">
+%   }
+
+% }
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my %opt = @_;
+my $cgi = $opt{'cgi'};
+
+my @curr_tagnum = ();
+if ( $cgi->param('error') ) {
+  @curr_tagnum = $cgi->param('tagnum');
+} elsif ( $opt{'custnum'} ) {
+  @curr_tagnum = map $_->tagnum,
+                     qsearch('cust_tag', { 'custnum' => $opt{'custnum'} } );
+}
+
+my $extra_sql = "WHERE disabled IS NULL OR disabled = '' ";
+$extra_sql .= ' OR tagnum IN ('. join(',', @curr_tagnum). ')' if @curr_tagnum;
+
+my @part_tag = qsearch({
+  'table'     => 'part_tag',
+  'hashref'   => {},
+  'extra_sql' => $extra_sql,
+});
+
+</%init>
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index d383e4aa4..2243647a3 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -10,6 +10,22 @@
   <TD BGCOLOR="#ffffff"><FONT COLOR="#<% $cust_main->statuscolor %>"><B><% ucfirst($cust_main->status) %></B></FONT></TD>
 </TR>
 
+% my @part_tag = $cust_main->part_tag;
+% if ( @part_tag ) {
+<TR>
+  <TD ALIGN="right">Tags</TD>
+  <TD BGCOLOR="#ffffff">
+%   foreach my $part_tag ( @part_tag ) {
+      <FONT <% length($part_tag->tagcolor)
+                 ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"'
+                 : '' %>
+      ><% $part_tag->tagname.': '. $part_tag->tagdesc |h %></FONT>
+      <BR>
+%   }
+  </TD>
+</TR>
+% }
+
 %unless ( scalar(@agentnums) == 1
 %         && !$curuser->access_right('View customers of all agents')  ) {
 %  my $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );