Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/SL/Locale.pm b/SL/Locale.pm
index d6ac18157239733e8d08b135b4340e9b79ee4c6c..87008734a5c5ebfaef74d6bae97061d9e8c326d5 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -358,11 +358,7 @@ sub reformat_date {
     sprintf("%0" . (length($&)) . "d", $mm);
 
   $output_format =~ /y+/;
-  if (length($&) == 2) {
-    $yy -= $yy >= 2000 ? 2000 : 1900;
-  }
-  substr($output_format, $-[0], $+[0] - $-[0]) =
-    sprintf("%0" . (length($&)) . "d", $yy);
+  substr($output_format, $-[0], $+[0] - $-[0]) = $yy;
 
   $main::lxdebug->leave_sub();