[freeside-commits] branch master updated. e2956e14f9ddb53302c594aa343db3a59bacdda3

[Ivan]

The branch, master has been updated
       via  e2956e14f9ddb53302c594aa343db3a59bacdda3 (commit)
      from  eee5968af58fd00382e6ed007453e1e143c6de66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e2956e14f9ddb53302c594aa343db3a59bacdda3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 5 13:26:16 2013 -0700

    fix intro periods getting re-added on package change when delay_setup is on, RT#23440

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4ce2e8e..65bfc80 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -255,7 +255,8 @@ The following options are available:
 
 =item change
 
-If set true, supresses any referral credit to a referring customer.
+If set true, supresses actions that should only be taken for new package
+orders.  (Currently this includes: intro periods when delay_setup is on.)
 
 =item options
 
@@ -303,8 +304,12 @@ sub insert {
     }
   }
 
-  my $free_days = $part_pkg->option('free_days',1);
-  if ( $free_days && $part_pkg->option('delay_setup',1) ) { #&& !$self->start_date
+  if (    ! $options{'change'}
+       && ( my $free_days = $part_pkg->option('free_days',1) )
+       && $part_pkg->option('delay_setup',1)
+       #&& ! $self->start_date
+     )
+  {
     my ($mday,$mon,$year) = (localtime(time) )[3,4,5];
     #my $start_date = ($self->start_date || timelocal(0,0,0,$mday,$mon,$year)) + 86400 * $free_days;
     my $start_date = timelocal(0,0,0,$mday,$mon,$year) + 86400 * $free_days;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pkg.pm |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)