summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorivan <ivan>2010-01-13 03:14:10 +0000
committerivan <ivan>2010-01-13 03:14:10 +0000
commitbab8e48b384a09adcba9be8a45359db979c9e83c (patch)
tree8e03210034d92fe89d62d0e91e6d72874d79a60b /FS
parentff1cf0181cf7c0d01e650e7c7b024385f6d0c4bf (diff)
if ignore_icalculable_taxes is on, don't call the errors fatal
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/tax_rate.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 101802bd5..30d7f58d0 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -481,16 +481,16 @@ sub _fatal_or_null {
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";
}
}