[freeside-commits] branch master updated. f8eee0da9fb100baefa20fb8e4ef0e8a02c6382f

[Ivan]

The branch, master has been updated
       via  f8eee0da9fb100baefa20fb8e4ef0e8a02c6382f (commit)
      from  63da5ded686cf29353617d4c51385da4906b749b (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 f8eee0da9fb100baefa20fb8e4ef0e8a02c6382f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Nov 3 09:35:16 2017 -0700

    more v4 taxes vs. fees, RT#78395

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index a1762e4..e44a847 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -1189,9 +1189,12 @@ sub tax_location {
   if ( $self->pkgnum ) { # normal sales
     return $self->cust_pkg->tax_location;
   } elsif ( $self->feepart ) { # fees
-    my $custnum = $self->fee_origin->custnum;
-    if ( $custnum ) {
-      return FS::cust_main->by_key($custnum)->ship_location;
+    my $fee_origin = $self->fee_origin;
+    if ( $fee_origin ) {
+      my $custnum = $fee_origin->custnum;
+      if ( $custnum ) {
+        return FS::cust_main->by_key($custnum)->ship_location;
+      }
     }
   } else { # taxes
     return;

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

Summary of changes:
 FS/FS/cust_bill_pkg.pm |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)