[freeside-commits] freeside/FS/FS tax_rate.pm,1.6,1.7

[Ivan,,,]

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

Modified Files:
	tax_rate.pm 
Log Message:
customer import: add progress bar & redirect to a search of the imported customers, #3475

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tax_rate.pm	23 Jul 2008 14:36:14 -0000	1.6
+++ tax_rate.pm	14 Aug 2008 11:44:51 -0000	1.7
@@ -719,7 +719,7 @@
 
 =item process_batch
 
-Load an batch import as a queued JSRPC job
+Load a batch import as a queued JSRPC job
 
 =cut
 
@@ -752,7 +752,7 @@
         $error = "No $name supplied";
         next;
       }
-      my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
+      my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc;
       my $filename = "$dir/".  $files{$file};
       open my $fh, "< $filename" or $error ||= "Can't open $name file: $!";
 
@@ -781,7 +781,7 @@
                  'PLUS4',    'plus4file', \&FS::cust_tax_location::batch_import,
                  'TXMATRIX', 'txmatrix',  \&FS::part_pkg_taxrate::batch_import,
                );
-    my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
+    my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc;
     while( scalar(@list) ) {
       my ($name, $file, $import_sub) = (shift @list, shift @list, shift @list);
       unless ($files{$file}) {