Preisfaktoren könnten zwar über ihren Faktorwert in Rechnungen gespeichert werde...

[kivitendo-erp.git] / config / kivitendo.conf.default

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 382e565..0005aba 100644 (file)
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -65,23 +65,6 @@ bind_password =
 # and "en" (English, not perfect) are available.
 language = de
 
-# The database charset. Must match the encoding of the database cluster you want to
-# connect to. (Used on the shell command to create a database "pg_createcluster". Option "-e <encoding>".)
-dbcharset = UTF-8
-
-[features]
-# Activate certain optional features and modules.
-webdav = 0
-vertreter = 0
-
-## Pictures for parts
-# Show the picture in the part form
-parts_show_image = 1
-# Style the picture with the following CSS code:
-parts_image_css = border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;
-# Show the picture in the results when you search for parts
-parts_listing_images = 0
-
 [paths]
 # path to temporary files (must be writeable by the web server)
 userspath = users
@@ -132,13 +115,6 @@ latex = pdflatex
 # into binaries located in different locations than the main Python
 # binary.
 python_uno = python
-# Location of the two executables "pg_dump" and "pg_restore" used for
-# database backup and restoration from the admin section.  If
-# "pg_dump" or "pg_restore" is set to "DISABLED" then the
-# corresponding option (backup/restoration) will be hidden from the
-# admin section.
-pg_dump = pg_dump
-pg_restore = pg_restore
 
 [environment]
 # Add the following paths to the PATH environment variable.
@@ -166,7 +142,11 @@ openofficeorg_daemon = 1
 openofficeorg_daemon_port = 2002
 
 [task_server]
-# User name to use for database access
+# kivitendo client (either its name or its database ID) for database
+# access (both 'client' and 'login' are required)
+client =
+# kivitendo user (login) name to use for certain jobs (both 'client'
+# and 'login' are required)
 login =
 # Set to 1 for debug messages in /tmp/kivitendo-debug.log
 debug = 0
@@ -208,7 +188,10 @@ email_subject  = kivitendo self test report
 email_template = templates/mail/self_test/status_mail.txt
 
 [console]
-# autologin to use if none is given
+# Automatic login will only work if both "client" and "login" are
+# given.  "client" can be a client's database ID or its name. "login"
+# is simply a user's login name.
+client =
 login =
 
 # autorun lines will be executed after autologin.
@@ -227,8 +210,24 @@ log_file = /tmp/kivitendo_console_debug.log
 
 [testing]
 
-# autologin to use if none is given
-login = myxplace_standard
+# Several tests need a database they can alter data in freely. This
+# database will be dropped & created before any other test is run. The
+# following parameters must be given:
+[testing/database]
+host     = localhost
+port     = 5432
+db       =
+user     = postgres
+password =
+template = template1
+
+[devel]
+# Several settings related to the development of kivitendo.
+
+# "client" is used by several scripts (e.g. rose_auto_create_model.pl)
+# when they need access to the database. It can be either a client's
+# database ID or its name.
+client =
 
 [debug]
 # Use DBIx::Log4perl for logging DBI calls. The string LXDEBUGFILE