From f609fce353fab43501bf8e3823c613562f29e18d Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Thu, 7 Jul 2016 19:09:27 -0500
Subject: [PATCH] RT#17599: display cancelled services from history
 [welcome_email sensitive to noexport_hack, v3 only]

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 74ddcd5c7..a86db9c0a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -738,7 +738,7 @@ sub insert {
 
     #welcome email
     my @welcome_exclude_svcparts = $conf->config('svc_acct_welcome_exclude');
-    unless ( grep { $_ eq $self->svcpart } @welcome_exclude_svcparts ) {
+    unless ($FS::svc_Common::noexport_hack or ( grep { $_ eq $self->svcpart } @welcome_exclude_svcparts )) {
         my $error = '';
         my $msgnum = $conf->config('welcome_msgnum', $agentnum);
         if ( $msgnum ) {
-- 
2.11.0