projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
detail_format
/
sum_duration.pm
diff --git
a/FS/FS/detail_format/sum_duration.pm
b/FS/FS/detail_format/sum_duration.pm
index
16c1de5
..
1b967b4
100644
(file)
--- a/
FS/FS/detail_format/sum_duration.pm
+++ b/
FS/FS/detail_format/sum_duration.pm
@@
-2,7
+2,7
@@
package FS::detail_format::sum_duration;
use strict;
use vars qw( $DEBUG );
use strict;
use vars qw( $DEBUG );
-use
parent
qw(FS::detail_format);
+use
base
qw(FS::detail_format);
use FS::Record qw(qsearchs);
use FS::cust_svc;
use FS::svc_Common; # for label
use FS::Record qw(qsearchs);
use FS::cust_svc;
use FS::svc_Common; # for label
@@
-32,7
+32,8
@@
sub append {
{ count => 0, duration => 0, amount => 0 });
$subtotal->{count}++;
$subtotal->{duration} += $object->rated_seconds;
{ count => 0, duration => 0, amount => 0 });
$subtotal->{count}++;
$subtotal->{duration} += $object->rated_seconds;
- $subtotal->{amount} += $object->rated_price;
+ $subtotal->{amount} += $object->rated_price
+ if $object->freesidestatus ne 'no-charge';
}
}
}
}