X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpkg_svc.pm;h=666d76b735faa29a83aab243cc1a94c8032faeb2;hb=167c830485a305064fb18bb7d91322857e5b5182;hp=9f3a4a1b711174e860a98ef1639a15ec9d99ca04;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git

diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index 9f3a4a1b7..666d76b73 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -1,12 +1,19 @@
 package FS::pkg_svc;
+use base qw(FS::Record);
 
 use strict;
-use vars qw( @ISA );
 use FS::Record qw( qsearchs );
 use FS::part_pkg;
 use FS::part_svc;
 
-@ISA = qw( FS::Record );
+our $cache_enabled = 0;
+
+sub _simplecache {
+  my( $self, $hashref ) = @_;
+  if ( $cache_enabled && $hashref->{'svc'} ) {
+    $self->{'_svcpart'} = FS::part_svc->new($hashref);
+  }
+}
 
 =head1 NAME
 
@@ -50,6 +57,10 @@ definition includes
 
 =item primary_svc - primary flag, empty or 'Y'
 
+=item hidden - 'Y' to hide this service on invoices, null otherwise.
+
+=item provision_hold - 'Y' to release package hold when all services marked with this are provisioned
+
 =back
 
 =head1 METHODS
@@ -109,6 +120,8 @@ sub check {
     || $self->ut_number('pkgpart')
     || $self->ut_number('svcpart')
     || $self->ut_number('quantity')
+    || $self->ut_enum('hidden', [ '', 'Y' ] )
+    || $self->ut_flag('provision_hold')
   ;
   return $error if $error;
 
@@ -142,6 +155,7 @@ Returns the FS::part_svc object (see L<FS::part_svc>).
 
 sub part_svc {
   my $self = shift;
+  return $self->{_svcpart} if $self->{_svcpart};
   qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
 }