diff options
| author | jeff <jeff> | 2008-08-30 21:34:45 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2008-08-30 21:34:45 +0000 |
| commit | 4ad29235ceb48ec0c5a0af07e6ccfcb64b40f466 (patch) | |
| tree | d6b316e506f1fb1c3849f44b98537917b7341ab7 /httemplate | |
| parent | 0269c850cfefc00d5da255f88c63a314e1ab6cd0 (diff) | |
remove duplicate cust_bill_pkg creation RT#3919
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/search/cust_bill_pkg.cgi | 2 | ||||
| -rw-r--r-- | httemplate/search/report_prepaid_income.cgi | 5 | ||||
| -rwxr-xr-x | httemplate/search/report_tax.cgi | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 2354be953..74efe4f7e 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -70,8 +70,6 @@ my $agentnums_sql = my @where = ( $agentnums_sql ); -push @where, "(duplicate IS NULL OR duplicate = '' )"; - my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); push @where, "_date >= $beginning", "_date <= $ending"; diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi index 3694c7aae..27dbcbf9f 100644 --- a/httemplate/search/report_prepaid_income.cgi +++ b/httemplate/search/report_prepaid_income.cgi @@ -43,9 +43,8 @@ my( $total, $total_legacy ) = ( 0, 0 ); my @cust_bill_pkg = grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ } qsearch( 'cust_bill_pkg', { - 'recur' => { op=>'!=', value=>0 }, - 'edate' => { op=>'>', value=>$now }, - 'duplicate' => '', + 'recur' => { op=>'!=', value=>0 }, + 'edate' => { op=>'>', value=>$now }, }, ); my @cust_pkg = diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index dd6779a61..3d37c47e4 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -188,8 +188,7 @@ my $join_pkg = " LEFT JOIN part_pkg USING ( pkgpart ) "; -my $where = "WHERE _date >= $beginning AND _date <= $ending ". - "AND (duplicate IS NULL or duplicate = '')"; +my $where = "WHERE _date >= $beginning AND _date <= $ending "; my @base_param = qw( county county state state country ); if ( $conf->exists('tax-ship_address') ) { |