From: ivan <ivan>
Date: Tue, 23 Nov 2010 01:52:20 +0000 (+0000)
Subject: fix noisy but harmless fallout from RT#10148
X-Git-Tag: TORRUS_1_0_9~71
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=aa93abfbe3967fdc6b6c01636c02b8340d261c40

fix noisy but harmless fallout from RT#10148
---

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 536a93860..4b727bb7c 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -857,7 +857,7 @@ sub _make_lines {
   my $unitrecur = 0;
   my $sdate;
   if (     ! $cust_pkg->start_date
-       and ( ! $cust_pkg->susp || $part_pkg->option('suspend_bill') )
+       and ( ! $cust_pkg->susp || $part_pkg->option('suspend_bill', 1) )
        and
             ( $part_pkg->freq ne '0' && ( $cust_pkg->bill || 0 ) <= $time )
          || ( $part_pkg->plan eq 'voip_cdr'
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index c05cd5a94..f9198c2dc 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -54,7 +54,7 @@
 
     <% pkg_status_row_changed( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
     <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
-%   if ( $part_pkg->option('suspend_bill') ) {
+%   if ( $part_pkg->option('suspend_bill', 1) ) {
       <% pkg_status_row_if( $cust_pkg, 'Next&nbsp;bill', 'bill', %opt, curuser=>$curuser ) %>
 %   }
     <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>