[freeside-commits] freeside/FS/FS cust_pkg.pm, 1.139.2.17, 1.139.2.18

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_pkg.pm 
Log Message:
per-package option to adjust bill date on unsuspend, RT#8434

Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.139.2.17
retrieving revision 1.139.2.18
diff -u -w -d -r1.139.2.17 -r1.139.2.18
--- cust_pkg.pm	28 Jul 2010 23:20:57 -0000	1.139.2.17
+++ cust_pkg.pm	12 Oct 2010 19:06:43 -0000	1.139.2.18
@@ -1011,10 +1011,16 @@
 
   my $conf = new FS::Conf;
 
-  $hash{'bill'} = ( $hash{'bill'} || $hash{'setup'} ) + $inactive
-    if ( $opt{'adjust_next_bill'}
-         || $conf->exists('unsuspend-always_adjust_next_bill_date') )
-    && $inactive > 0 && ( $hash{'bill'} || $hash{'setup'} );
+  if ( $inactive > 0 &&
+        ( $hash{'bill'} || $hash{'setup'} ) &&
+        ( $opt{'adjust_next_bill'} ||
+          $conf->exists('unsuspend-always_adjust_next_bill_date') ||
+          $self->part_pkg->option('unsuspend_adjust_bill', 1) )
+     ) {
+    
+    $hash{'bill'} = ( $hash{'bill'} || $hash{'setup'} ) + $inactive;
+
+  }
 
   $hash{'susp'} = '';
   $hash{'adjourn'} = '' if $hash{'adjourn'} < time;