X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main%2FBilling.pm;h=b710f33266308d5b46ce5b1a66327e6e2ab05677;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=cbe8b64663f1f7026e6cce1234c2da492b2b010d;hpb=b08fdcdd5b0c7e32e0a666fd9a044651dd575589;p=freeside.git

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index cbe8b6466..b710f3326 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -916,8 +916,9 @@ sub _make_lines {
     # which can_discount are supported.
     # (the UI should prevent adding discounts to these at the moment)
 
-    warn "calling $method on cust_pkg ". $cust_pkg->pkgnum. " with params ".
-         join(' / ', map "$_=>$params{$_}", keys %param). "\n"
+    warn "calling $method on cust_pkg ". $cust_pkg->pkgnum.
+         " for pkgpart ". $cust_pkg->pkgpart.
+         " with params ". join(' / ', map "$_=>$param{$_}", keys %param). "\n"
       if $DEBUG > 2;
            
     $recur = eval { $cust_pkg->$method( \$sdate, \@details, \%param ) };
@@ -1018,11 +1019,11 @@ sub _make_lines {
         'freq'      => $part_pkg->freq,
       };
 
-      if ( $part_pkg->option('recur_temporality', 1) eq 'preceding' ) {
+      if ( $part_pkg->recur_temporality eq 'preceding' ) {
         $cust_bill_pkg->sdate( $hash{last_bill} );
         $cust_bill_pkg->edate( $sdate - 86399   ); #60s*60m*24h-1
         $cust_bill_pkg->edate( $time ) if $options{cancel};
-      } else { #if ( $part_pkg->option('recur_temporality', 1) eq 'upcoming' ) {
+      } else { #if ( $part_pkg->recur_temporality eq 'upcoming' ) {
         $cust_bill_pkg->sdate( $sdate );
         $cust_bill_pkg->edate( $cust_pkg->bill );
         #$cust_bill_pkg->edate( $time ) if $options{cancel};