service and package disable!

[freeside.git] / FS / FS / part_pkg.pm

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index d84b9c5..be2ad93 100644 (file)
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -52,10 +52,16 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item recur - Recurring fee expression
 
+=item setuptax - Setup fee tax exempt flag, empty or `Y'
+
+=item recurtax - Recurring fee tax exempt flag, empty or `Y'
+
 =item plan - Price plan
 
 =item plandata - Price plan data
 
+=item disabled - Disabled flag, empty or `Y'
+
 =back
 
 setup and recur are evaluated as Safe perl expressions.  You can use numbers
@@ -126,7 +132,7 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
-  $self->ut_numbern('pkgpart')
+  my $error = $self->ut_numbern('pkgpart')
     || $self->ut_text('pkg')
     || $self->ut_text('comment')
     || $self->ut_anything('setup')
@@ -135,6 +141,18 @@ sub check {
     || $self->ut_alphan('plan')
     || $self->ut_anything('plandata')
   ;
+  return $error if $error;
+
+  $self->setuptax =~ /^(Y?)$/ or return "Illegal setuptax: ". $self->setuptax;
+  $self->setuptax($1);
+
+  $self->recurtax =~ /^(Y?)$/ or return "Illegal recrutax: ". $self->recurtax;
+  $self->recurtax($1);
+
+  $self->disabled =~ /^(Y?)$/ or return "Illegal disabled: ". $self->disabled;
+  $self->disabled($1);
+
+  '';
 }
 
 =item pkg_svc
@@ -172,7 +190,7 @@ sub svcpart {
 
 =head1 VERSION
 
-$Id: part_pkg.pm,v 1.3 2001-10-15 10:42:28 ivan Exp $
+$Id: part_pkg.pm,v 1.5 2001-12-27 09:26:13 ivan Exp $
 
 =head1 BUGS