summaryrefslogtreecommitdiff
path: root/FS/FS/cdr
diff options
context:
space:
mode:
authorlevinse <levinse>2011-05-05 01:02:06 +0000
committerlevinse <levinse>2011-05-05 01:02:06 +0000
commit0db33c9c112e7944fd022a423453aee48d9503b4 (patch)
tree875c2ed636e9838cd1977b4aebc635bc2d38c540 /FS/FS/cdr
parent5e9dda2c5757c63ac51f53e651977f7ea41006ed (diff)
fix small bug in last commit for RT12078
Diffstat (limited to 'FS/FS/cdr')
-rw-r--r--FS/FS/cdr/freeside_description_default.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/FS/FS/cdr/freeside_description_default.pm b/FS/FS/cdr/freeside_description_default.pm
index bc4e89f..400c24b 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)
);