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

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 9e21dd2b0..3f4792e1a 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);