[freeside-commits] freeside/FS/FS/cust_main Billing.pm,1.14,1.15

[Ivan,,,]

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

Modified Files:
	Billing.pm 
Log Message:
suspend_bill package option to continue recurring billing while suspended and part_pkg-default_suspend_bill conf option to set it by default, RT#10148

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -d -r1.14 -r1.15
--- Billing.pm	11 Oct 2010 19:00:33 -0000	1.14
+++ Billing.pm	18 Oct 2010 02:46:33 -0000	1.15
@@ -856,15 +856,14 @@
   my $recur = 0;
   my $unitrecur = 0;
   my $sdate;
-  if (     ! $cust_pkg->get('susp')
-       and ! $cust_pkg->get('start_date')
-       and ( $part_pkg->getfield('freq') ne '0'
-             && ( $cust_pkg->getfield('bill') || 0 ) <= $time
-           )
+  if (     ! $cust_pkg->start_date
+       and ( ! $cust_pkg->susp || $part_pkg->option('suspend_bill') )
+       and
+            ( $part_pkg->freq ne '0' && ( $cust_pkg->bill || 0 ) <= $time )
         || ( $part_pkg->plan eq 'voip_cdr'
               && $part_pkg->option('bill_every_call')
            )
-        || ( $options{cancel} )
+         || $options{cancel}
   ) {
 
     # XXX should this be a package event?  probably.  events are called