[freeside-commits] branch master updated. 7f9fa336c3c099d9c9dd505a7b3d638cd4f88d36

[Ivan]

The branch, master has been updated
       via  7f9fa336c3c099d9c9dd505a7b3d638cd4f88d36 (commit)
      from  2b4aa0130467d2b992526a66f649464742defa1d (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 7f9fa336c3c099d9c9dd505a7b3d638cd4f88d36
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Feb 17 18:49:59 2013 -0800

    fix setup fee discounts w/intro period price plans, RT#21063

diff --git a/FS/FS/part_pkg/delayed_Mixin.pm b/FS/FS/part_pkg/delayed_Mixin.pm
index 83e543a..ab53bda 100644
--- a/FS/FS/part_pkg/delayed_Mixin.pm
+++ b/FS/FS/part_pkg/delayed_Mixin.pm
@@ -23,7 +23,8 @@ use NEXT;
 );
 
 sub calc_setup {
-  my($self, $cust_pkg, $time ) = @_;
+  my $self = shift;
+  my( $cust_pkg, $time ) = @_;
 
   unless ( $self->option('delay_setup', 1) ) {
     my $d = $cust_pkg->bill || $time;
@@ -31,7 +32,7 @@ sub calc_setup {
     $cust_pkg->bill($d);
   }
   
-  $self->option('setup_fee');
+  $self->NEXT::calc_setup(@_);
 }
 
 sub calc_remain {

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

Summary of changes:
 FS/FS/part_pkg/delayed_Mixin.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)