From: jeff <jeff>
Date: Wed, 20 Feb 2002 03:17:13 +0000 (+0000)
Subject: correct sense of tax generation
X-Git-Tag: freeside_1_4_0pre11~27
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=09b365e315a7ba825c9e1e262c50b372cf2595a2;p=freeside.git

correct sense of tax generation
---

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b732218e7..67b426b85 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -976,10 +976,10 @@ sub bill {
         $total_recur += $recur;
         $taxable_setup += $setup
           unless $part_pkg->dbdef_table->column('setuptax')
-                 || $part_pkg->setuptax =~ /^Y$/i;
+                 && $part_pkg->setuptax =~ /^Y$/i;
         $taxable_recur += $recur
           unless $part_pkg->dbdef_table->column('recurtax')
-                 || $part_pkg->recurtax =~ /^Y$/i;
+                 && $part_pkg->recurtax =~ /^Y$/i;
       }
     }