[freeside-commits] freeside/FS/FS/part_pkg sqlradacct_hour.pm, 1.10.4.2, 1.10.4.3

[Erik Levinson]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	sqlradacct_hour.pm 
Log Message:
sqlradacct_hour.pm: don't truncate per byte/hour overage charges at 2 decimal places

Index: sqlradacct_hour.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sqlradacct_hour.pm,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -u -w -d -r1.10.4.2 -r1.10.4.3
--- sqlradacct_hour.pm	12 Feb 2011 04:56:28 -0000	1.10.4.2
+++ sqlradacct_hour.pm	5 Jun 2011 16:31:19 -0000	1.10.4.3
@@ -106,25 +106,25 @@
   $output = 0 if $output < 0;
 
   my $totalcharge =
-    $total  * sprintf('%.2f', $self->option('recur_total_charge'));
+     sprintf('%.2f', $total * $self->option('recur_total_charge'));
   $totalcharge = $self->option('recur_total_cap')
     if $self->option('recur_total_cap')
     && $totalcharge > $self->option('recur_total_cap');
 
   my $inputcharge =
-    $input  * sprintf('%.2f', $self->option('recur_input_charge'));
+     sprintf('%.2f', $input * $self->option('recur_input_charge'));
   $inputcharge = $self->option('recur_input_cap')
     if $self->option('recur_input_cap')
     && $inputcharge > $self->option('recur_input_cap');
 
   my $outputcharge = 
-    $output * sprintf('%.2f', $self->option('recur_output_charge'));
+    sprintf('%.2f', $output * $self->option('recur_output_charge'));
   $outputcharge = $self->option('recur_output_cap')
     if $self->option('recur_output_cap')
     && $outputcharge > $self->option('recur_output_cap');
 
   my $hourscharge =
-    $hours * sprintf('%.2f', $self->option('recur_hourly_charge'));
+    sprintf('%.2f', $hours * $self->option('recur_hourly_charge'));
   $hourscharge = $self->option('recur_hourly_cap')
     if $self->option('recur_hourly_cap')
     && $hourscharge > $self->option('recur_hourly_cap');