X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Ftax_rate.pm;h=334c31e953e7549df45f42d86ea2125ef25aaecb;hb=9b6a55590ce6146a072d4d5c0b64b2ac7ccfe725;hp=b518a37712d7b2475a2759549022be4f609ea321;hpb=8a1645b274706e6636b0fa08f7c670871c68d4cc;p=freeside.git

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index b518a3771..334c31e95 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -18,6 +18,7 @@ use DBIx::DBSchema;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use FS::Record qw( qsearch qsearchs dbh dbdef );
+use FS::Conf;
 use FS::tax_class;
 use FS::cust_bill_pkg;
 use FS::cust_tax_location;
@@ -443,20 +444,35 @@ sub taxline {
 
   my $taxable_units = 0;
   unless ($self->recurtax =~ /^Y$/i) {
-    if (( $self->unittype || 0 ) == 0) {
+
+    if (( $self->unittype || 0 ) == 0) { #access line
       my %seen = ();
       foreach (@cust_bill_pkg) {
         $taxable_units += $_->units
-          unless $seen{$_->pkgnum};
-        $seen{$_->pkgnum}++;
+          unless $seen{$_->pkgnum}++;
       }
-    }elsif ($self->unittype == 1) {
+
+    } elsif ($self->unittype == 1) { #minute
       return $self->_fatal_or_null( 'fee with minute unit type' );
-    }elsif ($self->unittype == 2) {
-      $taxable_units = 1;
-    }else {
+
+    } elsif ($self->unittype == 2) { #account
+
+      my $conf = new FS::Conf;
+      if ( $conf->exists('tax-pkg_address') ) {
+        #number of distinct locations
+        my %seen = ();
+        foreach (@cust_bill_pkg) {
+          $taxable_units++
+            unless $seen{$_->cust_pkg->locationnum}++;
+        }
+      } else {
+        $taxable_units = 1;
+      }
+
+    } else {
       return $self->_fatal_or_null( 'unknown unit type in tax'. $self->taxnum );
     }
+
   }
 
   #
@@ -1790,6 +1806,7 @@ agentnum, beginning, and ending
 
 =cut
 
+#shit, all sorts of false laxiness w/report_newtax.cgi
 sub generate_liability_report {
   my %args = @_;
 
@@ -1881,8 +1898,7 @@ sub generate_liability_report {
       my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
         "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
 
-      my $sql = "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) ".
-                " $taxwhere AND cust_bill_pkg.pkgnum = 0";
+      my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
       my $x = &{$scalar_sql}($t, [ map { $_, $_ } @params ], $sql );
       $tax += $x;