X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fsvc_Common.html;h=fc29327aee98cfd42cc8ac0793a7166c008b6717;hb=a2df4ef9575be1ae2f1f5b9089f121316f796bac;hp=64484eba0985694ee2ed28f6608150f8fff7da6c;hpb=50c2e50db2999c61db1c1c72ae416482ef370d99;p=freeside.git

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 64484eba0..fc29327ae 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -101,14 +101,17 @@
 
                    my $columndef = $part_svc->part_svc_column($f->{'field'});
                    my $flag = $columndef->columnflag;
-                   if ( $flag eq 'F' ) {
+
+                   if ( $flag eq 'F' ) { #fixed
                      $f->{'type'} = length($columndef->columnvalue)
                                       ? 'fixed'
                                       : 'hidden';
                      $f->{'value'} = $columndef->columnvalue;
-                   } elsif ( $flag eq 'A' ) {
+
+                   } elsif ( $flag eq 'A' ) { #auto assign from inventory
                      $f->{'type'} = 'hidden';
-                   } elsif ( $flag eq 'M' ) {
+
+                   } elsif ( $flag eq 'M' ) { #manually assign from inventory
                      $f->{'type'} = 'select-inventory_item';
                      $f->{'empty_label'} = 'Select inventory item';
                      $f->{'extra_sql'} = 'WHERE ( svcnum IS NULL ' .
@@ -116,12 +119,15 @@
                         ')';
                      $f->{'classnum'} = $columndef->columnvalue;
                      $f->{'disable_empty'} = $object->svcnum ? 1 : 0;
-                   } elsif ( $flag eq 'H' ) {
+
+                   } elsif ( $flag eq 'H' ) { #hardware
                      $f->{'type'}        = 'select-hardware_type';
                      $f->{'hashref'}     = {
                                             'classnum'=>$columndef->columnvalue
                                            };
-                   } elsif ( $flag eq 'S' ) { #selectable choice
+
+                   } elsif ( $flag eq 'S' #selectable choice
+                               && $f->{type} !~ /^select-svc(-domain|_pbx)$/ ) {
                      $f->{type}    = 'select';
                      $f->{options} = [ split( /\s*,\s*/,
                                                 $columndef->columnvalue)