From 49cacb5122d8daacd41903d709681901501be0e5 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 1 Nov 2016 16:20:01 -0700 Subject: fix adding a new location on a quotation, RT#73236 --- FS/FS/quotation_pkg.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'FS') diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm index 9854c4594..3f6742c79 100644 --- a/FS/FS/quotation_pkg.pm +++ b/FS/FS/quotation_pkg.pm @@ -121,6 +121,22 @@ sub insert { my $oldAutoCommit = $FS::UID::AutoCommit; local $FS::UID::AutoCommit = 0; + #false laziness w/cust_main::Packages::order_pkg + if ( $options{'locationnum'} and $options{'locationnum'} != -1 ) { + + $self->locationnum($options{'locationnum'}); + + } elsif ( $options{'cust_location'} ) { + + my $error = $options{'cust_location'}->find_or_insert; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return "inserting cust_location (transaction rolled back): $error"; + } + $self->locationnum($options{'cust_location'}->locationnum); + + } + my $error = $self->SUPER::insert; if ( !$error and ($self->setup_discountnum || $self->recur_discountnum) ) { -- cgit v1.2.1