X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTaxEngine%2Finternal.pm;h=df2d6095678a8e3ece065d31e64aa333488d8463;hb=94c7f944bc5836e071ff3484cbba7e5b94e075a3;hp=91b547ce0875f4c87ce63453ed81b7754cf0b786;hpb=194c16bf0af62048d118ad28e55f5e1eb5d92ffa;p=freeside.git

diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm
index 91b547ce0..df2d60956 100644
--- a/FS/FS/TaxEngine/internal.pm
+++ b/FS/FS/TaxEngine/internal.pm
@@ -28,8 +28,10 @@ sub add_sale {
 
   push @{ $self->{items} }, $cust_bill_pkg;
 
-  my @loc_keys = qw( district city county state country );
-  my %taxhash = map { $_ => $location->get($_) } @loc_keys;
+  my %taxhash = map { $_ => $location->get($_) }
+                qw( district county state country );
+  # city names in cust_main_county are uppercase
+  $taxhash{'city'} = uc($location->get('city'));
 
   $taxhash{'taxclass'} = $part_item->taxclass;
 
@@ -66,7 +68,7 @@ sub taxline {
   my $taxnum = $tax_object->taxnum;
   my $exemptions = $self->{exemptions}->{$taxnum} ||= [];
   
-  my $taxable_cents = 0;
+  my $taxable_total = 0;
   my $tax_cents = 0;
 
   my $round_per_line_item = $conf->exists('tax-round_per_line_item');
@@ -98,8 +100,6 @@ sub taxline {
 
   foreach my $cust_bill_pkg (@$taxables) {
 
-    my $cust_pkg  = $cust_bill_pkg->cust_pkg;
-    my $part_pkg  = $cust_bill_pkg->part_pkg;
     my @new_exemptions;
     my $taxable_charged = $cust_bill_pkg->setup + $cust_bill_pkg->recur
       or next; # don't create zero-amount exemptions
@@ -123,25 +123,28 @@ sub taxline {
       $taxable_charged = 0;
 
     }
+    
+    if ( my $part_pkg = $cust_bill_pkg->part_pkg ) {
 
-    if ( ($part_pkg->setuptax eq 'Y' or $tax_object->setuptax eq 'Y')
-        and $cust_bill_pkg->setup > 0 and $taxable_charged > 0 ) {
+      if ( ($part_pkg->setuptax eq 'Y' or $tax_object->setuptax eq 'Y')
+          and $cust_bill_pkg->setup > 0 and $taxable_charged > 0 ) {
 
-      push @new_exemptions, FS::cust_tax_exempt_pkg->new({
-          amount => $cust_bill_pkg->setup,
-          exempt_setup => 'Y'
-      });
-      $taxable_charged -= $cust_bill_pkg->setup;
+        push @new_exemptions, FS::cust_tax_exempt_pkg->new({
+            amount => $cust_bill_pkg->setup,
+            exempt_setup => 'Y'
+        });
+        $taxable_charged -= $cust_bill_pkg->setup;
+      }
 
-    }
-    if ( ($part_pkg->recurtax eq 'Y' or $tax_object->recurtax eq 'Y')
-        and $cust_bill_pkg->recur > 0 and $taxable_charged > 0 ) {
+      if ( ($part_pkg->recurtax eq 'Y' or $tax_object->recurtax eq 'Y')
+          and $cust_bill_pkg->recur > 0 and $taxable_charged > 0 ) {
 
-      push @new_exemptions, FS::cust_tax_exempt_pkg->new({
-          amount => $cust_bill_pkg->recur,
-          exempt_recur => 'Y'
-      });
-       $taxable_charged -= $cust_bill_pkg->recur;
+        push @new_exemptions, FS::cust_tax_exempt_pkg->new({
+            amount => $cust_bill_pkg->recur,
+            exempt_recur => 'Y'
+        });
+        $taxable_charged -= $cust_bill_pkg->recur;
+      }
 
     }
 
@@ -243,7 +246,6 @@ sub taxline {
               exempt_monthly  => 'Y',
               year            => $year,
               month           => $mon,
-              taxnum          => $tax_object->taxnum,
             });
 
           $taxable_charged -= $addl;
@@ -262,6 +264,8 @@ sub taxline {
     # attach them to the line item
     foreach my $ex (@new_exemptions) {
 
+      $ex->set('taxnum', $taxnum);
+
       if ( $cust_bill_pkg->billpkgnum ) {
         # the exempted item is already inserted (it should be, these days) so
         # insert the exemption record now:
@@ -301,15 +305,17 @@ sub taxline {
     });
     push @tax_links, $location;
 
-    $taxable_cents += $taxable_charged;
+    $taxable_total += $taxable_charged;
     $tax_cents += $this_tax_cents;
   } #foreach $cust_bill_pkg
 
-  # calculate tax and rounding error for the whole group
-  my $extra_cents = sprintf('%.2f', $taxable_cents * $tax_object->tax / 100)
-                            * 100 - $tax_cents;
-  # make sure we have an integer
-  $extra_cents = sprintf('%.0f', $extra_cents);
+  # calculate tax and rounding error for the whole group: total taxable
+  # amount times tax rate (as cents per dollar), minus the tax already
+  # charged
+  # and force 0.5 to round up
+  my $extra_cents = sprintf('%.0f',
+    ($taxable_total * $tax_object->tax) - $tax_cents + 0.00000001
+  );
 
   # if we're rounding per item, then ignore that and don't distribute any
   # extra cents.