From: Jan Büren <jan@lx-office-premium.de>
Date: Fri, 28 Jun 2013 10:00:01 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~252
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=891f62176912eb5c1e8864a1140635e4ad533d08;p=kivitendo-erp.git

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

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

891f62176912eb5c1e8864a1140635e4ad533d08
diff --cc bin/mozilla/do.pl
index 3e0c7e0fe,d5ad88ba8..d6a51bc15
--- a/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 3d498856c,b75dafccd..3653891f9
--- a/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/oe.pl
index 8b2b79a19,f2db8f8f4..e4139ff97
--- a/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};