X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg_discount.pm;h=72a1e9c92eae068a0d3e3658730d0e1335df4cde;hb=3c54c844c665ed108c7892a154fd3972fab1f3e5;hp=7b6b203b8728fdc3dd2ef24b2b7a81a4cada2185;hpb=5bd39b3a93605d45b74b3cfcc447a1f64633ba7d;p=freeside.git

diff --git a/FS/FS/cust_pkg_discount.pm b/FS/FS/cust_pkg_discount.pm
index 7b6b203b8..72a1e9c92 100644
--- a/FS/FS/cust_pkg_discount.pm
+++ b/FS/FS/cust_pkg_discount.pm
@@ -106,6 +106,7 @@ sub insert {
       'amount'   => $self->amount,
       'percent'  => $self->percent,
       'months'   => $self->months,
+      'setup'   => $self->setup,
       'disabled' => 'Y',
     };
     my $error = $discount->insert;
@@ -170,6 +171,9 @@ sub check {
   ;
   return $error if $error;
 
+  return "Discount does not apply to setup fees, and package has no recurring"
+    if ! $self->discount->setup && ! $self->cust_pkg->freq;
+
   $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
 
   $self->SUPER::check;