From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Jul 2013 03:02:32 +0000 (-0700)
Subject: fix discounts vs. quantities for prorate packages, RT#23530
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=050f1d1afbb08680769f1e643118e729dd90c4a8

fix discounts vs. quantities for prorate packages, RT#23530
---

diff --git a/FS/FS/part_pkg/currency_fixed.pm b/FS/FS/part_pkg/currency_fixed.pm
index ce7145278..c64fb7872 100644
--- a/FS/FS/part_pkg/currency_fixed.pm
+++ b/FS/FS/part_pkg/currency_fixed.pm
@@ -81,9 +81,12 @@ sub base_recur {
 sub can_discount { 0; } #can't discount yet (percentage would work, but amount?)
 sub calc_recur {
   my $self = shift;
+
   #my($cust_pkg, $sdate, $details, $param ) = @_;
-  #$self->calc_recur_Common($cust_pkg,$sdate,$details,$param);
-  $self->calc_recur_Common(@_);
+  my $cust_pkg = $_[0];
+
+  ($cust_pkg->quantity || 1) * $self->calc_recur_Common(@_); #($cust_pkg,$sdate,$details,$param);
+
 }
 
 sub is_free { 0; }