[freeside-commits] freeside/FS/FS cust_bill.pm, 1.263.2.20, 1.263.2.21

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_bill.pm 
Log Message:
get section subtotalling right

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.263.2.20
retrieving revision 1.263.2.21
diff -u -w -d -r1.263.2.20 -r1.263.2.21
--- cust_bill.pm	23 Jun 2010 08:38:58 -0000	1.263.2.20
+++ cust_bill.pm	24 Jun 2010 08:17:55 -0000	1.263.2.21
@@ -2575,6 +2575,12 @@
 
   foreach my $section (@sections, @$late_sections) {
 
+    # begin some normalization
+    $section->{'subtotal'} = $section->{'amount'}
+      if $multisection
+         && !exists($section->{subtotal})
+         && exists($section->{amount});
+
     $invoice_data{finance_amount} = sprintf('%.2f', $section->{'subtotal'} )
       if ( $invoice_data{finance_section} &&
            $section->{'description'} eq $invoice_data{finance_section} );
@@ -2583,7 +2589,7 @@
                              sprintf('%.2f', $section->{'subtotal'})
       if $multisection;
 
-    # begin some normalization
+    # continue some normalization
     $section->{'amount'}   = $section->{'subtotal'}
       if $multisection;