projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d602e55
)
pass format and correct filenames
author
jeff
<jeff>
Sun, 7 Mar 2010 18:07:03 +0000
(18:07 +0000)
committer
jeff
<jeff>
Sun, 7 Mar 2010 18:07:03 +0000
(18:07 +0000)
FS/FS/tax_rate.pm
patch
|
blob
|
history
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
351c3f7
..
9bcd697
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-959,9
+959,9
@@
sub _perform_batch_import {
unless $keep_cch_files;
push @insert_list, $name, $insertname, $import_sub, $format;
if ( $name eq 'GEOCODE' ) { #handle this whole ordering issue better
unless $keep_cch_files;
push @insert_list, $name, $insertname, $import_sub, $format;
if ( $name eq 'GEOCODE' ) { #handle this whole ordering issue better
- unshift @predelete_list, $name, $deletename, $import_sub;
+ unshift @predelete_list, $name, $deletename, $import_sub
, $format
;
} else {
} else {
- unshift @delete_list, $name, $deletename, $import_sub;
+ unshift @delete_list, $name, $deletename, $import_sub
, $format
;
}
} else {
}
} else {
@@
-1655,10
+1655,9
@@
sub process_download_and_update {
warn "processing $dir.new/$name.txt\n" if $DEBUG;
my $olddir = $update ? "$dir.1" : "";
$difffile = _perform_cch_diff( $name, "$dir.new", $olddir );
warn "processing $dir.new/$name.txt\n" if $DEBUG;
my $olddir = $update ? "$dir.1" : "";
$difffile = _perform_cch_diff( $name, "$dir.new", $olddir );
- } else {
- $difffile =~ s/^$cache_dir//;
- push @list, "${name}file:$difffile";
}
}
+ $difffile =~ s/^$cache_dir//;
+ push @list, "${name}file:$difffile";
}
# perform the import
}
# perform the import