projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc04f43
)
fix tax-ship_address config w/geocode and thus cch, RT#10376
author
ivan
<ivan>
Sun, 31 Oct 2010 01:07:52 +0000
(
01:07
+0000)
committer
ivan
<ivan>
Sun, 31 Oct 2010 01:07:52 +0000
(
01:07
+0000)
FS/FS/geocode_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/geocode_Mixin.pm
b/FS/FS/geocode_Mixin.pm
index
cf45a92
..
c153914
100644
(file)
--- a/
FS/FS/geocode_Mixin.pm
+++ b/
FS/FS/geocode_Mixin.pm
@@
-5,6
+5,7
@@
use vars qw( $DEBUG $me );
use Carp;
use Locale::Country;
use FS::Record qw( qsearchs qsearch );
use Carp;
use Locale::Country;
use FS::Record qw( qsearchs qsearch );
+use FS::Conf;
use FS::cust_pkg;
use FS::cust_location;
use FS::cust_tax_location;
use FS::cust_pkg;
use FS::cust_location;
use FS::cust_tax_location;
@@
-82,7
+83,7
@@
sub location_label {
my $ds = $opt{double_space} || ' ';
my $line = '';
my $cydefault =
my $ds = $opt{double_space} || ' ';
my $line = '';
my $cydefault =
- $opt{'countrydefault'} || FS::
c
onf->new->config('countrydefault') || 'US';
+ $opt{'countrydefault'} || FS::
C
onf->new->config('countrydefault') || 'US';
my $prefix = $self->has_ship_address ? 'ship_' : '';
my $notfirst = 0;
my $prefix = $self->has_ship_address ? 'ship_' : '';
my $notfirst = 0;
@@
-122,7
+123,7
@@
sub geocode {
return $geocode if $geocode;
my $prefix =
return $geocode if $geocode;
my $prefix =
- ( FS::
c
onf->new->exists('tax-ship_address') && $self->has_ship_address )
+ ( FS::
C
onf->new->exists('tax-ship_address') && $self->has_ship_address )
? 'ship_'
: '';
? 'ship_'
: '';