X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Ffreeside_description_default.pm;fp=FS%2FFS%2Fcdr%2Ffreeside_description_default.pm;h=400c24b82a030646c513eba997935b0ee5a6ffb5;hb=0db33c9c112e7944fd022a423453aee48d9503b4;hp=bc4e89f544bc42ae66b05a0825a34b2ba38e2bab;hpb=5e9dda2c5757c63ac51f53e651977f7ea41006ed;p=freeside.git

diff --git a/FS/FS/cdr/freeside_description_default.pm b/FS/FS/cdr/freeside_description_default.pm
index bc4e89f54..400c24b82 100644
--- a/FS/FS/cdr/freeside_description_default.pm
+++ b/FS/FS/cdr/freeside_description_default.pm
@@ -27,7 +27,8 @@ use FS::cdr;
           $time =~ /^(\d{1,2}):(\d{1,2}):(\d{1,2}) (AM|PM)$/
             or die "unparsable time: $time"; #maybe we shouldn't die...
           my $hour = $1;
-          $hour += 12 if $4 eq 'PM';
+          $hour += 12 if $4 eq 'PM' && $hour != 12;
+          $hour = 0 if $4 eq 'AM' && $hour == 12;
           $cdr->startdate(
             timelocal($3, $2, $hour ,$tmp_mday, $tmp_mon, $tmp_year)
           );