From: ivan <ivan>
Date: Fri, 12 Sep 2008 07:09:53 +0000 (+0000)
Subject: don't throw noisy warnings about missing new recur_temporality, RT#3851
X-Git-Tag: root_of_webpay_support~367
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=9d83c636a9fdfcac1df88db188d1b3b2bf0f3c55;p=freeside.git

don't throw noisy warnings about missing new recur_temporality, RT#3851
---

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 88d8bdd91..76ed76c86 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2460,10 +2460,10 @@ sub _make_lines {
         'details'   => \@details,
       };
 
-      if ( $part_pkg->option('recur_temporality') eq 'preceding' ) {
+      if ( $part_pkg->option('recur_temporality', 1) eq 'preceding' ) {
         $cust_bill_pkg->sdate( $hash{last_bill} );
         $cust_bill_pkg->edate( $sdate - 86399   ); #60s*60m*24h-1
-      } else { #if ( $part_pkg->option('recur_temporality') eq 'upcoming' ) {
+      } else { #if ( $part_pkg->option('recur_temporality', 1) eq 'upcoming' ) {
         $cust_bill_pkg->sdate( $sdate );
         $cust_bill_pkg->edate( $cust_pkg->bill );
       }
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 2f8fadf7f..21b3f1eab 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -132,7 +132,7 @@ sub calc_recur {
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality') eq 'preceding' && $last_bill == 0;
+    if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
 
   $self->base_recur($cust_pkg);
 }
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 03306ad8b..979134a5a 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -169,7 +169,7 @@ sub calc_recur {
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality') eq 'preceding' && $last_bill == 0;
+    if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
 
   my $ratenum = $cust_pkg->part_pkg->option('ratenum');