'accountcode', #customer
'src', #anumber
- 'dst', #bnumber
+ sub { my ($cdr, $dst) = @_; # Handling cosolidated local calls in the CDR formats
+
+ my $src = $cdr->src;
+
+ if ($dst =~ /^64\/U$/) {
+ $cdr->set('dst', $src);
+ } else {
+ $cdr->set('dst', $dst);
+ }
+ }, #bnumber
+
sub { my ($cdr, $calldate) = @_;
$cdr->set('calldate', $calldate);
=cut
sub set_auto_inventory {
+ # don't try to do this during an upgrade
+ return '' if $FS::CurrentUser::upgrade_hack;
+
my $self = shift;
my $old = @_ ? shift : '';
my $maxtype = $self->maxtype || 0;
if ($maxtype != 0 && $maxtype != 1
- && $maxtype != 14 && $maxtype != 15) {
+ && $maxtype != 14 && $maxtype != 15
+ && $maxtype != 18 # sigh
+ ) {
return $self->_fatal_or_null( 'tax with "'.
$self->maxtype_name. '" threshold'
);