[freeside-commits] freeside/FS/FS/part_pkg discount_Mixin.pm, 1.8.2.4, 1.8.2.5 prorate_Mixin.pm, 1.15.2.3, 1.15.2.4

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	discount_Mixin.pm prorate_Mixin.pm 
Log Message:
fix edge case with prorated packages discounted 100% causing discounts to be off by +- $0.01, RT#15590

Index: prorate_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate_Mixin.pm,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -w -d -r1.15.2.3 -r1.15.2.4
--- prorate_Mixin.pm	3 Dec 2011 19:49:43 -0000	1.15.2.3
+++ prorate_Mixin.pm	23 Dec 2011 00:02:34 -0000	1.15.2.4
@@ -81,8 +81,10 @@
     # (by prorate_defer_bill), calculate from the setup date,
     # and append the setup fee to @$details.
     if ( $self->option('prorate_defer_bill',1)
-        and ! $cust_pkg->getfield('last_bill') 
-        and $cust_pkg->setup ) {
+         && ! $cust_pkg->getfield('last_bill') 
+         && $cust_pkg->setup
+     )
+  {
       #warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
       $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details);
       $mnow = $cust_pkg->setup;
@@ -101,16 +103,19 @@
     # or periods up to freq_override if billing for an override interval
     if ( ($param->{'freq_override'} || 0) > 1 ) {
       $months += $param->{'freq_override'} - 1;
-    }
-    elsif ( ( $self->option('add_full_period',1) 
-        or $self->option('prorate_defer_bill',1) )
-        and $months < $self->freq ) {
+  } elsif ( ( $self->option('add_full_period',1) 
+                || $self->option('prorate_defer_bill',1) # necessary
+            )
+            && $months < $self->freq
+          )
+  {
       $months += $self->freq;
       $$sdate = $self->add_freq($mstart);
     }
 
     $param->{'months'} = $months;
-    $charge = sprintf('%.2f', $permonth * $months);
+                                                  #so 1.005 rounds to 1.01
+  $charge = sprintf('%.2f', $permonth * $months + 0.00000001 );
 
   return $charge;
 }

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -w -d -r1.8.2.4 -r1.8.2.5
--- discount_Mixin.pm	24 Oct 2011 22:55:34 -0000	1.8.2.4
+++ discount_Mixin.pm	23 Dec 2011 00:02:34 -0000	1.8.2.5
@@ -133,7 +133,7 @@
       $amount *= $months;
     }
 
-    $amount = sprintf('%.2f', $amount);
+    $amount = sprintf('%.2f', $amount + 0.00000001 ); #so 1.005 rounds to 1.01
 
     next unless $amount > 0;
 
@@ -155,7 +155,7 @@
     my $cust_bill_pkg_discount = new FS::cust_bill_pkg_discount {
       'pkgdiscountnum' => $cust_pkg_discount->pkgdiscountnum,
       'amount'         => $amount,
-      'months'         => $months,
+      'months'         => ( defined($param->{'setup_charge'}) ? 0 : $months ),
     };
     push @{ $param->{'discounts'} }, $cust_bill_pkg_discount;