[freeside-commits] branch FREESIDE_3_BRANCH updated. 9e138f11de764031d4b67ec2c87a5ccda2dd7fbc

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  9e138f11de764031d4b67ec2c87a5ccda2dd7fbc (commit)
      from  b91dcaf3fc07c23955ce571c2257df4efff2923a (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 9e138f11de764031d4b67ec2c87a5ccda2dd7fbc
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Apr 10 11:10:06 2015 -0700

    quantities for setup fees on non-flat-rate packages, #13136

diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index 03d5c2c..3573cf1 100644
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -34,7 +34,7 @@ sub calc_setup {
       delete $param->{'setup_charge'};
   }
 
-  sprintf('%.2f', $charge - $discount);
+  sprintf('%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
 }
 
 sub cutoff_day {

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

Summary of changes:
 FS/FS/part_pkg/recur_Common.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)