From: ivan <ivan>
Date: Mon, 24 Jan 2011 00:54:09 +0000 (+0000)
Subject: torrus, RT#10574
X-Git-Tag: freeside_2_3_0~702
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=f023c57df143ab903178c33d626bfaf4c04f38cb;p=freeside.git

torrus, RT#10574
---

diff --git a/FS/FS/part_pkg/torrus_Common.pm b/FS/FS/part_pkg/torrus_Common.pm
index c8915ce4c..cbd9ee3fe 100644
--- a/FS/FS/part_pkg/torrus_Common.pm
+++ b/FS/FS/part_pkg/torrus_Common.pm
@@ -74,14 +74,15 @@ sub calc_usage {
     $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;