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

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_pkg_discount.pm 
Log Message:
fix incorrect error message: Discount does not apply to setup fees, and package has no recurring, RT#15257

Index: cust_pkg_discount.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg_discount.pm,v
retrieving revision 1.6.4.3
retrieving revision 1.6.4.4
diff -u -w -d -r1.6.4.3 -r1.6.4.4
--- cust_pkg_discount.pm	24 Oct 2011 01:16:06 -0000	1.6.4.3
+++ cust_pkg_discount.pm	22 Nov 2011 04:49:37 -0000	1.6.4.4
@@ -172,7 +172,7 @@
   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;
+    if ! $self->discount->setup && $self->cust_pkg->part_pkg->freq =~ /^0/;
 
   $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;