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

[mfinanz.git] / config / lx-erp.conf.default

diff --git a/config/lx-erp.conf.default b/config/lx-erp.conf.default
index 8e7280d10e27ce632ba4a9c3099dbaba11bb7e33..6b3b80fff78d232d786da54fd7f83af94c136fd2 100644 (file)
--- a/config/lx-erp.conf.default
+++ b/config/lx-erp.conf.default
@@ -2,7 +2,7 @@ use Cwd;
 
 use vars qw($dbcharset $eur $ghostscript_bin $html2ps_bin $language $latex_bin $latex_templates $lizenzen $memberfile
             $opendocument_templates $openofficeorg_daemon $openofficeorg_daemon_port $openofficeorg_writer_bin
-            $pg_dump_exe $pg_restore_exe $sendmail $sid $spool $templates $userspath $vertreter $webdav $xvfb_bin);
+            $pg_dump_exe $pg_restore_exe $sendmail $show_best_before $sid $spool $templates $userspath $vertreter $webdav $xvfb_bin);
 
 # path to user configuration files
 $userspath = "users";
@@ -43,6 +43,9 @@ $webdav = 0;
 $lizenzen = 1;
 $vertreter = 0;
 
+# Zeige Felder für Mindesthaltbarkeitsdatum
+$show_best_before = 0;
+
 ## Support fuer OpenDocument-Vorlagen
 # Diese Option legt fest, ob OpenDocument-Vorlagen generell verfuegbar sind.
 $opendocument_templates = 1;
@@ -96,6 +99,8 @@ $pg_restore_exe = "pg_restore";
 # LXDebug::QUERY  - SQL Queries
 # LXDebug::TRACE  - Tracing von Funktionsaufrufen
 # LXDebug::BACKTRACE_ON_ERROR - Vollständiger Aufrufpfad, wenn $form->error() aufgerufen wird
+# LXDebug::REQUEST_TIMER - Timing von Requests loggen
+# LXDebug::WARN - warnings
 # LXDebug::ALL    - alle Debugausgaben
 #
 # LXDebug::DEVEL  - wie INFO | QUERY | TRACE | BACKTRACE_ON_ERROR