From b587f4775b0ac6eecd6bdeec921fe0bbd4e8720a Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 9 Jan 2017 18:17:29 -0800
Subject: [PATCH] fix "unable to transfer all services" error when changing a
 package before it is billed, RT#73377

---
 FS/FS/cust_pkg.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b491f9192..48e42634b 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -4402,8 +4402,10 @@ sub transfer {
     $target{$pkg_svc->svcpart} = $pkg_svc->quantity * ( $dest->quantity || 1 );
   }
 
-  foreach my $cust_svc ($dest->cust_svc) {
-    $target{$cust_svc->svcpart}--;
+  unless ( $self->pkgnum == $dest->pkgnum ) {
+    foreach my $cust_svc ($dest->cust_svc) {
+      $target{$cust_svc->svcpart}--;
+    }
   }
 
   my %svcpart2svcparts = ();
-- 
2.20.1