From a281af4caba53bfd4219bab5d07ce4153a83125a Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 26 Jun 2013 23:38:04 -0700
Subject: [PATCH] give supplemental packages the same location as their parent,
 #23748

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

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 8484df50e..152c496d1 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -183,7 +183,6 @@ sub order_pkg {
         'pkglinknum'    => $link->pkglinknum,
         'custnum'       => $self->custnum,
         'main_pkgnum'   => $cust_pkg->pkgnum,
-        'locationnum'   => $cust_pkg->locationnum,
         # try to prevent as many surprises as possible
         'pkgbatch'      => $cust_pkg->pkgbatch,
         'start_date'    => $cust_pkg->start_date,
@@ -196,7 +195,8 @@ sub order_pkg {
         'waive_setup'   => $cust_pkg->waive_setup,
         'allow_pkgpart' => $opt->{'allow_pkgpart'},
     });
-    $error = $self->order_pkg('cust_pkg' => $pkg);
+    $error = $self->order_pkg('cust_pkg' => $pkg,
+                              'locationnum' => $cust_pkg->locationnum);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "inserting supplemental package: $error";
-- 
2.11.0