[freeside-commits] freeside/FS/FS svc_acct.pm, 1.217.2.9, 1.217.2.10

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv14726/FS/FS

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	svc_acct.pm 
Log Message:
more datavolume format (backport)

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.217.2.9
retrieving revision 1.217.2.10
diff -u -d -r1.217.2.9 -r1.217.2.10
--- svc_acct.pm	19 Apr 2007 23:38:32 -0000	1.217.2.9
+++ svc_acct.pm	26 Apr 2007 04:47:16 -0000	1.217.2.10
@@ -2317,8 +2317,12 @@
                         'last'      => $cust_main->getfield('last'),
                         'pkg'       => $cust_pkg->part_pkg->pkg,
                         'column'    => $opt{'column'},
-                        'amount'    => $svc_acct->getfield($opt{'column'}),
-                        'threshold' => $threshold,
+                        'amount'    => $opt{'column'} =~/bytes/
+                                       ? FS::UI::bytecount::display_bytecount($svc_acct->getfield($opt{'column'}))
+                                       : $svc_acct->getfield($opt{'column'}),
+                        'threshold' => $opt{'column'} =~/bytes/
+                                       ? FS::UI::bytecount::display_bytecount($threshold)
+                                       : $threshold,
                       } );