X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_newtax.cgi;h=09c56ab3b5389334b86f6e31fa8734c48098c187;hp=4ec3f4da4a017267c3498eeb833795ff2f7dcaf2;hb=f30eaaf66cd0a947f388a03edd4522ba92a367bb;hpb=38919d1e68a62afea9cc9ae23b28957ea7a7987d

diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 4ec3f4da4..09c56ab3b 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -64,6 +64,8 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
+#shit, all sorts of false laxiness w/tax_rate::geneate_liability_report
+
 my $conf = new FS::Conf;
 my $money_char = $conf->config('money_char') || '$';
 
@@ -117,28 +119,31 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
     $taxes{$label}->{'url_param'} =
       join(';', map { "$_=". uri_escape($t->$_) } @params);
 
-    my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
+    my $payby_itemdesc_loc = 
+      "    payby != 'COMP' ".
+      "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
       "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
                                                        @taxparams
                                                  );
 
+    my $taxwhere =
+      "FROM cust_bill_pkg $addl_from $where AND $payby_itemdesc_loc";
+
     my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $x = scalar_sql($t, [], $sql );
+    my $x = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
     $tax += $x;
     $taxes{$label}->{'tax'} += $x;
 
-    my $creditfrom = " JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum) ";
-    my $creditwhere = "FROM cust_bill_pkg $addl_from $creditfrom $where ".
-      "AND payby != 'COMP' ".
-      "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
-                                                       @taxparams
-                                                 );
+    my $creditfrom =
+      "JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum)";
+    my $creditwhere =
+     "FROM cust_bill_pkg $addl_from $creditfrom $where AND $payby_itemdesc_loc";
 
     $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
            " $creditwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $y = scalar_sql($t, [], $sql );
+    my $y = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
     $credit += $y;
     $taxes{$label}->{'credit'} += $y;