Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9a300cd..90256bd 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5426,7 +5426,7 @@ sub queueable_upgrade {
         local($import) = 1;#prevent automatic geocoding (need its own variable?)
 
         my $error = $record->replace;
-        die $error if $error;
+        die "Error replacing $table ".$record->get($record->primary_key).": $error" if $error;
       }
     }