X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_svc_column.pm;h=d2b8fd91b5527357086f856b251eac3d813eabfd;hb=efc68f41987d007de5e792b88df1c63bf3dedf4c;hp=0450b35ef2c8c63fc910ee22f47d482d00fa2a14;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git

diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm
index 0450b35ef..d2b8fd91b 100644
--- a/FS/FS/part_svc_column.pm
+++ b/FS/FS/part_svc_column.pm
@@ -41,7 +41,7 @@ fields are currently supported:
 
 =item columnvalue - default or fixed value for the column
 
-=item columnflag - null, D, F, X (virtual fields)
+=item columnflag - null or empty (no default), `D' for default, `F' for fixed (unchangeable), `S' for selectable choice, `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
@@ -91,10 +91,16 @@ sub check {
   ;
   return $error if $error;
 
-  $self->columnflag =~ /^([DFX])$/
+  $self->columnflag =~ /^([DFSMAX])$/
     or return "illegal columnflag ". $self->columnflag;
   $self->columnflag(uc($1));
 
+  if ( $self->columnflag =~ /^[MA]$/ ) {
+    $error =
+      $self->ut_foreign_key( 'columnvalue', 'inventory_class', 'classnum' );
+    return $error if $error;
+  }
+
   $self->SUPER::check;
 }