X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fcust_bill_pkg.pm;h=8e4fa26890a15d5ee236b743f0c55f08055f0b6c;hb=189524c12d69394769d3e88a18d6777a68ac6064;hp=0b110f5931e59aa58a0f96f5fec826ea8c06ef0b;hpb=30026a09a72bb16b8c7e17035250b9d797bd47e2;p=freeside.git

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 0b110f593..8e4fa2689 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -838,8 +838,7 @@ sub _item_discount {
     $d = {
       _is_discount    => 1,
       description     => $self->mt('Discount'),
-      setup_amount    => 0,
-      recur_amount    => 0,
+      amount          => 0,
       ext_description => \@ext,
       pkgpart         => $self->pkgpart,
       feepart         => $self->feepart,
@@ -847,8 +846,7 @@ sub _item_discount {
     };
     foreach my $pkg_discount (@pkg_discounts) {
       push @ext, $pkg_discount->description;
-      my $setuprecur = $pkg_discount->cust_pkg_discount->setuprecur;
-      $d->{$setuprecur.'_amount'} -= $pkg_discount->amount;
+      $d->{'amount'} -= $pkg_discount->amount;
     }
   }
 
@@ -866,8 +864,7 @@ sub _item_discount {
   }
 
   if ( $d ) {
-    $d->{setup_amount} *= $self->quantity || 1; # ??
-    $d->{recur_amount} *= $self->quantity || 1; # ??
+    $d->{amount} *= $self->quantity || 1;
   }
     
   $d;