X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=am.pl;h=2d1605253c6a4367cd8706a58d2e81af8bcd2ae7;hb=03b964b2afb0c72dd54688e08a6dda47a1bdfee9;hp=2860f61338ac4cfbd1a23d3ea8a2f6551f27d9cf;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/am.pl b/am.pl
index 2860f6133..2d1605253 100755
--- a/am.pl
+++ b/am.pl
@@ -31,7 +31,8 @@
 #######################################################################
 
 BEGIN {
-  push(@INC, "modules");
+  unshift @INC, "modules/YAML"; # Use our own version of YAML.
+  push @INC, "modules";         # Only use our own versions of modules if there's no system version.
 }
 
 # setup defaults, DO NOT CHANGE
@@ -51,6 +52,7 @@ use SL::Form;
 use SL::Locale;
 
 eval { require "lx-erp.conf"; };
+eval { require "lx-erp-local.conf"; } if -f "lx-erp-local.conf";
 
 require "bin/mozilla/common.pl";
 
@@ -76,6 +78,8 @@ $script =~ s/\.pl//;
 # pull in DBI
 use DBI;
 
+$form->{login} =~ s|.*/||;
+
 # check for user config file, could be missing or ???
 eval { require("$userspath/$form->{login}.conf"); };
 if ($@) {