Merge branch 'patch-18' of https://github.com/gjones2/Freeside

[freeside.git] / FS / FS / part_pkg_taxrate.pm

diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index fb1afce..c83f700 100644 (file)
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -292,7 +292,9 @@ sub batch_import {
                                                    time_zone => 'floating',
                                                  );
       my $dt = $parser->parse_datetime( $hash->{'effdate'} );
-      $hash->{'effdate'} = $dt ? $dt->epoch : '';
+      return "Can't parse effdate ". $hash->{'effdate'}. ': '. $parser->errstr
+        unless $dt;
+      $hash->{'effdate'} = $dt->epoch;
  
       $hash->{'country'} = 'US'; # CA is available
 
@@ -301,6 +303,13 @@ sub batch_import {
       if (exists($hash->{actionflag}) && $hash->{actionflag} eq 'D') {
         delete($hash->{actionflag});
 
+        foreach my $intfield (qw( taxproductnum taxclassnum effdate )) {
+          if ( $hash->{$intfield} eq '' ) {
+            return "$intfield is empty in search! -- ".
+                   join(" ", map { "$_ => *". $hash->{$_}. '*' } keys(%$hash) );
+          }
+        }
+
         my $part_pkg_taxrate = qsearchs('part_pkg_taxrate', $hash);
         unless ( $part_pkg_taxrate ) {
           if ( $hash->{taxproductnum} ) {
@@ -375,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);