[freeside-commits] branch master updated. 72b59219418476ef2fa42dac5456d736b76f5810

[Mark Wells]

The branch, master has been updated
       via  72b59219418476ef2fa42dac5456d736b76f5810 (commit)
      from  2124062154b8716e2d75264f9a6254b596052df6 (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 72b59219418476ef2fa42dac5456d736b76f5810
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Jan 27 13:03:56 2016 -0800

    fix incorrect merge, #39487

diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm
index d2a5d7f..4ca1ea8 100644
--- a/FS/FS/TaxEngine/internal.pm
+++ b/FS/FS/TaxEngine/internal.pm
@@ -266,7 +266,7 @@ sub taxline {
     $taxable_charged = sprintf( "%.2f", $taxable_charged);
     next if $taxable_charged == 0;
 
-    my $this_tax_cents = $taxable_charged * $self->tax;
+    my $this_tax_cents = $taxable_charged * $tax_object->tax;
     if ( $round_per_line_item ) {
       # Round the tax to the nearest cent for each line item, instead of
       # across the whole invoice.

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

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