projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix UI for package editing w/recur_show_zero, add setup_show_zero, RT#9777
[freeside.git]
/
FS
/
FS
/
cdr.pm
diff --git
a/FS/FS/cdr.pm
b/FS/FS/cdr.pm
index
65ca50b
..
36721a8
100644
(file)
--- a/
FS/FS/cdr.pm
+++ b/
FS/FS/cdr.pm
@@
-541,6
+541,10
@@
my %export_names = (
'name' => 'Default plus accountcode',
'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price',
},
'name' => 'Default plus accountcode',
'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price',
},
+ 'description_default' => {
+ 'name' => 'Default with description field as destination',
+ 'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price',
+ },
);
my %export_formats = ();
);
my %export_formats = ();
@@
-556,11
+560,11
@@
sub export_formats {
my $duration_sub = sub {
my($cdr, %opt) = @_;
my $sec = $opt{seconds} || $cdr->billsec;
my $duration_sub = sub {
my($cdr, %opt) = @_;
my $sec = $opt{seconds} || $cdr->billsec;
- if (
length($opt{granularity})
&&
+ if (
defined $opt{granularity}
&&
$opt{granularity} == 0 ) { #per call
return '1 call';
}
$opt{granularity} == 0 ) { #per call
return '1 call';
}
- elsif ( $opt{granularity} == 60 ) {#full minutes
+ elsif (
defined $opt{granularity} &&
$opt{granularity} == 60 ) {#full minutes
my $min = int($sec/60);
$min++ if $sec%60;
return $min.'m';
my $min = int($sec/60);
$min++ if $sec%60;
return $min.'m';
@@
-616,7
+620,10
@@
sub export_formats {
$duration_sub,
#PRICE
$duration_sub,
#PRICE
- sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; },
+ sub { my($cdr, %opt) = @_;
+ $opt{charge} = '0.00' unless defined $opt{charge};
+ $opt{money_char}.$opt{charge};
+ },
],
);
],
);
@@
-626,8
+633,13
@@
sub export_formats {
'accountcode',
@{ $export_formats{'default'} }[2..5],
];
'accountcode',
@{ $export_formats{'default'} }[2..5],
];
+ my @default = @{ $export_formats{'default'} };
+ $export_formats{'description_default'} =
+ [ 'src', @default[0..2],
+ sub { my($cdr, %opt) = @_; $cdr->description },
+ @default[4,5] ];
- %export_formats
+ return %export_formats;
}
sub downstream_csv {
}
sub downstream_csv {
@@
-651,6
+663,8
@@
sub downstream_csv {
}
@{ $formats{$format} };
}
@{ $formats{$format} };
+ return @columns if defined $opt{'keeparray'};
+
my $status = $csv->combine(@columns);
die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV"
unless $status;
my $status = $csv->combine(@columns);
die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV"
unless $status;
@@
-897,7
+911,7
@@
my %import_options = (
},
#drop the || 'csv' to allow auto xls for csv types?
},
#drop the || 'csv' to allow auto xls for csv types?
- 'format_types' => { map { $_ =>
( lc($cdr_info{$_}->{'type'}) || 'csv'
); }
+ 'format_types' => { map { $_ =>
lc($cdr_info{$_}->{'type'} || 'csv'
); }
keys %cdr_info
},
keys %cdr_info
},
@@
-934,6
+948,14
@@
sub batch_import {
my $iopt = _import_options;
$opt->{$_} = $iopt->{$_} foreach keys %$iopt;
my $iopt = _import_options;
$opt->{$_} = $iopt->{$_} foreach keys %$iopt;
+ if ( defined $opt->{'cdrtypenum'} ) {
+ $opt->{'preinsert_callback'} = sub {
+ my($record,$param) = (shift,shift);
+ $record->cdrtypenum($opt->{'cdrtypenum'});
+ '';
+ };
+ }
+
FS::Record::batch_import( $opt );
}
FS::Record::batch_import( $opt );
}