[freeside-commits] branch master updated. 2e55db01a7c8990957256d959911312eadc33255

[Ivan Kohler]

The branch, master has been updated
       via  2e55db01a7c8990957256d959911312eadc33255 (commit)
      from  73689cc60458a87931d2d3d304d650d69bcf690c (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 2e55db01a7c8990957256d959911312eadc33255
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 12 16:54:35 2018 -0800

    don't barf displaying invoices for location-less customers, RT#79312

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index b9f3e9274..88fd4e87f 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -657,10 +657,11 @@ sub print_generic {
   $invoice_data{'cid'} = $params{'cid'}
     if $params{'cid'};
 
-  if ( $cust_main->country eq $countrydefault ) {
-    $invoice_data{'country'} = '';
-  } else {
+  if ( $cust_main->bill_locationnum
+       && $cust_main->bill_location->country ne $countrydefault ) {
     $invoice_data{'country'} = &$escape_function($cust_main->bill_country_full);
+  } else {
+    $invoice_data{'country'} = '';
   }
 
   my @address = ();

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

Summary of changes:
 FS/FS/Template_Mixin.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)