[freeside-commits] freeside/FS/FS cust_pkg_discount.pm, 1.6.4.2, 1.6.4.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv6686/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_pkg_discount.pm 
Log Message:
fix discounts not appearing for one-time charge packages, RT#13654

Index: cust_pkg_discount.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg_discount.pm,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -w -d -r1.6.4.2 -r1.6.4.3
--- cust_pkg_discount.pm	29 Apr 2011 12:10:48 -0000	1.6.4.2
+++ cust_pkg_discount.pm	24 Oct 2011 01:16:06 -0000	1.6.4.3
@@ -171,6 +171,9 @@
   ;
   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;