X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=1cd0943bb88739a2cb06852b2f8151b270183b3a;hb=72b9a9be93cfbf456ac515bd920c3c664cfc5221;hp=94afdef1555c4f69734cd46836ecd1caca9d9c13;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 94afdef15..1cd0943bb 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -60,12 +60,14 @@ function part_export_areyousure(href) {
Modifier |
-
+% my $conf = FS::Conf->new;
% foreach my $part_svc ( @part_svc ) {
% my $svcdb = $part_svc->svcdb;
% my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } );
% my @dfields = $svc_x->fields;
-% push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
+% push @dfields, 'usergroup' if $svcdb eq 'svc_acct' #double kludge
+% or ($svcdb eq 'svc_broadband'
+% and $conf->exists('svc_broadband-radius'));
% my @fields =
% grep { my $col = $part_svc->part_svc_column($_);
% my $def = FS::part_svc->svc_table_fields($svcdb)->{$_};
@@ -129,7 +131,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) {
+)
+% }
+ |
% }
@@ -160,14 +171,14 @@ function part_export_areyousure(href) {
% 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 %>
@@ -199,6 +210,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',
);
@@ -223,6 +235,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>
|