X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg_taxrate.pm;h=fb1afce185eec04eaf9f452b527bf3080d75848e;hb=387c96b0d8f224f3ade27bed9348f37b432bbb8a;hp=bc1047ee2860cc1b6ebc23ab0ff80a4431eaec49;hpb=ec71691725b6c5211b6967323cbc56a03038385d;p=freeside.git

diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index bc1047ee2..fb1afce18 100644
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -3,6 +3,8 @@ package FS::part_pkg_taxrate;
 use strict;
 use vars qw( @ISA );
 use Date::Parse;
+use DateTime;
+use DateTime::Format::Strptime;
 use FS::UID qw(dbh);
 use FS::Record qw( qsearch qsearchs );
 use FS::part_pkg_taxproduct;
@@ -181,7 +183,7 @@ sub batch_import {
   if ( $format eq 'cch-fixed' || $format eq 'cch-fixed-update' ) {
     $format =~ s/-fixed//;
     my $date_format = sub { my $r='';
-                            /^(\d{4})(\d{2})(\d{2})$/ && ($r="$1/$2/$3");
+                            /^(\d{4})(\d{2})(\d{2})$/ && ($r="$3/$2/$1");
                             $r;
                           };
     $column_callbacks[16] = $date_format;
@@ -286,10 +288,15 @@ sub batch_import {
         delete($hash->{$_}) foreach @{$map{$item}};
       }
 
-      $hash->{'effdate'} = str2time($hash->{'effdate'});
+      my $parser = new DateTime::Format::Strptime( pattern => "%m/%d/%Y",
+                                                   time_zone => 'floating',
+                                                 );
+      my $dt = $parser->parse_datetime( $hash->{'effdate'} );
+      $hash->{'effdate'} = $dt ? $dt->epoch : '';
+ 
       $hash->{'country'} = 'US'; # CA is available
 
-      delete($hash->{'taxable'}) if ($hash->{'taxable'} eq 'N');
+      $hash->{'taxable'} = '' if ($hash->{'taxable'} eq 'N');
 
       if (exists($hash->{actionflag}) && $hash->{actionflag} eq 'D') {
         delete($hash->{actionflag});