[freeside-commits] branch master updated. 7792fb0d3dfa4e77f41b8055e96a8938153a7677

[Ivan]

The branch, master has been updated
       via  7792fb0d3dfa4e77f41b8055e96a8938153a7677 (commit)
      from  2ec6f6df3efd366cb3c3532714dfc93bfa6dcef9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7792fb0d3dfa4e77f41b8055e96a8938153a7677
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Aug 7 17:12:18 2012 -0700

    better debugging for CCH import failure, RT#18817

diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm
index 161a654..1a9bf5a 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 e29c3d0..c83f700 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 4f03969..bfec2c0 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 e9496e4..77cd5cb 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 1a6c47d..b4be8b9 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);

-----------------------------------------------------------------------

Summary of changes:
 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(-)