[freeside-commits] freeside/httemplate/search report_cust_pkg.html, 1.9, 1.10 svc_acct.cgi, 1.46, 1.47

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv20295

Modified Files:
	report_cust_pkg.html svc_acct.cgi 
Log Message:
add "multiplier of monthly" info to "paid time" column in svc_acct-display_paid_time_remaining report

Index: report_cust_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_pkg.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- report_cust_pkg.html	1 Aug 2007 22:26:45 -0000	1.9
+++ report_cust_pkg.html	18 Nov 2007 20:02:54 -0000	1.10
@@ -6,8 +6,11 @@
   <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
 
     <TR>
-      <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
+      <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left">
+        <FONT SIZE="+1">Search options</FONT>
+      </TH>
     </TR>
+
     <% include( '/elements/tr-select-agent.html',
                    'curr_value' => scalar( $cgi->param('agentnum') ),
                )

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_acct.cgi,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- svc_acct.cgi	8 Oct 2007 19:14:28 -0000	1.46
+++ svc_acct.cgi	18 Nov 2007 20:02:54 -0000	1.47
@@ -91,13 +91,16 @@
         my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
         my $part_pkg = $cust_pkg->part_pkg;
         my $timepermonth = $part_pkg->option('seconds');
+        $timepermonth = $timepermonth / $part_pkg->freq
+          if $part_pkg->freq =~ /^\d+$/ && $part_pkg->freq != 0;
         return format_time($seconds) unless $timepermonth;
         #my $recur = $part_pkg->calc_recur($cust_pkg);
         my $recur = $part_pkg->base_recur($cust_pkg);
         my $balance = $cust_pkg->cust_main->balance;
         my $months_unpaid = $balance / $recur;
         my $time_unpaid = $months_unpaid * $timepermonth;
-        format_time($seconds-$time_unpaid);
+        format_time($seconds-$time_unpaid).
+          sprintf(' (%.2fx monthly)', ( $seconds-$time_unpaid ) / $timepermonth );
       };
       push @links, '';
       $align .= 'r';