[freeside-commits] branch FREESIDE_3_BRANCH updated. e6b4ecab0e62de9da1bae4df0216e1b547f77f3d

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  e6b4ecab0e62de9da1bae4df0216e1b547f77f3d (commit)
       via  1a896a3db22ff50712b055581bc8808c22848c29 (commit)
      from  ec8ee23d8ac9dfbf1be574e022f11b6b89085037 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e6b4ecab0e62de9da1bae4df0216e1b547f77f3d
Merge: 1a896a3 ec8ee23
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Nov 3 11:32:29 2016 -0700

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


commit 1a896a3db22ff50712b055581bc8808c22848c29
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Nov 3 11:32:02 2016 -0700

    fix adding a new location on a quotation (v3 fix), RT#73236

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 9f3d9e1..b1d0fe4 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -143,6 +143,8 @@ if ( $quotationnum ) {
   $quotation_pkg->quotationnum($quotationnum);
   $quotation_pkg->prospectnum($prospect_main->prospectnum) if $prospect_main;
 
+  my %opt = ();
+
   if ( $locationnum == -1 ) {
     my $cust_location = FS::cust_location->new({
       'custnum'     => $cust_main ? $cust_main->custnum : '',
@@ -155,7 +157,7 @@ if ( $quotationnum ) {
     $opt{'locationnum'} = $locationnum;
   }
 
-  $error = $quotation_pkg->insert || $quotation_pkg->estimate;
+  $error = $quotation_pkg->insert(%opt) || $quotation_pkg->estimate;
 
 } else {
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/process/quick-cust_pkg.cgi |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)