projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e9dda2
)
fix small bug in last commit for RT12078
author
levinse
<levinse>
Thu, 5 May 2011 01:02:06 +0000
(
01:02
+0000)
committer
levinse
<levinse>
Thu, 5 May 2011 01:02:06 +0000
(
01:02
+0000)
FS/FS/cdr/freeside_description_default.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cdr/freeside_description_default.pm
b/FS/FS/cdr/freeside_description_default.pm
index
bc4e89f
..
400c24b
100644
(file)
--- 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)
);