From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 13 May 2011 13:35:34 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~35^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/27ae86579fb8833067e9d6c02cf5429d98b28449?ds=inline;hp=-c

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

27ae86579fb8833067e9d6c02cf5429d98b28449
diff --combined bin/mozilla/oe.pl
index 0e944e9b7,2acf9fe8d..5b1bc51d0
--- a/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();