From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 13 Feb 2018 00:54:35 +0000 (-0800)
Subject: don't barf displaying invoices for location-less customers, RT#79312
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2e55db01a7c8990957256d959911312eadc33255;hp=73689cc60458a87931d2d3d304d650d69bcf690c

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 = ();