projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f06162
)
improve appearance of cdr records in cdr sections
author
jeff
<jeff>
Wed, 25 Nov 2009 19:32:47 +0000
(19:32 +0000)
committer
jeff
<jeff>
Wed, 25 Nov 2009 19:32:47 +0000
(19:32 +0000)
FS/FS/cust_bill.pm
patch
|
blob
|
history
FS/FS/usage_class.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
b2c5c3d
..
cbb3107
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-2887,8
+2887,6
@@
sub print_generic {
die "no invoice_lines() functions in template?"
if ( $format eq 'template' && !$wasfunc );
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 ) {
if ($format eq 'template') {
if ( $invoice_lines ) {
@@
-3730,10
+3728,10
@@
sub _items_svc_phone_sections {
my %sectionmap = ();
my $simple = new FS::usage_class { format => 'simple' }; #bleh
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;
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
my $ending = $summary ? ' usage charges' : '';
$sectionmap{$_} = { 'description' => &{$escape}($_. $ending),
'amount' => $sections{$_}{amount}, #subtotal
diff --git
a/FS/FS/usage_class.pm
b/FS/FS/usage_class.pm
index
8ecd416
..
b64d26a
100644
(file)
--- a/
FS/FS/usage_class.pm
+++ b/
FS/FS/usage_class.pm
@@
-139,14
+139,19
@@
my %summary_formats = (
'span' => [ qw( 5 1 1 ) ],
'width' => [ qw( 10.7cm 1.4cm 1.6cm ) ], # don't like this
},
'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' => [
'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
},
);
},
);