[freeside-commits] freeside/FS/FS cust_bill.pm, 1.263.2.1, 1.263.2.2

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_bill.pm 
Log Message:
unbork summary page invoices

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.263.2.1
retrieving revision 1.263.2.2
diff -u -d -r1.263.2.1 -r1.263.2.2
--- cust_bill.pm	22 Oct 2009 22:11:30 -0000	1.263.2.1
+++ cust_bill.pm	31 Oct 2009 21:22:48 -0000	1.263.2.2
@@ -2067,6 +2067,7 @@
 
 #what's with all the sprintf('%10.2f')'s in here?  will it cause any
 # (alignment in text invoice?) problems to change them all to '%.2f' ?
+# yes: fixed width (dot matrix) text printing will be borked
 sub print_generic {
 
   my( $self, %params ) = @_;
@@ -3192,8 +3193,8 @@
 
   my @sections;
   if ( $summarypage ) {
-    @sections = grep { exists($subtotal{$_}) || ! _pkg_category{$_}->disabled }
-                keys %pkg_category_cache;
+    @sections = grep { exists($subtotal{$_}) || ! _pkg_category($_)->disabled }
+                map { $_->categoryname } qsearch('pkg_category', {});
   } else {
     @sections = keys %subtotal;
   }
@@ -3318,7 +3319,7 @@
                                  ? $_->section eq $section
                                  : 1
                                }
-                          grep { $_->summary || !$summary_page }
+                          grep { !$_->summary || !$summary_page }
                           $cust_bill_pkg->cust_bill_pkg_display
                         )
     {