From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 12 Oct 2012 15:35:16 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~225
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/c42acfd52669057debdf6a3d4245492ef23384b7?ds=inline;hp=-c

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

c42acfd52669057debdf6a3d4245492ef23384b7
diff --combined config/kivitendo.conf.default
index 7a3ad7587,127eb3c56..5d6524bf8
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@@ -16,6 -16,10 +16,10 @@@ cookie_name = kivitendo_session_i
  # hours.
  session_timeout = 480
  
+ # The number of seconds to penalize failed login attempts. 0 disables
+ # it.
+ failed_login_penalty = 5
+ 
  [authentication/database]
  # Connection information for the database with the user and group
  # inforamtion.  This information is always needed, even if LDAP is
@@@ -90,7 -94,7 +94,7 @@@ parts_image_css = border:0;float:left;m
  parts_listing_images = 0
  
  # Should payments be changeable after posting (0 = never; 1 = every time; 2 = on the same day)
 -payments_changeable = 1
 +payments_changeable = 0
  
  [paths]
  # path to temporary files (must be writeable by the web server)
@@@ -212,15 -216,15 +216,15 @@@ email_template = templates/mail/self_te
  # you can enable this for each type of record independantly.
  
  # check when a sales invoice or a payment for a sales invoice is posted
 -check_on_sales_invoice = 0
 +check_on_sales_invoice = 1
  # check when a purchase invoice or a payment for a purchase invoice is posted
 -check_on_purchase_invoice = 0
 +check_on_purchase_invoice = 1
  # check when an ar transaction is posted
 -check_on_ar_transaction = 0
 +check_on_ar_transaction = 1
  # check when an ap transaction is posted
 -check_on_ap_transaction = 0
 +check_on_ap_transaction = 1
  # check when a gl transaction is posted
 -check_on_gl_transaction = 0
 +check_on_gl_transaction = 1
  
  # not implemented yet:
  #check_on_cash_and_receipt = 0
@@@ -248,7 -252,7 +252,7 @@@ log_file = /tmp/kivitendo_console_debug
  [testing]
  
  # autologin to use if none is given
 -login = demo
 +login = myxplace_standard
  
  [debug]
  # Use DBIx::Log4perl for logging DBI calls. The string LXDEBUGFILE