X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/d16e003e400bfad9e45acbf1fd0cee70dd68b848..646cb2aa3a79d7b35a1673fc67cdf802e9cba515:/SL/Locale.pm?ds=inline

diff --git a/SL/Locale.pm b/SL/Locale.pm
index a20620cdb..23a399e10 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -374,10 +374,23 @@ sub parse_date {
 }
 
 sub parse_date_to_object {
-  my $self           = shift;
-  my ($yy, $mm, $dd) = $self->parse_date(@_);
+  my ($self, $string, %params) = @_;
 
-  return $yy && $mm && $dd ? DateTime->new(year => $yy, month => $mm, day => $dd) : undef;
+  $params{dateformat}        ||= $::myconfig{dateformat}   || 'yy-mm-dd';
+  $params{numberformat}      ||= $::myconfig{numberformat} || '1,000.00';
+  my $num_separator            = $params{numberformat} =~ m{,\d+$} ? ',' : '.';
+
+  my ($date_str, $time_str)    = split m{\s+}, $string, 2;
+  my ($yy, $mm, $dd)           = $self->parse_date(\%params, $date_str);
+
+  my $millisecond              = 0;
+  my ($hour, $minute, $second) = split m/:/, $time_str;
+  ($second, $millisecond)      = split quotemeta($num_separator), $second, 2;
+  $millisecond                 = substr $millisecond, 0, 3;
+  $millisecond                .= '0' x (3 - length $millisecond);
+
+  return undef unless $yy && $mm && $dd;
+  return DateTime->new(year => $yy, month => $mm, day => $dd, hour => $hour * 1, minute => $minute * 1, second => $second * 1, nanosecond => $millisecond * 1000000);
 }
 
 sub format_date_object_to_time {
@@ -644,9 +657,14 @@ TODO: Describe new
 
 TODO: Describe parse_date
 
-=item C<parse_date_to_object>
+=item C<parse_date_to_object $string, %params>
+
+Parses a date and optional timestamp in C<$string> and returns an
+instance of L<DateTime>. The date and number formats used are the ones
+the user has currently selected. They can be overriden by passing them
+in as parameters to this function, though.
 
-TODO: Describe parse_date_to_object
+The time stamps can have up to millisecond precision.
 
 =item C<quote_special_chars>