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

diff --git a/SL/Template.pm b/SL/Template.pm
index 3ec7cd138d3487850f59353d532b03fa61eb1a8c..fe4b24893aa2ef84e505da043444add2657d4418 100644 (file)
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -501,7 +501,7 @@ sub _force_mandatory_packages {
   my (%used_packages, $document_start_line);
 
   foreach my $i (0 .. scalar @{ $lines } - 1) {
-    if ($lines->[$i] =~ m/\\usepackage[^{]*{(.*?)}/) {
+    if ($lines->[$i] =~ m/\\usepackage[^\{]*{(.*?)}/) {
       $used_packages{$1} = 1;
 
     } elsif ($lines->[$i] =~ m/\\begin{document}/) {

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 6ace578f27459f85b8a5e221629b186c8ee6e966..c8d7d6bb29e2b780176f34fdf8b8c0b1d74ed7a5 100644 (file)
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -364,6 +364,13 @@ sub format_dates {
                                  $dateformat, $longformat);
       }
     }
+    if (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY") {
+      for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
+        $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] =
+          $locale->reformat_date(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i],
+                                 $dateformat, $longformat);
+      }
+    }
   }
 
   $lxdebug->leave_sub();