From: C. Braun Date: Fri, 13 May 2011 12:49:10 +0000 (+0200) Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.3~25^2~37 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/dd0ba7b9a6f931ce13ced906d9cc6cb3e7c3ea3a?hp=b11e580342078c2b1537ccfb714f0b27ae044a0f Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp --- diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 70e020fcc..2acf9fe8d 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -393,9 +393,8 @@ sub form_header { : ($creditwarning) ? "alert('$credittext')" : ""; - $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; - $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; - $TMPL_VAR{onload} = $onload; + $TMPL_VAR{dateformat} = $myconfig{dateformat}; + $TMPL_VAR{numberformat} = $myconfig{numberformat}; if ($form->{type} eq 'sales_order') { if (!$form->{periodic_invoices_config}) { diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html index c07cd5971..a04676141 100644 --- a/templates/webpages/oe/form_header.html +++ b/templates/webpages/oe/form_header.html @@ -2,7 +2,7 @@ [%- USE HTML %] [%- USE LxERP %] [%- USE L %] - +
@@ -243,5 +243,10 @@