X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=82b1150cc975b5cf68ad3fc96444603fd851c84e;hb=38dd3ed3eeda0a467e1b4d8cedd741fc62aedc9c;hp=f1b2836381c25804cc242b67f9a4601ac3f4cc3a;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index f1b283638..82b1150cc 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -55,6 +55,8 @@ function part_export_areyousure(href) {
Field |
+ Label |
+
Modifier |
@@ -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) {
%
- <% $part_export->exportnum %>: <% $part_export->exporttype %> to <% $part_export->machine %> |
+
+<% $part_export->exportnum %>:
+% if ($part_export->exportname) {
+<% $part_export->exportname %> (
+% }
+<% $part_export->exporttype %> to <% $part_export->machine %>
+% if ($part_export->exportname) {
+)
+% }
+ |
% }
@@ -128,21 +146,25 @@ function part_export_areyousure(href) {
% unless ( @fields ) {
-% for ( 1..3 ) {
+% for ( 1..4 ) {
% }
% }
%
% 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 %>
| <% $field %> |
+ <% $label %> |
<% $flag{$flag} %> |
|