projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9c8cf42
)
should fix usage showing up without omitting package details, RT#11905, RT#11561
author
ivan
<ivan>
Wed, 9 Mar 2011 20:54:09 +0000
(20:54 +0000)
committer
ivan
<ivan>
Wed, 9 Mar 2011 20:54:09 +0000
(20:54 +0000)
FS/FS/cust_bill.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
ba308be
..
4b8c3f3
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-4578,11
+4578,17
@@
sub _items_cust_bill_pkg {
}
}
- warn "$me _items_cust_bill_pkg adding details\n"
- if $DEBUG > 1;
+ unless ( $is_summary ) {
+ warn "$me _items_cust_bill_pkg adding details\n"
+ if $DEBUG > 1;
- push @d, $cust_bill_pkg->details(%details_opt)
- unless $is_summary; # || ($type && $type eq 'R');
+ #instead of omitting details entirely in this case (unwanted side
+ # effects), just omit CDRs
+ $details_opt{'format_function'} = sub { () }
+ if $type && $type eq 'R';
+
+ push @d, $cust_bill_pkg->details(%details_opt);
+ }
warn "$me _items_cust_bill_pkg calculating amount\n"
if $DEBUG > 1;
warn "$me _items_cust_bill_pkg calculating amount\n"
if $DEBUG > 1;
@@
-4590,9
+4596,9
@@
sub _items_cust_bill_pkg {
my $amount = 0;
if (!$type) {
$amount = $cust_bill_pkg->recur;
my $amount = 0;
if (!$type) {
$amount = $cust_bill_pkg->recur;
- }
elsif
($type eq 'R') {
+ }
elsif
($type eq 'R') {
$amount = $cust_bill_pkg->recur - $cust_bill_pkg->usage;
$amount = $cust_bill_pkg->recur - $cust_bill_pkg->usage;
- }
elsif
($type eq 'U') {
+ }
elsif
($type eq 'U') {
$amount = $cust_bill_pkg->usage;
}
$amount = $cust_bill_pkg->usage;
}