[freeside-commits] freeside/FS/FS tax_rate.pm,1.29.2.6,1.29.2.7

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv18229

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	tax_rate.pm 
Log Message:
pass format and correct filenames

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -w -d -r1.29.2.6 -r1.29.2.7
--- tax_rate.pm	3 Mar 2010 01:40:12 -0000	1.29.2.6
+++ tax_rate.pm	7 Mar 2010 18:07:20 -0000	1.29.2.7
@@ -959,9 +959,9 @@
           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 {
-          unshift @delete_list, $name, $deletename, $import_sub;
+          unshift @delete_list, $name, $deletename, $import_sub, $format;
         }
 
       } else {
@@ -1655,11 +1655,10 @@
         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";
       }
-    }
 
     # perform the import
     local $keep_cch_files = 1;