diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-04-25 17:41:57 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-04-25 17:41:57 -0700 |
| commit | 940da07a1b4a80bab5b2b9c9b893bfaa350bc32d (patch) | |
| tree | 145f4cb557cf166537c1364a690de7b41cad824d | |
| parent | 5dc6749d097b38cdbea09f9f38e48c1b33916020 (diff) | |
fix cust_main-require_address2 vs cust_location, RT#41184
| -rw-r--r-- | FS/FS/Conf.pm | 2 | ||||
| -rw-r--r-- | FS/FS/cust_location.pm | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 745315816..9a7558246 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -3282,7 +3282,7 @@ and customer address. Include units.', { 'key' => 'cust_main-require_address2', 'section' => 'UI', - 'description' => 'Second address field is required (on service address only, if billing and service addresses differ). Also enables "Unit" labeling of address2 on customer view and edit pages. Useful for multi-tenant applications. See also: address2-search', + 'description' => 'Second address field is required. Also enables "Unit" labeling of address2 on customer view and edit pages. Useful for multi-tenant applications. See also: address2-search', # service address only part not working in the modern world, see #41184 (on service address only, if billing and service addresses differ) 'type' => 'checkbox', }, diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index f38e8efcd..0dec065e6 100644 --- a/FS/FS/cust_location.pm +++ b/FS/FS/cust_location.pm @@ -381,10 +381,12 @@ sub check { $self->censustract("$1.$2"); } - if ( $conf->exists('cust_main-require_address2') and - !$self->ship_address2 =~ /\S/ ) { - return "Unit # is required"; - } + #yikes... this is ancient, pre-dates cust_location and will be harder to + # implement now... how do we know this location is a service location from + # here and not a billing? we can't just check locationnums, we might be new :/ + return "Unit # is required" + if $conf->exists('cust_main-require_address2') + && ! $self->address2 =~ /\S/; # tricky...we have to allow for the customer to not be inserted yet return "No prospect or customer!" unless $self->prospectnum |