Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Conflicts:
	bin/mozilla/do.pl
	bin/mozilla/ir.pl
	bin/mozilla/oe.pl

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

diff --cc bin/mozilla/do.pl
index 3e0c7e0fea4eba1af083984480d0b8af49f04fe0,d5ad88ba8429edf7e0b41f5d5fd6cb710fb508ff..d6a51bc15447882d7f68fba17aaf8c3749562bc7
--- 1/bin/mozilla/do.pl
--- 2/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@@ -165,8 -165,7 +165,7 @@@ sub order_links 
    $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
  
    # retrieve order/quotation
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
-   $form->{jsscript} = 1;
  
    my $editing = $form->{id};
  

diff --cc bin/mozilla/ir.pl
index 3d498856cd5cbb8806e572b4b6e71a4b34bfa295,b75dafccdd03b2a9800ef3490d2a6b55bc3b2893..3653891f925c4f5b2fbc455cb010905e73d40be1
--- 1/bin/mozilla/ir.pl
--- 2/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@@ -101,8 -101,7 +101,7 @@@ sub invoice_links 
    $form->{vc} = 'vendor';
  
    # create links
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
-   $form->{jsscript} = 1;
  
    $form->create_links("AP", \%myconfig, "vendor");
  

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

diff --cc bin/mozilla/oe.pl
index 8b2b79a19dc993bf784bfb05b5bd653ab588a3b3,f2db8f8f488218ec5016a49168abadafa0098faf..e4139ff97c17aa5c171455649b271261a5c8a32b
--- 1/bin/mozilla/oe.pl
--- 2/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@@ -229,8 -229,7 +229,7 @@@ sub order_links 
    $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
  
    # retrieve order/quotation
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
-   $form->{jsscript} = 1;
  
    my $editing = $form->{id};
  

diff --cc locale/de/all
Simple merge