X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fbulk_Common.pm;h=900ad004988f4368745677da8c3b0b8ecd82714f;hb=17eb4823b553563b97dbe0ef36689ca6dd5e466c;hp=50115958e1908336fa196180b41aedceba9baf39;hpb=f1731704579a2de6a1723b98af92be654eb23095;p=freeside.git

diff --git a/FS/FS/part_pkg/bulk_Common.pm b/FS/FS/part_pkg/bulk_Common.pm
index 50115958e..900ad0049 100644
--- a/FS/FS/part_pkg/bulk_Common.pm
+++ b/FS/FS/part_pkg/bulk_Common.pm
@@ -36,7 +36,7 @@ sub price_info {
     my $svc_recur_fee = $self->option('svc_recur_fee');
     my $conf = new FS::Conf;
     my $money_char = $conf->config('money_char') || '$';
-    $str .= " , bulk" if $str;
+    $str .= ", bulk " if $str;
     $str .= ": $money_char" . $svc_setup_fee . " one-time per service" 
 	if $svc_setup_fee;
     $str .= ", " if ($svc_setup_fee && $svc_recur_fee);
@@ -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') || '$';
@@ -64,7 +64,8 @@ sub calc_recur {
   foreach my $cust_svc ( $self->_bulk_cust_svc( $cust_pkg, $sdate ) ) {
 
     my @label = $cust_svc->label_long( $$sdate, $last_bill );
-    die "fatal: no label found, wtf?" unless scalar(@label); #?
+    die "fatal: no label found for svcnum ". $cust_svc->svcnum
+      unless scalar(@label); #?
     my $svc_details = $label[0]. ': '. $label[1]. ': ';
     $part_svc_label{$cust_svc->svcpart} ||= $label[0];