From ab83ed2eed479b689060e686098998df990dd140 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 10 Jan 2017 16:09:49 -0800
Subject: [PATCH] fix errors about expired cards from automatic encryption
 enabling, RT#74905, RT#74085

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

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 551f8b345..21dce1fda 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5790,6 +5790,12 @@ sub queueable_upgrade {
         if (!$record->custnum && $table eq 'cust_pay_pending') {
           $record->set('custnum_pending',1);
         }
+
+        local($ignore_expired_card) = 1;
+        local($ignore_banned_card) = 1;
+        local($skip_fuzzyfiles) = 1;
+        local($import) = 1;#prevent automatic geocoding (need its own variable?)
+
         my $error = $record->replace;
         die $error if $error;
       }
-- 
2.11.0