summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2016-11-01 16:21:00 -0700
committerIvan Kohler <ivan@freeside.biz>2016-11-01 16:21:00 -0700
commit569c8e243c450b46cc4d28d513a4e83d6128d03c (patch)
tree996c4d64cc95ffcb2348245491b09cee77269486 /FS
parentf54d295490980875e4762ee008b9de7c6471ec77 (diff)
fix adding a new location on a quotation, RT#73236
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/quotation_pkg.pm16
1 files changed, 16 insertions, 0 deletions
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) ) {