X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fsvc_Common.html;h=0ffb4319ff23675c81169d4cd5dc4da99a159df2;hb=8ad827f9de1dd45c354381a58a2609f0d59fd8e7;hp=31d4739bfdc74f8832b440700aadbc9c246c209a;hpb=fb9a4b8b235157095779965ffbd9e95934c8bbae;p=freeside.git

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 31d4739bf..0ffb4319f 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -62,6 +62,18 @@
                                       ? 'fixed'
                                       : 'hidden';
                      $f->{'value'} = $columndef->columnvalue;
+                   } elsif ( $flag eq 'A' ) {
+                     $f->{'type'} = 'hidden';
+                   } elsif ( $flag eq 'M' ) {
+                     $f->{'type'}      = 'select-table';
+                     $f->{'table'}     = 'inventory_item';
+                     $f->{'name_col'}  = 'item'; 
+                     $f->{'value_col'} = 'item'; 
+                     $f->{'hashref'}   = {
+                                          'classnum' => $columndef->columnvalue,
+                                          'svcnum'   => '',
+                                         };
+                     $f->{'empty_label'} = 'Select inventory item';
                    }
 
                    if ( $f->{'type'} eq 'select-svc_pbx' ) {
@@ -121,10 +133,29 @@
 sub label_fixup {
   my( $part_svc, $opt ) = @_;
 
+  my $svcdb = $part_svc->svcdb;
+  require "FS/$svcdb.pm";
+
+  if ( UNIVERSAL::can("FS::$svcdb", 'table_info') ) {
+    $opt->{'name'} ||= "FS::$svcdb"->table_info->{'name'};
+
+    my $fields = "FS::$svcdb"->table_info->{'fields'};
+    $opt->{'fields'} ||= [ grep { $_ ne 'svcnum' } keys %$fields ];
+
+    $opt->{labels} ||= {
+                         map { $_ => ( ref($fields->{$_})
+                                         ? $fields->{$_}{'label'}
+                                         : $fields->{$_}
+                                     );
+                             }
+                         keys %$fields
+                       };
+  }
+
   #false laziness w/view/svc_Common.html
   #override default labels with service-definition labels if applicable
   my $labels = $opt->{labels}; # with -> here
-  foreach my $field ( keys %$labels ) {
+  foreach my $field ( keys %{ $opt->{labels} } ) {
     my $col = $part_svc->part_svc_column($field);
     $labels->{$field} = $col->columnlabel if $col->columnlabel !~ /^\S*$/;
   }