Merge branch 'master' of lx-office.linet-services.de:lx-office-erp

diff --combined bin/mozilla/oe.pl
index 0e944e9b790a02cbe77657b591fd0353340d8925,2acf9fe8dce32cb50d35a662664412d1f0714df3..5b1bc51d03ac17853b1e61127971f2bdbef73fea
--- 1/bin/mozilla/oe.pl
--- 2/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@@ -393,9 -393,8 +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}) {
@@@ -702,7 -701,7 +701,7 @@@ sub search 
  
    print $form->parse_html_template('oe/search', {
      %myconfig,
 -    is_order => $form->{type} =~ /_order/,
 +    is_order => scalar($form->{type} =~ /_order/),
    });
  
    $main::lxdebug->leave_sub();