Merge branch 'master' into bug1640

[mfinanz.git] / config / lx_office.conf.default

diff --git a/config/lx_office.conf.default b/config/lx_office.conf.default
index f1e7621c6cf6ddc166686b5173c82f88776a74fc..b0c3e66e5bf6199be4d8c162fe144e309d27782f 100644 (file)
--- a/config/lx_office.conf.default
+++ b/config/lx_office.conf.default
@@ -73,7 +73,6 @@ dbcharset = UTF-8
 [features]
 # Activate certain optional features and modules.
 webdav = 0
-lizenzen = 1
 vertreter = 0
 
 # Show fields used for the best before date
@@ -87,6 +86,9 @@ parts_image_css = border:0;float:left;max-width:250px;margin-top:20px:margin-rig
 # Show the picture in the results when you search for parts
 parts_listing_images = 0
 
+# Should payments be changeable after posting (0 = never; 1 = every time; 2 = on the same day)
+payments_changeable = 1
+
 [paths]
 # path to temporary files (must be writeable by the web server)
 userspath = users
@@ -232,5 +234,10 @@ show_debug_menu = 0
 # not removed and remain in the "users" directory.
 keep_temp_files = 0
 
+# Restart the FastCGI process if changes to the program or template
+# files have been detected. The restart will occur after the request
+# in which the changes have been detected has completed.
+restart_fcgi_process_on_changes = 0
+
 # The file name where the debug messages are written to.
 file_name = /tmp/lx-office-debug.log