[freeside-commits] freeside/FS/FS tax_rate.pm,1.29.2.3,1.29.2.4

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	tax_rate.pm 
Log Message:
if ignore_icalculable_taxes is on, don't call the errors fatal

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -d -r1.29.2.3 -r1.29.2.4
--- tax_rate.pm	30 Dec 2009 05:23:00 -0000	1.29.2.3
+++ tax_rate.pm	13 Jan 2010 03:14:10 -0000	1.29.2.4
@@ -481,16 +481,16 @@
 
   my $conf = new FS::Conf;
 
-  $error = "fatal: can't yet handle ". $error;
+  $error = "can't yet handle $error";
   my $name = $self->taxname;
   $name = 'Other surcharges'
     if ($self->passtype == 2);
 
   if ($conf->exists('ignore_incalculable_taxes')) {
-    warn $error;
+    warn "WARNING: $error; billing anyway per ignore_incalculable_taxes conf\n";
     return { name => $name, amount => 0 };
   } else {
-    return $error;
+    return "fatal: $error";
   }
 }