diff options
| author | ivan <ivan> | 2008-09-12 07:10:02 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-09-12 07:10:02 +0000 |
| commit | fcf8d4c171e4e61ce02bd35e444b99a238a94c37 (patch) | |
| tree | d11829f0f14a485cf40460d2fb1307c88c7844c9 | |
| parent | 569dbe716a5eb79f0f8e7216bb2baf27d40f60bf (diff) | |
don't throw noisy warnings about missing new recur_temporality, RT#3851
| -rw-r--r-- | FS/FS/cust_main.pm | 4 | ||||
| -rw-r--r-- | FS/FS/part_pkg/flat.pm | 2 | ||||
| -rw-r--r-- | FS/FS/part_pkg/voip_cdr.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 086fded58..697f478ff 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -2104,10 +2104,10 @@ sub bill { '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 6f2a56a1c..a88492572 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -131,7 +131,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 1af5d475e..3ff791c06 100644 --- a/FS/FS/part_pkg/voip_cdr.pm +++ b/FS/FS/part_pkg/voip_cdr.pm @@ -145,7 +145,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'); |