[freeside-commits] branch master updated. a0011bf5a1f1aa762b9abf7e61dd3b4cac985fa0

[Mark Wells]

The branch, master has been updated
       via  a0011bf5a1f1aa762b9abf7e61dd3b4cac985fa0 (commit)
      from  7badb86e945f91ea4e18c8f52054d30404a43f86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a0011bf5a1f1aa762b9abf7e61dd3b4cac985fa0
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Apr 2 11:55:39 2015 -0700

    fix bad merge

diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm
index 3b13510..99535ad 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;

-----------------------------------------------------------------------

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