From 49a0b5d01cfa15be787539edfff5ba4875ca3c3e Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 9 Dec 2013 12:24:58 -0800
Subject: [PATCH]  fix 4.x upgrades of address-less customers, RT#24968

---
 FS/FS/cust_main/Location.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main/Location.pm b/FS/FS/cust_main/Location.pm
index 4bcffab41..4f382af43 100644
--- a/FS/FS/cust_main/Location.pm
+++ b/FS/FS/cust_main/Location.pm
@@ -158,7 +158,11 @@ sub _upgrade_data {
     }
   }
 
-  foreach my $cust_main (qsearch('cust_main', { bill_locationnum => '' })) {
+  foreach my $cust_main (qsearch('cust_main', {
+                           bill_locationnum => '',
+                           address1         => { op=>'!=', value=>'' },
+                        }))
+  {
     # Step 1: extract billing and service addresses into cust_location
     my $custnum = $cust_main->custnum;
     my $bill_location = FS::cust_location->new(
-- 
2.11.0