X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fspawn_oo.pl;h=d0e8f789cda8340c0d8a6880b6faa8f63af6df87;hb=56d0b88fb434343256ba3cda50534356f6c44493;hp=9e2f80739d989aacda1268df9f134af6c875fee4;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/scripts/spawn_oo.pl b/scripts/spawn_oo.pl
index 9e2f80739..d0e8f789c 100755
--- a/scripts/spawn_oo.pl
+++ b/scripts/spawn_oo.pl
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 
 BEGIN {
-  push(@INC, "modules");
+  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
 }
 
 use DBI;
@@ -12,23 +13,18 @@ use SL::LXDebug;
 use SL::Form;
 use SL::Template;
 
-$userspath  = "users";
-$templates  = "templates";
-$memberfile = "users/members";
 $sendmail   = "| /usr/sbin/sendmail -t";
 
 $| = 1;
 
 $lxdebug = LXDebug->new();
 
-require "lx-erp.conf";
-
 $form = new Form;
 $form->{"script"} = "oe.pl";
 
 $ENV{'HOME'} = getcwd() . "/$userspath";
 
-my $template = OpenDocumentTemplate->new("", $form, \%myconfig, $userspath);
+my $template = SL::Template::create(type => 'OpenDocument', file_name => '', form => $form, myconfig => \%myconfig, userspath => $userspath);
 
 if (@ARGV && ($ARGV[0] eq "-r")) {
   system("ps auxww | " .