[freeside-commits] freeside/FS/FS cust_bill.pm, 1.263.2.26, 1.263.2.27 cust_bill_pkg_display.pm, 1.2.2.1, 1.2.2.2

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_bill.pm cust_bill_pkg_display.pm 
Log Message:
create a default finance section and have hidden sectionless line items remain sectionless

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.263.2.26
retrieving revision 1.263.2.27
diff -u -w -d -r1.263.2.26 -r1.263.2.27
--- cust_bill.pm	18 Aug 2010 19:38:36 -0000	1.263.2.26
+++ cust_bill.pm	23 Aug 2010 16:47:13 -0000	1.263.2.27
@@ -2341,6 +2341,7 @@
     $invoice_data{finance_section} = $pkg_class->categoryname;
   } 
  $invoice_data{finance_amount} = '0.00';
+  $invoice_data{finance_section} ||= 'Finance Charges'; #avoid config confusion
 
   my $countrydefault = $conf->config('countrydefault') || 'US';
   my $prefix = $cust_main->has_ship_address ? 'ship_' : '';
@@ -3313,6 +3314,7 @@
   if ( $summarypage ) {
     @sections = grep { exists($subtotal{$_}) || ! _pkg_category($_)->disabled }
                 map { $_->categoryname } qsearch('pkg_category', {});
+    push @sections, '' if exists($subtotal{''});
   } else {
     @sections = keys %subtotal;
   }

Index: cust_bill_pkg_display.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill_pkg_display.pm,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -w -d -r1.2.2.1 -r1.2.2.2
--- cust_bill_pkg_display.pm	22 Oct 2009 05:32:32 -0000	1.2.2.1
+++ cust_bill_pkg_display.pm	23 Aug 2010 16:47:13 -0000	1.2.2.2
@@ -55,7 +55,7 @@
     my $section = $self->getfield('section');
     unless ($section) {
       my $cust_bill_pkg = $self->cust_bill_pkg;
-      if ( $cust_bill_pkg->pkgnum > 0 ) {
+      if ( $cust_bill_pkg->pkgnum > 0 && !$cust_bill_pkg->hidden ) {
         my $part_pkg = $cust_bill_pkg->part_pkg;
         $section = $part_pkg->categoryname if $part_pkg;
       }