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 3e0c7e0,d5ad88b..d6a51bc
--- 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 3d49885,b75dafc..3653891
--- 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 8b2b79a,f2db8f8..e4139ff
--- 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