projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correctly choose a default locationnum for prospects, #32489, #25343
[freeside.git]
/
FS
/
FS
/
quotation_pkg.pm
diff --git
a/FS/FS/quotation_pkg.pm
b/FS/FS/quotation_pkg.pm
index
dae459e
..
dcd68c9
100644
(file)
--- a/
FS/FS/quotation_pkg.pm
+++ b/
FS/FS/quotation_pkg.pm
@@
-199,7
+199,11
@@
sub check {
if ($quotation->custnum) {
$self->set('locationnum', $quotation->cust_main->ship_locationnum);
} elsif ($quotation->prospectnum) {
if ($quotation->custnum) {
$self->set('locationnum', $quotation->cust_main->ship_locationnum);
} elsif ($quotation->prospectnum) {
- $self->set('locationnum', $quotation->prospect_main->locationnum);
+ # use the first non-disabled location for that prospect
+ my $cust_location = qsearchs('cust_location',
+ { prospectnum => $quotation->prospectnum,
+ disabled => '' });
+ $self->set('locationnum', $cust_location->locationnum) if $cust_location;
} # else the quotation is invalid
}
} # else the quotation is invalid
}