[freeside-commits] freeside/FS/FS cust_bill.pm, 1.263.2.7, 1.263.2.8 usage_class.pm, 1.2.4.1, 1.2.4.2

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_bill.pm usage_class.pm 
Log Message:
improve appearance of cdr records in cdr sections

Index: usage_class.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/usage_class.pm,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -d -r1.2.4.1 -r1.2.4.2
--- usage_class.pm	20 Nov 2009 17:39:40 -0000	1.2.4.1
+++ usage_class.pm	25 Nov 2009 19:33:52 -0000	1.2.4.2
@@ -139,14 +139,19 @@
     'span'   => [ qw( 5 1 1 ) ],
     'width'  => [ qw( 10.7cm 1.4cm 1.6cm ) ],   # don't like this
   },
-  'minimal' => { 
-    'label' => [ qw( Amount ) ],
+  'usage_simple' => { 
+    'label' => [ qw( Date Time Number Destination Duration Amount ) ],
     'fields' => [
-                  sub { '' },
+                  sub { ' ' },
+                  sub { ' ' },
+                  sub { ' ' },
+                  sub { ' ' },
+                  sub { ' ' },
+                  sub { ' ' },
                 ],
-    'align'  => [ qw( r ) ],
-    'span'   => [ qw( 7 ) ],            # unitprices?
-    'width'  => [ qw( 13.8cm ) ],   # don't like this
+    'align'  => [ qw( l l l l r r ) ],
+    'span'   => [ qw( 2 1 1 1 1 1 ) ],            # unitprices?
+    'width'  => [ qw( 4.3cm 1.4cm 2.5cm 2.5cm 1.4cm 1.6cm ) ],# don't like this
   },
 );
 

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.263.2.7
retrieving revision 1.263.2.8
diff -u -d -r1.263.2.7 -r1.263.2.8
--- cust_bill.pm	25 Nov 2009 16:14:54 -0000	1.263.2.7
+++ cust_bill.pm	25 Nov 2009 19:33:52 -0000	1.263.2.8
@@ -2887,8 +2887,6 @@
   die "no invoice_lines() functions in template?"
     if ( $format eq 'template' && !$wasfunc );
 
-  use Data::Dumper;
-  warn Dumper(\@sections);
   if ($format eq 'template') {
 
     if ( $invoice_lines ) {
@@ -3730,10 +3728,10 @@
 
   my %sectionmap = ();
   my $simple = new FS::usage_class { format => 'simple' }; #bleh
-  my $minimal = new FS::usage_class { format => 'minimal' }; #bleh
+  my $usage_simple = new FS::usage_class { format => 'usage_simple' }; #bleh
   foreach ( keys %sections ) {
     my $summary = $sections{$_}{sort_weight} < 0 ? 1 : 0;
-    my $usage_class = $summary ? $simple : $minimal;
+    my $usage_class = $summary ? $simple : $usage_simple;
     my $ending = $summary ? ' usage charges' : '';
     $sectionmap{$_} = { 'description' => &{$escape}($_. $ending),
                         'amount'    => $sections{$_}{amount},    #subtotal