[freeside-commits] freeside/FS/FS/part_pkg voip_cdr.pm, 1.108.2.4, 1.108.2.5 prorate_delayed.pm, 1.4.6.1, 1.4.6.2

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv31137/FS/FS/part_pkg

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	voip_cdr.pm prorate_delayed.pm 
Log Message:
add suspend_bill package option to more pkgparts, RT10586

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.108.2.4
retrieving revision 1.108.2.5
diff -u -w -d -r1.108.2.4 -r1.108.2.5
--- voip_cdr.pm	12 Feb 2011 04:56:28 -0000	1.108.2.4
+++ voip_cdr.pm	5 Jun 2011 06:05:13 -0000	1.108.2.5
@@ -50,6 +50,9 @@
   'shortname' => 'VoIP/telco CDR rating (standard)',
   'inherit_fields' => [ 'global_Mixin' ],
   'fields' => {
+    'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
+                        'type' => 'checkbox',
+                      },
     #false laziness w/flat.pm
     'recur_temporality' => { 'name' => 'Charge recurring fee for period',
                              'type' => 'select',
@@ -272,7 +275,7 @@
                        411_rewrite
                        output_format usage_mandate summarize_usage usage_section
                        bill_every_call bill_inactive_svcs
-                       count_available_phones
+                       count_available_phones suspend_bill
                      )
                   ],
   'weight' => 40,

Index: prorate_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate_delayed.pm,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -w -d -r1.4.6.1 -r1.4.6.2
--- prorate_delayed.pm	24 Dec 2010 09:49:49 -0000	1.4.6.1
+++ prorate_delayed.pm	5 Jun 2011 06:05:13 -0000	1.4.6.2
@@ -21,8 +21,11 @@
                                   ' no warning)',
                      'default' => 0,
                     },
+    'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
+                        'type' => 'checkbox',
   },
-  'fieldorder' => [ 'free_days', 'recur_notify' ],
+  },
+  'fieldorder' => [ 'free_days', 'recur_notify', 'suspend_bill', ],
   #'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
   #'recur' => 'what.recur_fee.value',
   'weight' => 22,