diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_bill_pkg_tax_location.pm | 6 | ||||
| -rw-r--r-- | FS/FS/cust_location.pm | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/FS/FS/cust_bill_pkg_tax_location.pm b/FS/FS/cust_bill_pkg_tax_location.pm index 723d6e0a3..140982e53 100644 --- a/FS/FS/cust_bill_pkg_tax_location.pm +++ b/FS/FS/cust_bill_pkg_tax_location.pm @@ -215,10 +215,8 @@ sub cust_credit_bill_pkg { sub cust_main_county { my $self = shift; - my $result; - if ( $self->taxtype eq 'FS::cust_main_county' ) { - $result = qsearchs( 'cust_main_county', { 'taxnum' => $self->taxnum } ); - } + return '' unless $self->taxtype eq 'FS::cust_main_county'; + qsearchs( 'cust_main_county', { 'taxnum' => $self->taxnum } ); } sub _upgrade_data { diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index b86529b3d..b25163f36 100644 --- a/FS/FS/cust_location.pm +++ b/FS/FS/cust_location.pm @@ -479,6 +479,20 @@ sub location_label { $prefix . $self->SUPER::location_label(%opt); } +=item county_state_county + +Returns a string consisting of just the county, state and country. + +=cut + +sub county_state_country { + my $self = shift; + my $label = $self->country; + $label = $self->state.", $label" if $self->state; + $label = $self->county." County, $label" if $self->county; + $label; +} + =back =head1 CLASS METHODS |