[freeside-commits] freeside/FS/FS/cdr freeside_description_default.pm, 1.1.2.2, 1.1.2.3

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS/cdr
In directory wavetail.420.am:/tmp/cvs-serv15569/FS/FS/cdr

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	freeside_description_default.pm 
Log Message:
fix small bug in last commit for RT12078

Index: freeside_description_default.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr/freeside_description_default.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- freeside_description_default.pm	5 May 2011 00:53:42 -0000	1.1.2.2
+++ freeside_description_default.pm	5 May 2011 01:02:07 -0000	1.1.2.3
@@ -27,7 +27,8 @@
           $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)
           );