[freeside-commits] freeside/httemplate/search cust_bill_pkg.cgi, 1.13, 1.14 report_prepaid_income.cgi, 1.10, 1.11 report_tax.cgi, 1.42, 1.43

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv32032/httemplate/search

Modified Files:
	cust_bill_pkg.cgi report_prepaid_income.cgi report_tax.cgi 
Log Message:
remove duplicate cust_bill_pkg creation RT#3919

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cust_bill_pkg.cgi	25 Aug 2008 05:53:13 -0000	1.13
+++ cust_bill_pkg.cgi	30 Aug 2008 21:34:44 -0000	1.14
@@ -70,8 +70,6 @@
 
 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";

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- report_tax.cgi	25 Aug 2008 05:53:14 -0000	1.42
+++ report_tax.cgi	30 Aug 2008 21:34:45 -0000	1.43
@@ -188,8 +188,7 @@
     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') ) {
 

Index: report_prepaid_income.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_prepaid_income.cgi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- report_prepaid_income.cgi	25 Aug 2008 05:53:14 -0000	1.10
+++ report_prepaid_income.cgi	30 Aug 2008 21:34:45 -0000	1.11
@@ -43,9 +43,8 @@
 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 =