X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fbulk_Common.pm;h=ede2fef44b0ceedf3b00b39b73590b1082764df2;hb=8311e00fcc3cd65fa75c2911aae59803e2402466;hp=67a683a12fa90b8e7b38a2d7d03d2ef2a38bb88f;hpb=c92cac116d408350e0579656ef5198dd520de87d;p=freeside.git

diff --git a/FS/FS/part_pkg/bulk_Common.pm b/FS/FS/part_pkg/bulk_Common.pm
index 67a683a12..ede2fef44 100644
--- a/FS/FS/part_pkg/bulk_Common.pm
+++ b/FS/FS/part_pkg/bulk_Common.pm
@@ -47,7 +47,7 @@ sub price_info {
 
 #some false laziness-ish w/agent.pm...  not a lot
 sub calc_recur {
-  my($self, $cust_pkg, $sdate, $details ) = @_;
+  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
 
   my $conf = new FS::Conf;
   my $money_char = $conf->config('money_char') || '$';
@@ -100,10 +100,13 @@ sub calc_recur {
     }
   }
 
-  sprintf('%.2f', $self->base_recur($cust_pkg, $sdate) + $total_svc_charge );
-}
+  my $charge = $self->base_recur($cust_pkg, $sdate) + $total_svc_charge;
+
+  $param->{'override_charges'} = $total_svc_charge / $self->freq;
+  my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
 
-sub can_discount { 0; }
+  sprintf('%.2f', $charge - $discount );
+}
 
 sub hide_svc_detail { 1; }