X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=4549e44ddf931f0a34a8933d5a687a5e0955298d;hb=0e21e4eeb99d5de0bafd8036d92d72a71cd0577c;hp=cce6af822b20f2905c4f0c1c33a0ce0293d4f953;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index cce6af822..4549e44dd 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<% include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
+<% include('/elements/header.html', 'Service Definition Listing') %>
 
 <SCRIPT>
 function part_export_areyousure(href) {
@@ -33,7 +33,7 @@ function part_export_areyousure(href) {
 % $cgi->param('showdisabled', ( 1 ^ $cgi->param('showdisabled') ) ); 
 
 <% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
+%   my $bgcolor1 = '#eeeeee';
 %   my $bgcolor2 = '#ffffff';
 %   my $bgcolor = '';
 
@@ -55,6 +55,8 @@ function part_export_areyousure(href) {
 
     <TH CLASS="grid" BGCOLOR="#cccccc">Field</TH>
 
+    <TH CLASS="grid" BGCOLOR="#cccccc">Label</TH>
+
     <TH COLSPAN=2 CLASS="grid" BGCOLOR="#cccccc">Modifier</TH>
 
   </TR>
@@ -65,8 +67,15 @@ function part_export_areyousure(href) {
 %     my @dfields = $svc_x->fields;
 %     push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
 %     my @fields =
-%       grep { $svc_x->pvf($_)
-%           or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
+%       grep { my $col = $part_svc->part_svc_column($_);
+%              my $def = FS::part_svc->svc_table_fields($svcdb)->{$_};
+%              $svc_x->pvf($_)
+%              or $_ ne 'svcnum' && (
+%                $col->columnflag || ( $col->columnlabel !~ /^\S*$/
+%                                      && $col->columnlabel ne $def->{'label'}
+%                                    )
+%              )
+%            }
 %            @dfields ;
 %     my $rowspan = scalar(@fields) || 1;
 %     my $url = "${p}edit/part_svc.cgi?". $part_svc->svcpart;
@@ -120,7 +129,16 @@ function part_export_areyousure(href) {
 %
 
         <TR>
-          <TD><A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>"><% $part_export->exportnum %>:&nbsp;<% $part_export->exporttype %>&nbsp;to&nbsp;<% $part_export->machine %></A></TD>
+          <TD><A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>">
+<% $part_export->exportnum %>:&nbsp;
+% if ($part_export->exportname) {
+<B><% $part_export->exportname %></B> (
+% }
+<% $part_export->exporttype %>&nbsp;to&nbsp;<% $part_export->machine %>
+% if ($part_export->exportname) {
+)
+% }
+</A></TD>
 	</TR>
 %  } 
 
@@ -128,33 +146,37 @@ function part_export_areyousure(href) {
     </TD>
 
 %     unless ( @fields ) {
-%       for ( 1..3 ) {  
+%       for ( 1..4 ) {  
 	  <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"</TD>
 %       }
 %     }
 %   
 %     my($n1)='';
 %     foreach my $field ( @fields ) {
-%       my $formatter =
-%            FS::part_svc->svc_table_fields($svcdb)->{$field}->{format}
-%            || sub { shift };
-%       my $flag = $part_svc->part_svc_column($field)->columnflag;
 %
+%       #a few lines of false laziness w/edit/part_svc.cgi
+%       my $def = FS::part_svc->svc_table_fields($svcdb)->{$field};
+%       my $formatter = $def->{format} || sub { shift };
+%
+%       my $part_svc_column = $part_svc->part_svc_column($field);
+%       my $label = $part_svc_column->columnlabel || $def->{'label'};
+%       my $flag = $part_svc_column->columnflag;
 
      <% $n1 %>
      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $field %></TD>
+     <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $label %></TD>
      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $flag{$flag} %></TD>
 
      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
 % my $value = &$formatter($part_svc->part_svc_column($field)->columnvalue);
-%          if ( $flag =~ /^[MA]$/ ) { 
-%            $inventory_class{$value}
-%              ||= qsearchs('inventory_class', { 'classnum' => $value } );
-%       
-
-            <% $inventory_class{$value}
-                  ? $inventory_class{$value}->classname
-                  : "WARNING: inventory_class.classnum $value not found" %>
+% if ( $flag =~ /^[MAH]$/ ) { 
+%   my $select_table = ($flag eq 'H') ? 'hardware_class' : 'inventory_class';
+%   $select_class{$value} ||= 
+%       qsearchs($select_table, { 'classnum' => $value } );
+% 
+            <% $select_class{$value}
+                  ? $select_class{$value}->classname
+                  : "WARNING: $select_table.classnum $value not found" %>
 % } else { 
 
             <% $value %>
@@ -186,6 +208,7 @@ my %flag = (
   'M' => 'Manual selected from inventory',
   #'A' => 'Automatically fill in from inventory',
   'A' => 'Automatically filled in from inventory',
+  'H' => 'Selected from hardware class',
   'X' => 'Excluded',
 );
 
@@ -210,6 +233,6 @@ if ( $cgi->param('orderby') eq 'active' ) {
   @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc;
 }
 
-my %inventory_class = ();
+my %select_class = ();
 
 </%init>