[freeside-commits] freeside/FS/FS cust_bill_pkg.pm,1.58,1.59

[Ivan,,,]

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

Modified Files:
	cust_bill_pkg.pm 
Log Message:
fix displaying usage separate from recurring when using separate_usage and invoice_sections but without a usage_section set, RT#13907

Index: cust_bill_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill_pkg.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -w -d -r1.58 -r1.59
--- cust_bill_pkg.pm	3 Aug 2011 05:08:28 -0000	1.58
+++ cust_bill_pkg.pm	3 Aug 2011 22:13:06 -0000	1.59
@@ -682,16 +682,16 @@
                     || $cust_pkg->part_pkg->option('usage_mandate', 'Hush!');
 
   # or use the category from $opt{'part_pkg'} if its not bundled?
-  my $section = $cust_pkg->part_pkg->categoryname;
+  my $categoryname = $cust_pkg->part_pkg->categoryname;
 
   return $self->set('display', [])
-    unless $separate || $section || $usage_mandate;
+    unless $separate || $categoryname || $usage_mandate;
   
   my @display = ();
 
-  my %hash = ( 'section' => $section );
+  my %hash = ( 'section' => $categoryname );
 
-  $section =            $part_pkg->option('usage_section', 'Hush!')
+  my $usage_section =            $part_pkg->option('usage_section', 'Hush!')
            || $cust_pkg->part_pkg->option('usage_section', 'Hush!');
 
   my $summary =            $part_pkg->option('summarize_usage', 'Hush!')
@@ -708,18 +708,18 @@
                      };
   }
 
-  if ($separate && $section && $summary) {
+  if ($separate && $usage_section && $summary) {
     push @display, new FS::cust_bill_pkg_display { type    => 'U',
                                                    summary => 'Y',
                                                    %hash,
                                                  };
   }
-  if ($usage_mandate || $section && $summary) {
+  if ($usage_mandate || ($usage_section && $summary) ) {
     $hash{post_total} = 'Y';
   }
 
   if ($separate || $usage_mandate) {
-    $hash{section} = $section if ($separate || $usage_mandate);
+    $hash{section} = $usage_section if $usage_section;
     push @display, new FS::cust_bill_pkg_display { type => 'U', %hash };
   }