[freeside-commits] freeside/FS/FS/part_pkg discount_Mixin.pm, 1.1.2.4, 1.1.2.5

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	discount_Mixin.pm 
Log Message:
fix annual discounts, RT#12977

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -d -r1.1.2.4 -r1.1.2.5
--- discount_Mixin.pm	6 May 2011 00:29:28 -0000	1.1.2.4
+++ discount_Mixin.pm	3 Jun 2011 17:08:00 -0000	1.1.2.5
@@ -41,7 +41,7 @@
 sub calc_discount {
   my($self, $cust_pkg, $sdate, $details, $param ) = @_;
 
-  my $br = $self->base_recur($cust_pkg, $sdate);
+  my $br = $self->base_recur_permonth($cust_pkg, $sdate);
   $br += $param->{'override_charges'} if $param->{'override_charges'};
   
   my $tot_discount = 0;