Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

[kivitendo-erp.git] / scripts / spawn_oo.pl

diff --git a/scripts/spawn_oo.pl b/scripts/spawn_oo.pl
index 387961e..26991f1 100755 (executable)
--- a/scripts/spawn_oo.pl
+++ b/scripts/spawn_oo.pl
@@ -1,5 +1,10 @@
 #!/usr/bin/perl
 
+BEGIN {
+  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;
 use Data::Dumper;
 
@@ -21,12 +26,10 @@ require "lx-erp.conf";
 
 $form = new Form;
 $form->{"script"} = "oe.pl";
-$form->{"path"} = "bin/mozilla";
-
 
 $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 | " .