From 3b0da26ea81169a7693d8bbc8719e8a9aa500734 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Mar 2011 20:54:09 +0000
Subject: [PATCH] should fix usage showing up without omitting package details,
 RT#11905, RT#11561

---
 FS/FS/cust_bill.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index ba308beba..4b8c3f37a 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -4578,11 +4578,17 @@ sub _items_cust_bill_pkg {
 
           }
 
-          warn "$me _items_cust_bill_pkg adding details\n"
-            if $DEBUG > 1;
+          unless ( $is_summary ) {
+            warn "$me _items_cust_bill_pkg adding details\n"
+              if $DEBUG > 1;
 
-          push @d, $cust_bill_pkg->details(%details_opt)
-            unless $is_summary; # || ($type && $type eq 'R');
+            #instead of omitting details entirely in this case (unwanted side
+            # effects), just omit CDRs
+            $details_opt{'format_function'} = sub { () }
+              if $type && $type eq 'R';
+
+            push @d, $cust_bill_pkg->details(%details_opt);
+          }
 
           warn "$me _items_cust_bill_pkg calculating amount\n"
             if $DEBUG > 1;
@@ -4590,9 +4596,9 @@ sub _items_cust_bill_pkg {
           my $amount = 0;
           if (!$type) {
             $amount = $cust_bill_pkg->recur;
-          }elsif($type eq 'R') {
+          } elsif ($type eq 'R') {
             $amount = $cust_bill_pkg->recur - $cust_bill_pkg->usage;
-          }elsif($type eq 'U') {
+          } elsif ($type eq 'U') {
             $amount = $cust_bill_pkg->usage;
           }
   
-- 
2.11.0