From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 7 Nov 2016 20:41:30 +0000 (-0800)
Subject: fix quotation package locations reverting to customer default location on order,... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=16b368a256a6dde387221224464c6bf0bcda804e;p=freeside.git

fix quotation package locations reverting to customer default location on order, RT#73236
---

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 3920376b2..4c79c7d4c 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -155,7 +155,7 @@ sub order_pkg {
     }
     $cust_pkg->locationnum($opt->{'cust_location'}->locationnum);
 
-  } else {
+  } elsif ( ! $cust_pkg->locationnum ) {
 
     $cust_pkg->locationnum($self->ship_locationnum);