[freeside-commits] freeside/FS/FS/part_pkg torrus_Common.pm, 1.7, 1.8

[Ivan,,,]

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

Modified Files:
	torrus_Common.pm 
Log Message:
torrus, RT#10574

Index: torrus_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/torrus_Common.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- torrus_Common.pm	24 Jan 2011 00:49:23 -0000	1.7
+++ torrus_Common.pm	24 Jan 2011 00:54:09 -0000	1.8
@@ -74,14 +74,15 @@
     $max -= $inc;
     next if $max < 0;
 
-    my $amount = sprintf('%.2f', $self->option($self->_torrus_rate) * $max );
+    my $rate = $self->option($self->_torrus_rate);
+    my $amount = sprintf('%.2f', $rate * $max );
     $total += $amount;
 
     #add usage details to invoice
     my $l = $self->_torrus_label;
-    my $d = "Last month's usage for $serviceid: $max$l";
+    my $d = "Last month's usage for $serviceid: ". sprintf('%2f',$max). $l;
     $d .= " (". ($max+$inc). "$l - $inc$l included)" if $inc;
-    $d .= ": $money_char$amount";
+    $d .= " @ $money_char$rate/$l: $money_char$amount";
 
     push @$details, $d;