diff options
| author | Mark Wells <mark@freeside.biz> | 2013-10-04 16:24:42 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-10-04 16:24:42 -0700 |
| commit | c67b0f0200f3398fa0791722e79003054f0f7e8a (patch) | |
| tree | c670126f3d4f071f01a51df99d328fe841700e20 /FS/FS/cust_main_Mixin.pm | |
| parent | 3ff2bb841201faad63d0e61fe3a6fe76e2d18917 (diff) | |
fix some report column names/expressions, #940, #25161
Diffstat (limited to 'FS/FS/cust_main_Mixin.pm')
| -rw-r--r-- | FS/FS/cust_main_Mixin.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm index 212c04e0f..f584b415e 100644 --- a/FS/FS/cust_main_Mixin.pm +++ b/FS/FS/cust_main_Mixin.pm @@ -131,9 +131,12 @@ linked to a customer. sub country_full { my $self = shift; - $self->cust_linked - ? FS::cust_main::country_full($self) - : $self->cust_unlinked_msg; + if ( $self->locationnum ) { # cust_pkg has this + my $location = FS::cust_location->by_key($self->locationnum); + $location ? $location->country_full : ''; + } elsif ( $self->cust_linked ) { + $self->cust_main->bill_country_full; + } } =item invoicing_list_emailonly |