[freeside-commits] freeside/FS/FS/part_pkg flat.pm, 1.13.2.6, 1.13.2.7 prorate.pm, 1.10.2.4, 1.10.2.5 subscription.pm, 1.9.2.3, 1.9.2.4

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	flat.pm prorate.pm subscription.pm 
Log Message:
add a reset feature to manual recharges (#1858)

Index: prorate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate.pm,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -d -r1.10.2.4 -r1.10.2.5
--- prorate.pm	21 Dec 2007 21:38:11 -0000	1.10.2.4
+++ prorate.pm	23 Dec 2007 21:59:47 -0000	1.10.2.5
@@ -74,6 +74,11 @@
 			            'over into current period',
 			  'type' => 'checkbox',
                         },
+    'recharge_reset' => { 'name' => 'Reset usage to these values on manual '.
+                                    'package recharge',
+                          'type' => 'checkbox',
+                        },
+
     #it would be better if this had to be turned on, its confusing
     'externalid' => { 'name'   => 'Optional External ID',
                       'default' => '',
@@ -83,7 +88,7 @@
                     'seconds', 'upbyte', 'downbytes', 'totalbytes',
                     'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
                     'recharge_downbytes', 'recharge_totalbytes',
-                    'usage_rollover', 'externalid', ],
+                    'usage_rollover', 'recharge_reset', 'externalid', ],
   'freq' => 'm',
   'weight' => 20,
 );

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -u -d -r1.13.2.6 -r1.13.2.7
--- flat.pm	21 Dec 2007 21:38:10 -0000	1.13.2.6
+++ flat.pm	23 Dec 2007 21:59:46 -0000	1.13.2.7
@@ -76,12 +76,16 @@
                                     ' over into current period',
                           'type' => 'checkbox',
                         },
+    'recharge_reset' => { 'name' => 'Reset usage to these values on manual '.
+                                    'package recharge',
+                          'type' => 'checkbox',
+                        },
   },
   'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 
                     'seconds', 'upbytes', 'downbytes', 'totalbytes',
                     'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
                     'recharge_downbytes', 'recharge_totalbytes',
-                    'usage_rollover', 'externalid' ],
+                    'usage_rollover', 'recharge_reset', 'externalid' ],
   'weight' => 10,
 );
 

Index: subscription.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/subscription.pm,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -d -r1.9.2.3 -r1.9.2.4
--- subscription.pm	21 Dec 2007 21:38:11 -0000	1.9.2.3
+++ subscription.pm	23 Dec 2007 21:59:47 -0000	1.9.2.4
@@ -70,6 +70,11 @@
 			            'over into current period',
 			  'type' => 'checkbox',
                         },
+    'recharge_reset' => { 'name' => 'Reset usage to these values on manual '.
+                                    'package recharge',
+                          'type' => 'checkbox',
+                        },
+
     #it would be better if this had to be turned on, its confusing
     'externalid' => { 'name'   => 'Optional External ID',
                       'default' => '',
@@ -79,13 +84,7 @@
                     'upbytes', 'downbytes', 'totalbytes',
                     'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
                     'recharge_downbytes', 'recharge_totalbytes',
-                    'externalid' ],
-  'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day', 'seconds',
-                    'upbytes', 'downbytes', 'totalbytes',
-                    'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
-                    'recharge_downbytes', 'recharge_totalbytes',
-                    'usage_rollover',
-                   ],
+                    'usage_rollover', 'recharge_reset', 'externalid' ],
   'freq' => 'm',
   'weight' => 30,
 );