[freeside-commits] freeside/FS/FS/part_pkg discount_Mixin.pm, 1.6, 1.7

[Erik Levinson]

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

Modified Files:
	discount_Mixin.pm 
Log Message:
bug fix for discounts on setup fees, RT11512

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- discount_Mixin.pm	3 Jun 2011 17:07:59 -0000	1.6
+++ discount_Mixin.pm	13 Jun 2011 21:25:09 -0000	1.7
@@ -120,6 +120,9 @@
         $param->{'discount_left_recur'}{$discount->discountnum} = 0;
         $months = 1;
     }
+    elsif ( $discount->setup && $discount->months == 1 && $discount->amount ) {
+        next;
+    }
 
     my $error = $cust_pkg_discount->increment_months_used($months)
         if (defined $param->{'real_pkgpart'}