From: ivan <ivan>
Date: Tue, 29 Jun 2010 05:23:16 +0000 (+0000)
Subject: eliminate filtering of info from COMP customers on financial reports, RT#8787
X-Git-Tag: freeside_1_9_4~26
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=6e9f0a1a915ef4cee669b4632594edc8b5395baa

eliminate filtering of info from COMP customers on financial reports, RT#8787
---

diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index 224fbbb42..646702036 100644
--- a/httemplate/graph/cust_bill_pkg.cgi
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -19,7 +19,7 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
-my $link = "${p}search/cust_bill_pkg.cgi?nottax=1;include_comp_cust=1";
+my $link = "${p}search/cust_bill_pkg.cgi?nottax=1";
 my $bottom_link = "$link;";
 
 my $use_override         = $cgi->param('use_override')         ? 1 : 0;
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 6a0b60003..86b02387a 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -137,9 +137,6 @@ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
 push @where, "_date >= $beginning",
              "_date <= $ending";
 
-push @where , " payby != 'COMP' "
-  unless $cgi->param('include_comp_cust');
-
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   push @where, "cust_main.agentnum = $1";
 }
diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index bfb699b54..2fe5b6f10 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -108,10 +108,6 @@ my @where = ();
 #here is the agent virtualization
 push @where, $curuser->agentnums_sql( 'table'=>'cust_main' );
 
-#well, because cust_bill_pkg.cgi has it and without it the numbers don't match..
-push @where , " payby != 'COMP' "
-  unless $cgi->param('include_comp_cust');
-
 my %total = ();
 my %total_legacy = ();
 foreach my $agentnum (@agentnums) {