diff options
author | ivan <ivan> | 2011-03-13 03:49:25 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-03-13 03:49:25 +0000 |
commit | 4fee4d1074c4a0844292c2204bc0a849f9bf119c (patch) | |
tree | c17eaad8390e5ea337f83d434b5217c80f5dbe25 /FS/FS/cust_location.pm | |
parent | 080406e219b6c63d02bfda8abea33020c4265db1 (diff) |
better error message for no location_kind
Diffstat (limited to 'FS/FS/cust_location.pm')
-rw-r--r-- | FS/FS/cust_location.pm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index 60c0181..7d0ce1c 100644 --- a/FS/FS/cust_location.pm +++ b/FS/FS/cust_location.pm @@ -5,6 +5,7 @@ use base qw( FS::geocode_Mixin FS::Record ); use Locale::Country; use FS::UID qw( dbh ); use FS::Record qw( qsearch ); #qsearchs ); +use FS::Conf; use FS::prospect_main; use FS::cust_main; use FS::cust_main_county; @@ -134,6 +135,9 @@ sub check { || $self->ut_textn('state') || $self->ut_country('country') || $self->ut_zip('zip', $self->country) + || $self->ut_alphan('location_type') + || $self->ut_textn('location_number') + || $self->ut_enum('location_kind', [ '', 'R', 'B' ] ) || $self->ut_alphan('geocode') ; return $error if $error; @@ -141,6 +145,12 @@ sub check { return "No prospect or customer!" unless $self->prospectnum || $self->custnum; return "Prospect and customer!" if $self->prospectnum && $self->custnum; + my $conf = new FS::Conf; + return 'Location kind is required' + if $self->prospectnum + && $conf->exists('prospect_main-alt_address_format') + && ! $self->location_kind; + unless ( qsearch('cust_main_county', { 'country' => $self->country, 'state' => '', |