fix interaction of percentage discount and quantity, #19354, etc.

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 1e39f6a..dcca343 100644 (file)
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -145,7 +145,7 @@ sub calc_discount {
       # XXX it would be more accurate for calc_recur to just _tell us_ what
       # it's going to charge
 
       # XXX it would be more accurate for calc_recur to just _tell us_ what
       # it's going to charge
 

-      my $recur_charge = $br * ($cust_pkg->quantity || 1) * $chg_months / $self->freq;
+      my $recur_charge = $br * $chg_months / $self->freq;

       # round this, because the real recur charge is rounded
       $recur_charge = sprintf('%.2f', $recur_charge);
 
       # round this, because the real recur charge is rounded
       $recur_charge = sprintf('%.2f', $recur_charge);