[freeside-commits] freeside/FS/FS/part_pkg prorate.pm, 1.10, 1.10.2.1 subscription.pm, 1.9, 1.9.2.1

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail:/home/jeff/freeside-1.7/FS/FS/part_pkg

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	prorate.pm subscription.pm 
Log Message:
add formatting to plan data (backport)

Index: subscription.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/subscription.pm,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- subscription.pm	7 Dec 2006 02:40:31 -0000	1.9
+++ subscription.pm	8 May 2007 22:44:08 -0000	1.9.2.1
@@ -25,12 +25,18 @@
                        },
     'upbytes'       => { 'name' => 'Upload limit for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'downbytes'     => { 'name' => 'Download limit for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'totalbytes'    => { 'name' => 'Transfer limit for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_amount'       => { 'name' => 'Cost of recharge for this package',
                          'default' => '',
@@ -40,10 +46,16 @@
                        },
     'recharge_upbytes'      => { 'name' => 'Recharge upload for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_downbytes'    => { 'name' => 'Recharge download for this package',                         'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_totalbytes'   => { 'name' => 'Recharge transfer for this package',                         'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     #it would be better if this had to be turned on, its confusing
     'externalid' => { 'name'   => 'Optional External ID',

Index: prorate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate.pm,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- prorate.pm	7 Dec 2006 02:40:31 -0000	1.10
+++ prorate.pm	8 May 2007 22:44:08 -0000	1.10.2.1
@@ -29,12 +29,18 @@
                        },
     'upbytes'       => { 'name' => 'Upload limit for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'downbytes'     => { 'name' => 'Download limit for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'totalbytes'    => { 'name' => 'Transfer limit for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_amount'       => { 'name' => 'Cost of recharge for this package',
                          'default' => '',
@@ -44,10 +50,16 @@
                        },
     'recharge_upbytes'      => { 'name' => 'Recharge upload for this package',
                          'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_downbytes'    => { 'name' => 'Recharge download for this package',                         'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     'recharge_totalbytes'   => { 'name' => 'Recharge transfer for this package',                         'default' => '',
+			 'format' => \&FS::UI::bytecount::display_bytecount,
+			 'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
     #it would be better if this had to be turned on, its confusing
     'externalid' => { 'name'   => 'Optional External ID',