Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 3938d2a..9f3d9e1 100644 (file)
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -145,8 +145,8 @@ if ( $quotationnum ) {
 
   if ( $locationnum == -1 ) {
     my $cust_location = FS::cust_location->new({
-      'custnum'     => $custnum,
-      'prospectnum' => $prospectnum,
+      'custnum'     => $cust_main ? $cust_main->custnum : '',
+      'prospectnum' => $prospect_main ? $prospect_main->prospectnum : '',
       map { $_ => scalar($cgi->param($_)) }
         FS::cust_main->location_fields
     });