[freeside-commits] freeside/FS/FS/part_pkg discount_Mixin.pm, 1.1.2.6, 1.1.2.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	discount_Mixin.pm 
Log Message:
fix over-discounting resulting in an error, RT#13450

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -w -d -r1.1.2.6 -r1.1.2.7
--- discount_Mixin.pm	13 Jun 2011 21:25:10 -0000	1.1.2.6
+++ discount_Mixin.pm	27 Jun 2011 21:27:35 -0000	1.1.2.7
@@ -130,6 +130,7 @@
             && ! defined $param->{'setup_charge'});
     die "error discounting: $error" if $error;
 
+    $amount = min($amount, $br);
     $amount *= $months;
     $amount = sprintf('%.2f', $amount);