X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg_taxrate.pm;h=9e1c723d0dc61ce460b544d569a930ff1460f9e6;hb=2b8ffc98529637ffddfe7cbf6b4f9b8deb90f0fa;hp=6267d7a446708412cb00f11b58f9508c40be063a;hpb=8381e7232f90ac22b3f655cdccd0d39e2bde1d63;p=freeside.git diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm index 6267d7a44..9e1c723d0 100644 --- a/FS/FS/part_pkg_taxrate.pm +++ b/FS/FS/part_pkg_taxrate.pm @@ -6,6 +6,7 @@ use Date::Parse; use FS::UID qw(dbh); use FS::Record qw( qsearch qsearchs ); use FS::part_pkg_taxproduct; +use FS::Misc qw(csv_from_fixed); @ISA = qw(FS::Record); @@ -175,12 +176,25 @@ sub batch_import { my @fields; my $hook; + my @column_lengths = (); + my @column_callbacks = (); + if ( $format eq 'cch-fixed' || $format eq 'cch-fixed-update' ) { + $format =~ s/-fixed//; + my $date_format = sub { my $r=''; + /^(\d{4})(\d{2})(\d{2})$/ && ($r="$1/$2/$3"); + $r; + }; + $column_callbacks[16] = $date_format; + push @column_lengths, qw( 28 25 2 1 10 4 30 3 100 2 2 2 2 1 2 2 8 1 ); + push @column_lengths, 1 if $format eq 'cch-update'; + } + my $line; my ( $count, $last, $min_sec ) = (0, time, 5); #progressbar - if ( $job ) { - $count++ - while ( defined($line=<$fh>) ); - seek $fh, 0, 0; + if ( $job || scalar(@column_callbacks) ) { + my $error = + csv_from_fixed(\$fh, \$count, \@column_lengths, \@column_callbacks); + return $error if $error; } if ( $format eq 'cch' || $format eq 'cch-update' ) { @@ -230,7 +244,7 @@ sub batch_import { unless ($part_pkg_taxproduct) { return "Can't find part_pkg_taxproduct for txmatrix deletion: ". join(" ", map { "$_ => ". $hash->{$_} } @fields) - if $hash->{'actionflag'} eq 'D'; + if ($hash->{'actionfield'} && $hash->{'actionflag'} eq 'D'); $part_pkg_taxproduct{'description'} = join(' : ', (map{ $hash->{$_} } qw(groupdesc itemdesc)), @@ -265,7 +279,9 @@ sub batch_import { return "Can't find tax class for txmatrix deletion: ". join(" ", map { "$_ => ". $hash->{$_} } @fields) - if ($hash->{'actionflag'} eq 'D' && !$tax_class && $class ne ':'); + if ( $hash->{'actionflag'} && $hash->{'actionflag'} eq 'D' && + !$tax_class && $class ne ':' + ); delete($hash->{$_}) foreach @{$map{$item}}; }