Merge branch 'master' into after-262

Conflicts:
	DEBIAN/DEBIAN/postinst
	DEBIAN/mk_erp_deb.sh
	config/lx-erp.conf
	config/lx-erp.conf.default
	doc/INSTALL.txt
	locale/de_DE/all

diff --cc DEBIAN/DEBIAN/postinst
index 9d17536,0e0da13..02f5ac9
--- 1/DEBIAN/DEBIAN/postinst
--- 2/DEBIAN/DEBIAN/postinst
+++ b/DEBIAN/DEBIAN/postinst
@@@ -124,11 -115,11 +115,11 @@@ set_lx_office_erp_authentication_db_use
  set_user_rights() {
        chown -R www-data:www-data /usr/lib/lx-office-erp/users
        chown -R www-data:www-data /usr/lib/lx-office-erp/templates
-     chown www-data:www-data /etc/lx-office-erp/lx_office.conf
-     chown www-data:www-data /usr/lib/lx-office-erp/menu.ini
-     chown www-data:www-data /etc/lx-office-erp/authentication.pl
-     chmod 0600 /etc/lx-office-erp/lx_office.conf
-     chmod 0600 /etc/lx-office-erp/authentication.pl
 -      chown www-data:www-data /etc/lx-office-erp/lx-erp.conf
++      chown www-data:www-data /etc/lx-office-erp/lx_office.conf
+       chown www-data:www-data /usr/lib/lx-office-erp/menu.ini
+       chown www-data:www-data /etc/lx-office-erp/authentication.pl
 -      chmod 0600 /etc/lx-office-erp/lx-erp.conf
++      chmod 0600 /etc/lx-office-erp/lx_office.conf
+       chmod 0600 /etc/lx-office-erp/authentication.pl
  }
  
  disable_ipv6_on_lo_interface() {

diff --cc DEBIAN/mk_erp_deb.sh
Simple merge

diff --cc SL/DB/Object.pm
Simple merge

diff --cc SL/Dispatcher.pm
index d31fa9b,2f23952..f22cf0e
--- 1/SL/Dispatcher.pm
--- 2/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@@ -15,11 -12,10 +14,11 @@@ use Encode
  use English qw(-no_match_vars);
  use SL::Auth;
  use SL::LXDebug;
 +use SL::LxOfficeConf;
  use SL::Locale;
  use SL::Common;
+ use SL::Form;
  use SL::Helper::DateTime;
- use Form;
  use List::Util qw(first);
  use File::Basename;
  

diff --cc SL/Form.pm
Simple merge

diff --cc SL/IS.pm
Simple merge

diff --cc SL/Template/LaTeX.pm
Simple merge

diff --cc bin/mozilla/do.pl
Simple merge

diff --cc bin/mozilla/wh.pl
Simple merge

diff --cc doc/INSTALL.texi
Simple merge

diff --cc doc/INSTALL.txt
Simple merge

diff --cc doc/INSTALL/Datenbanken-anlegen.html
Simple merge

diff --cc doc/INSTALL/OpenDocument_002dVorlagen.html
Simple merge

diff --cc locale/de/all
index 1904fa9,86ebdb2..36f20e0
--- 1/locale/de/all
--- 2/locale/de/all
+++ b/locale/de/all
@@@ -1703,11 -1682,9 +1703,11 @@@ $self->{texts} = 
    'The selected bin does not exist.' => 'Der ausgewählte Lagerplatz existiert nicht.',
    'The selected exports have been closed.' => 'Die ausgewählten Exporte wurden abgeschlossen.',
    'The selected warehouse does not exist.' => 'Das ausgewählte Lager existiert nicht.',
-   'The selected warehouse is empty.' => 'Das ausgewählte Lager ist leer.',
+   'The selected warehouse is empty, or no stocked items where found that match the filter settings.' => 'Das ausgewählte Lager ist leer, oder in ihm wurden keine zu den Sucheinstellungen passenden eingelagerten Artikel gefunden.',
    'The session is invalid or has expired.' => 'Sie sind von Lx-Office abgemeldet.',
 +  'The settings were saved, but the password was not changed.' => 'Die Einstellungen wurden gespeichert, aber das Passwort wurde nicht geändert.',
    'The source warehouse does not contain any bins.' => 'Das Quelllager enthält keine Lagerplätze.',
 +  'The start date is missing.'  => 'Das Startdatum fehlt.',
    'The subject is missing.'     => 'Der Betreff fehlt.',
    'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' => 'Die Tabellen zum Speichern der Benutzerdaten und zur Benutzerauthentifizierung wurden nicht gefunden. Sie werden in der folgenden Datenbank angelegt:',
    'The tabulator character'     => 'Das Tabulator-Symbol',

diff --cc locale/de_DE/all
Simple merge