[freeside-commits] freeside/httemplate/browse part_pkg.cgi, 1.37, 1.37.2.1 part_svc.cgi, 1.30, 1.30.2.1

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv8008/httemplate/browse

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	part_pkg.cgi part_svc.cgi 
Log Message:
input and output on data volume fields specified with k,m,g,or t (backport)

Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_svc.cgi,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -d -r1.30 -r1.30.2.1
--- part_svc.cgi	30 Jan 2007 20:59:13 -0000	1.30
+++ part_svc.cgi	12 Apr 2007 03:18:25 -0000	1.30.2.1
@@ -135,6 +135,9 @@
 %   
 %     my($n1)='';
 %     foreach my $field ( @fields ) {
+%       my $formatter =
+%            FS::part_svc->svc_table_fields($svcdb)->{$field}->{format}
+%            || sub { shift };
 %       my $flag = $part_svc->part_svc_column($field)->columnflag;
 %
 
@@ -143,7 +146,7 @@
      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $flag{$flag} %></TD>
 
      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-% my $value = $part_svc->part_svc_column($field)->columnvalue;
+% my $value = &$formatter($part_svc->part_svc_column($field)->columnvalue);
 %          if ( $flag =~ /^[MA]$/ ) { 
 %            $inventory_class{$value}
 %              ||= qsearchs('inventory_class', { 'classnum' => $value } );

Index: part_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_pkg.cgi,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- part_pkg.cgi	30 Jan 2007 20:59:13 -0000	1.37
+++ part_pkg.cgi	12 Apr 2007 03:18:25 -0000	1.37.2.1
@@ -189,7 +189,7 @@
                                 { 'data'  => $1,
                                   'align' => 'right',
                                 },
-                                { 'data'  => $2,
+                                { 'data'  => $part_pkg->format($1,$2),
                                   'align' => 'left',
                                 },
                               ];