[freeside-commits] freeside/FS/FS cust_bill.pm, 1.299.2.23, 1.299.2.24

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv18431

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_bill.pm 
Log Message:
should fix usage showing up without omitting package details, RT#11905, RT#11561

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.299.2.23
retrieving revision 1.299.2.24
diff -u -w -d -r1.299.2.23 -r1.299.2.24
--- cust_bill.pm	8 Mar 2011 01:47:03 -0000	1.299.2.23
+++ cust_bill.pm	9 Mar 2011 20:54:14 -0000	1.299.2.24
@@ -4547,11 +4547,17 @@
 
           }
 
+          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;