add suspend_bill package option to more pkgparts, RT10586

diff --git a/FS/FS/part_pkg/prorate_delayed.pm b/FS/FS/part_pkg/prorate_delayed.pm
index dd1b816..8ea64a8 100644 (file)
--- a/FS/FS/part_pkg/prorate_delayed.pm
+++ b/FS/FS/part_pkg/prorate_delayed.pm
@@ -21,8 +21,11 @@ use FS::part_pkg;
                                   ' 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,

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 5ebe9dd..ad7589b 100644 (file)
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -48,6 +48,9 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
   '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',
@@ -270,7 +273,7 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
                        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,