diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/ConfDefaults.pm | 8 | ||||
| -rw-r--r-- | FS/FS/part_export/nena2.pm | 19 | ||||
| -rw-r--r-- | FS/FS/part_pkg/sqlradacct_hour.pm | 6 |
3 files changed, 16 insertions, 17 deletions
diff --git a/FS/FS/ConfDefaults.pm b/FS/FS/ConfDefaults.pm index c20a9c941..a66d0ab7c 100644 --- a/FS/FS/ConfDefaults.pm +++ b/FS/FS/ConfDefaults.pm @@ -33,10 +33,10 @@ sub cust_fields_avail { ( 'Cust# | Cust. Status | Customer' => 'custnum | Status | Last, First or Company (Last, First)', - 'Cust. Status | Day phone | Night phone | Mobile phone | Fax number' => - 'Status | (all phones)', - 'Cust# | Cust. Status | Day phone | Night phone | Mobile phone | Fax number' => - 'custnum | Status | (all phones)', + 'Customer | Day phone | Night phone | Mobile phone | Fax number' => + 'Customer | (all phones)', + 'Cust# | Customer | Day phone | Night phone | Mobile phone | Fax number' => + 'custnum | Customer | (all phones)', 'Cust. Status | Name | Company' => 'Status | Last, First | Company', diff --git a/FS/FS/part_export/nena2.pm b/FS/FS/part_export/nena2.pm index fa3597b7a..4d3f08f98 100644 --- a/FS/FS/part_export/nena2.pm +++ b/FS/FS/part_export/nena2.pm @@ -169,15 +169,6 @@ my %function_code = ( ); 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) = @_; @@ -209,6 +200,15 @@ sub create_item { } 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; @@ -259,7 +259,6 @@ sub data { } else { $hash{location} = $cust_location->address2; } - $hash{location} = $location_hash->{address2}; # customer name and class $hash{customer_name} = $svc->phone_name_or_cust; diff --git a/FS/FS/part_pkg/sqlradacct_hour.pm b/FS/FS/part_pkg/sqlradacct_hour.pm index 2f9d833d0..79e64fbab 100644 --- a/FS/FS/part_pkg/sqlradacct_hour.pm +++ b/FS/FS/part_pkg/sqlradacct_hour.pm @@ -138,15 +138,15 @@ sub calc_recur { if ( $self->option('recur_total_charge') > 0 ) { push @$details, - sprintf( "Last month's data %.1f %ss: %s", $total, BA, $totalcharge ); + sprintf( "Last month's data %.3f %ss: %s", $total, BA, $totalcharge ); } if ( $self->option('recur_input_charge') > 0 ) { push @$details, - sprintf( "Last month's download %.1f %ss: %s", $input, BA, $inputcharge ); + sprintf( "Last month's download %.3f %ss: %s", $input, BA, $inputcharge ); } if ( $self->option('recur_output_charge') > 0 ) { push @$details, - sprintf( "Last month's upload %.1f %ss: %s", $output, BA, $outputcharge ); + sprintf( "Last month's upload %.3f %ss: %s", $output, BA, $outputcharge ); } if ( $self->option('recur_hourly_charge') > 0 ) { push @$details, "Last month\'s time ". |