summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2018-11-09 10:42:30 -0800
committerIvan Kohler <ivan@freeside.biz>2018-11-09 10:42:30 -0800
commit8552f59274208f0071ccfcf2a6b3c2b89659bdd1 (patch)
treebe1f24629dbfd086f01fdd8f4f981b6bfa395f25 /FS
parent08c7199f1c9305d8fa1178ab902e7e150e06efd9 (diff)
Event fee reporting, RT#81713
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/cust_event.pm12
-rw-r--r--FS/FS/cust_event_fee.pm2
2 files changed, 7 insertions, 7 deletions
diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm
index fabc7f0ba..0c0bda8c4 100644
--- a/FS/FS/cust_event.pm
+++ b/FS/FS/cust_event.pm
@@ -13,7 +13,7 @@ use FS::cust_bill;
use FS::cust_pay;
use FS::svc_acct;
-$DEBUG = 1;
+$DEBUG = 0;
$me = '[FS::cust_event]';
=head1 NAME
@@ -324,13 +324,13 @@ sub join_sql {
"
JOIN part_event USING ( eventpart )
- LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = invnum )
- LEFT JOIN cust_pkg ON ( eventtable = 'cust_pkg' AND tablenum = pkgnum )
- LEFT JOIN cust_pay ON ( eventtable = 'cust_pay' AND tablenum = paynum )
- LEFT JOIN cust_pay_batch ON ( eventtable = 'cust_pay_batch' AND tablenum = paybatchnum )
+ LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = cust_bill.invnum )
+ LEFT JOIN cust_pkg ON ( eventtable = 'cust_pkg' AND tablenum = cust_pkg.pkgnum )
+ LEFT JOIN cust_pay ON ( eventtable = 'cust_pay' AND tablenum = cust_pay.paynum )
+ LEFT JOIN cust_pay_batch ON ( eventtable = 'cust_pay_batch' AND tablenum = cust_pay_batch.paybatchnum )
LEFT JOIN cust_statement ON ( eventtable = 'cust_statement' AND tablenum = cust_statement.statementnum )
- LEFT JOIN cust_svc ON ( eventtable = 'svc_acct' AND tablenum = svcnum )
+ LEFT JOIN cust_svc ON ( eventtable = 'svc_acct' AND tablenum = cust_svc.svcnum )
LEFT JOIN cust_pkg AS cust_pkg_for_svc ON ( cust_svc.pkgnum = cust_pkg_for_svc.pkgnum )
LEFT JOIN cust_main ON (
diff --git a/FS/FS/cust_event_fee.pm b/FS/FS/cust_event_fee.pm
index c3c99af67..1b57a5af4 100644
--- a/FS/FS/cust_event_fee.pm
+++ b/FS/FS/cust_event_fee.pm
@@ -1,7 +1,7 @@
package FS::cust_event_fee;
+use base qw( FS::cust_main_Mixin FS::Record FS::FeeOrigin_Mixin );
use strict;
-use base qw( FS::Record FS::FeeOrigin_Mixin );
use FS::Record qw( qsearch qsearchs );
use FS::cust_event;