From 3dc4beeec7a92332c1c21ad621d489bf52362b86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 15 Apr 2011 23:33:48 +0000
Subject: [PATCH] fix new tax report w/FS::tax_rate_location->location_sql,
 RT#12332

---
 FS/FS/tax_rate.pm                   | 2 +-
 httemplate/search/report_newtax.cgi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index ea605fe83..8185d99d3 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -1894,7 +1894,7 @@ sub generate_liability_report {
 
       my $payby_itemdesc_loc = 
         "    payby != 'COMP' ".
-        "AND itemdesc = ? OR ? = '' AND itemdesc IS NULL ".
+        "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
         "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
                                                          @taxparams
                                                    );
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 0961bbb4c..5b8604b1d 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -121,7 +121,7 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
 
     my $payby_itemdesc_loc = 
       "    payby != 'COMP' ".
-      "AND itemdesc = ? OR ? = '' AND itemdesc IS NULL ".
+      "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
       "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
                                                        @taxparams
                                                  );
-- 
2.11.0