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

Jeff Finucane,420,, jeff at wavetail.420.am
Thu Apr 19 16:38:35 PDT 2007


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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	svc_acct.pm 
Log Message:
break _bytecount subroutines out of FS::UI::Web (backport)

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.217.2.8
retrieving revision 1.217.2.9
diff -u -d -r1.217.2.8 -r1.217.2.9
--- svc_acct.pm	18 Apr 2007 23:23:08 -0000	1.217.2.8
+++ svc_acct.pm	19 Apr 2007 23:38:32 -0000	1.217.2.9
@@ -25,7 +25,7 @@
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh dbdef );
 use FS::Msgcat qw(gettext);
-use FS::UI::Web; #for {display,parse}_bytecount... perhaps not the best place?
+use FS::UI::bytecount;
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::part_svc;
@@ -295,22 +295,22 @@
                          type  => 'text',
                          disable_inventory => 1,
                          disable_select => 1,
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
         'downbytes' => { label => 'Download',
                          type  => 'text',
                          disable_inventory => 1,
                          disable_select => 1,
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
         'totalbytes'=> { label => 'Total up and download',
                          type  => 'text',
                          disable_inventory => 1,
                          disable_select => 1,
-                         'format' => \&FS::UI::Web::display_bytecount,
-                         'parse' => \&FS::UI::Web::parse_bytecount,
+                         'format' => \&FS::UI::bytecount::display_bytecount,
+                         'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
         'seconds_threshold'   => { label => 'Seconds',
                                    type  => 'text',
@@ -321,22 +321,22 @@
                                    type  => 'text',
                                    disable_inventory => 1,
                                    disable_select => 1,
-                                   'format' => \&FS::UI::Web::display_bytecount,
-                                   'parse' => \&FS::UI::Web::parse_bytecount,
+                                   'format' => \&FS::UI::bytecount::display_bytecount,
+                                   'parse' => \&FS::UI::bytecount::parse_bytecount,
                                  },
         'downbytes_threshold' => { label => 'Download',
                                    type  => 'text',
                                    disable_inventory => 1,
                                    disable_select => 1,
-                                   'format' => \&FS::UI::Web::display_bytecount,
-                                   'parse' => \&FS::UI::Web::parse_bytecount,
+                                   'format' => \&FS::UI::bytecount::display_bytecount,
+                                   'parse' => \&FS::UI::bytecount::parse_bytecount,
                                  },
         'totalbytes_threshold'=> { label => 'Total up and download',
                                    type  => 'text',
                                    disable_inventory => 1,
                                    disable_select => 1,
-                                   'format' => \&FS::UI::Web::display_bytecount,
-                                   'parse' => \&FS::UI::Web::parse_bytecount,
+                                   'format' => \&FS::UI::bytecount::display_bytecount,
+                                   'parse' => \&FS::UI::bytecount::parse_bytecount,
                                  },
     },
   };



More information about the freeside-commits mailing list