From 7792fb0d3dfa4e77f41b8055e96a8938153a7677 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 7 Aug 2012 17:12:18 -0700
Subject: [PATCH] better debugging for CCH import failure, RT#18817

---
 FS/FS/cust_tax_location.pm | 2 +-
 FS/FS/part_pkg_taxrate.pm  | 2 +-
 FS/FS/tax_class.pm         | 2 +-
 FS/FS/tax_rate.pm          | 2 +-
 FS/FS/tax_rate_location.pm | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm
index 161a6547b..1a9bf5a41 100644
--- a/FS/FS/cust_tax_location.pm
+++ b/FS/FS/cust_tax_location.pm
@@ -298,7 +298,7 @@ sub batch_import {
     }
     if ( scalar( @columns ) ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unexpected trailing columns in line (wrong format?): $line";
+      return "Unexpected trailing columns in line (wrong format?) importing cust_tax_location: $line";
     }
 
     my $error = &{$hook}(\%cust_tax_location);
diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index e29c3d0b4..c83f700d9 100644
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -384,7 +384,7 @@ sub batch_import {
     }
     if ( scalar( @columns ) ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unexpected trailing columns in line (wrong format?): $line";
+      return "Unexpected trailing columns in line (wrong format?) importing part_pkg_taxrate: $line";
     }
 
     my $error = &{$hook}(\%part_pkg_taxrate);
diff --git a/FS/FS/tax_class.pm b/FS/FS/tax_class.pm
index 4f0396982..bfec2c06c 100644
--- a/FS/FS/tax_class.pm
+++ b/FS/FS/tax_class.pm
@@ -339,7 +339,7 @@ sub batch_import {
     }
     if ( scalar( @columns ) ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unexpected trailing columns in line (wrong format?): $line";
+      return "Unexpected trailing columns in line (wrong format?) importing tax_class: $line";
     }
 
     my $error = &{$hook}(\%tax_class);
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index e9496e4f5..77cd5cb52 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -760,7 +760,7 @@ sub batch_import {
     }
     if ( scalar( @columns ) ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unexpected trailing columns in line (wrong format?): $line";
+      return "Unexpected trailing columns in line (wrong format?) importing tax_rate: $line";
     }
 
     my $error = &{$hook}(\%tax_rate);
diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
index 1a6c47dcf..b4be8b90e 100644
--- a/FS/FS/tax_rate_location.pm
+++ b/FS/FS/tax_rate_location.pm
@@ -301,7 +301,7 @@ sub batch_import {
     }
     if ( scalar( @columns ) ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unexpected trailing columns in line (wrong format?): $line";
+      return "Unexpected trailing columns in line (wrong format?) importing tax-rate_location: $line";
     }
 
     my $error = &{$hook}(\%tax_rate_location);
-- 
2.11.0