[freeside-commits] freeside/httemplate/search cust_bill_pkg.cgi, 1.12, 1.13 report_prepaid_income.cgi, 1.9, 1.10 report_tax.cgi, 1.41, 1.42

[Jeff Finucane,420,,]

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

Modified Files:
	cust_bill_pkg.cgi report_prepaid_income.cgi report_tax.cgi 
Log Message:
correct fallout from duplicate line items

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cust_bill_pkg.cgi	8 Jul 2008 02:19:56 -0000	1.12
+++ cust_bill_pkg.cgi	25 Aug 2008 05:53:13 -0000	1.13
@@ -70,6 +70,8 @@
 
 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.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- report_tax.cgi	8 Jul 2008 02:01:41 -0000	1.41
+++ report_tax.cgi	25 Aug 2008 05:53:14 -0000	1.42
@@ -188,7 +188,8 @@
     LEFT JOIN part_pkg USING ( pkgpart )
 ";
 
-my $where = "WHERE _date >= $beginning AND _date <= $ending ";
+my $where = "WHERE _date >= $beginning AND _date <= $ending ".
+            "AND (duplicate IS NULL or duplicate = '')";
 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- report_prepaid_income.cgi	13 Jan 2008 20:57:36 -0000	1.9
+++ report_prepaid_income.cgi	25 Aug 2008 05:53:14 -0000	1.10
@@ -43,8 +43,9 @@
 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 },
+                                'recur'     => { op=>'!=', value=>0 },
+                                'edate'     => { op=>'>', value=>$now },
+                                'duplicate' => '',
                               }, );
 
 my @cust_pkg =