X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fcust_bill.pm;h=2d7341efdf11696ba99f1e190b47a41e6a0add2b;hb=26e91d6afcd21b7113cdc6aebb37ad5acd3d5de8;hp=4975974014c20327487be7a1c08180a00afc9cb8;hpb=ef398b33e062bbb7a89c527bf4b34d62414c372c;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 497597401..2d7341efd 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2857,8 +2857,7 @@ sub print_generic {
       push @detail_items, 
 	{ 'description' => $didsummary_desc,
 	    'ext_description' => [ $didsummary, $minutes ],
-	}
-	if !$multisection;
+	};
   }
 
   foreach my $section (@sections, @$late_sections) {
@@ -4055,7 +4054,7 @@ sub _did_summary {
 
 	    my $inserted = $h_cust_svc->date_inserted;
 	    my $deleted = $h_cust_svc->date_deleted;
-	    my $phone_inserted = $h_cust_svc->h_svc_x($inserted);
+	    my $phone_inserted = $h_cust_svc->h_svc_x($inserted+5);
 	    my $phone_deleted;
 	    $phone_deleted =  $h_cust_svc->h_svc_x($deleted) if $deleted;
 	    
@@ -4088,10 +4087,13 @@ sub _did_summary {
 	    }
 
 	    # increment usage minutes
-	    my @cdrs = $phone_inserted->get_cdrs('begin'=>$start,'end'=>$end);
-	    foreach my $cdr ( @cdrs ) {
-		$minutes += $cdr->billsec/60;
-	    }
+        if ( $phone_inserted ) {
+            my @cdrs = $phone_inserted->get_cdrs('begin'=>$start,'end'=>$end,'billsec_sum'=>1);
+            $minutes = $cdrs[0]->billsec_sum if scalar(@cdrs) == 1;
+        }
+        else {
+            warn "WARNING: no matching h_svc_phone insert record for insert time $inserted, svcnum " . $h_cust_svc->svcnum;
+        }
 
 	    # don't look at this service again
 	    push @seen, $h_cust_svc->svcnum;
@@ -4562,7 +4564,8 @@ sub _items_cust_bill_pkg {
           $description .= " (" . time2str($date_format, $cust_bill_pkg->sdate).
                           " - ". time2str($date_format, $cust_bill_pkg->edate).
                           ")"
-            unless $conf->exists('disable_line_item_date_ranges');
+            unless $conf->exists('disable_line_item_date_ranges')
+                || $cust_pkg->part_pkg->option('disable_line_item_date_ranges',1);
 
           my @d = ();