X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg.pm;h=2efd4fd879aa85e24fffec275048f6de742dede4;hb=8e5fab2148c7dc492b9fffe271c3dcf8df55b01f;hp=b3ed2f29a54965a4196b2ba12cce1eb2f6124f58;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b3ed2f29a..2efd4fd87 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -594,9 +594,13 @@ sub check {
     || $self->ut_numbern('adjourn')
     || $self->ut_numbern('expire')
     || $self->ut_enum('no_auto', [ '', 'Y' ])
+    || $self->ut_numbern('agent_pkgid')
   ;
   return $error if $error;
 
+  return "A package with both start date (future start) and setup date (already started) will never bill"
+    if $self->start_date && $self->setup;
+
   $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
 
   if ( $self->dbdef_table->column('manual_flag') ) {