From a0011bf5a1f1aa762b9abf7e61dd3b4cac985fa0 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Thu, 2 Apr 2015 11:55:39 -0700
Subject: [PATCH] fix bad merge

---
 FS/FS/TaxEngine/internal.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm
index 3b13510b3..99535ad38 100644
--- a/FS/FS/TaxEngine/internal.pm
+++ b/FS/FS/TaxEngine/internal.pm
@@ -22,12 +22,10 @@ sub add_sale {
 
   push @{ $self->{items} }, $cust_bill_pkg;
 
-  my $location = $cust_pkg->tax_location; # cacheable?
-
   my @loc_keys = qw( district city county state country );
   my %taxhash = map { $_ => $location->get($_) } @loc_keys;
 
-  $taxhash{'taxclass'} = $part_pkg->taxclass;
+  $taxhash{'taxclass'} = $part_item->taxclass;
 
   my @taxes = (); # entries are cust_main_county objects
   my %taxhash_elim = %taxhash;
-- 
2.11.0