projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0171735
)
fix address2 in NENA2 export, #14049
author
Mark Wells
<mark@freeside.biz>
Mon, 15 Sep 2014 22:52:46 +0000
(15:52 -0700)
committer
Mark Wells
<mark@freeside.biz>
Mon, 15 Sep 2014 22:53:20 +0000
(15:53 -0700)
FS/FS/part_export/nena2.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/nena2.pm
b/FS/FS/part_export/nena2.pm
index
fa3597b
..
4d3f08f
100644
(file)
--- a/
FS/FS/part_export/nena2.pm
+++ b/
FS/FS/part_export/nena2.pm
@@
-169,15
+169,6
@@
my %function_code = (
);
sub immediate {
);
sub immediate {
- local $@;
- eval "use Geo::StreetAddress::US";
- if ($@) {
- if ($@ =~ /^Can't locate/) {
- return "Geo::StreetAddress::US must be installed to use the NENA2 export.";
- } else {
- die $@;
- }
- }
# validate some things
my ($self, $action, $svc) = @_;
# validate some things
my ($self, $action, $svc) = @_;
@@
-209,6
+200,15
@@
sub create_item {
}
sub data {
}
sub data {
+ local $@;
+ eval "use Geo::StreetAddress::US";
+ if ($@) {
+ if ($@ =~ /^Can't locate/) {
+ return "Geo::StreetAddress::US must be installed to use the NENA2 export.";
+ } else {
+ die $@;
+ }
+ }
# generate the entire record here. reconciliation of multiple updates to
# the same service can be done at process time.
my $self = shift;
# generate the entire record here. reconciliation of multiple updates to
# the same service can be done at process time.
my $self = shift;
@@
-259,7
+259,6
@@
sub data {
} else {
$hash{location} = $cust_location->address2;
}
} else {
$hash{location} = $cust_location->address2;
}
- $hash{location} = $location_hash->{address2};
# customer name and class
$hash{customer_name} = $svc->phone_name_or_cust;
# customer name and class
$hash{customer_name} = $svc->phone_name_or_cust;