projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4bbd2db
)
unbreak projected future revenue query, #33599, fallout from #32472
author
Mark Wells
<mark@freeside.biz>
Fri, 20 Feb 2015 22:40:16 +0000
(14:40 -0800)
committer
Mark Wells
<mark@freeside.biz>
Fri, 20 Feb 2015 22:40:21 +0000
(14:40 -0800)
FS/FS/Report/Table.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Report/Table.pm
b/FS/FS/Report/Table.pm
index
69686df
..
4797473
100644
(file)
--- a/
FS/FS/Report/Table.pm
+++ b/
FS/FS/Report/Table.pm
@@
-495,12
+495,17
@@
sub _cust_bill_pkg_recurring {
my @where = (
'(pkgnum != 0 OR feepart IS NOT NULL)',
my @where = (
'(pkgnum != 0 OR feepart IS NOT NULL)',
- $self->with_classnum($opt{'classnum'}, $opt{'use_override'}),
$self->with_report_option(%opt),
$self->with_refnum(%opt),
$self->with_cust_classnum(%opt)
);
$self->with_report_option(%opt),
$self->with_refnum(%opt),
$self->with_cust_classnum(%opt)
);
+ my $where_classnum = $self->with_classnum($opt{'classnum'}, $opt{'use_override'});
+ if ($opt{'project'}) {
+ $where_classnum =~ s/\bcust_bill_pkg/v_cust_bill_pkg/g;
+ }
+ push @where, $where_classnum;
+
if ( $opt{'distribute'} ) {
$where[0] = 'pkgnum != 0'; # specifically exclude fees
push @where, "cust_main.agentnum = $agentnum" if $agentnum;
if ( $opt{'distribute'} ) {
$where[0] = 'pkgnum != 0'; # specifically exclude fees
push @where, "cust_main.agentnum = $agentnum" if $agentnum;