projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nur die Lieferanten und Händler zurückliefern, die nicht 'ungültig' markiert sind.
[kivitendo-erp.git]
/
am.pl
diff --git
a/am.pl
b/am.pl
index
2860f61
..
2d16052
100755
(executable)
--- a/
am.pl
+++ b/
am.pl
@@
-31,7
+31,8
@@
#######################################################################
BEGIN {
#######################################################################
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
}
# setup defaults, DO NOT CHANGE
@@
-51,6
+52,7
@@
use SL::Form;
use SL::Locale;
eval { require "lx-erp.conf"; };
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";
require "bin/mozilla/common.pl";
@@
-76,6
+78,8
@@
$script =~ s/\.pl//;
# pull in DBI
use DBI;
# pull in DBI
use DBI;
+$form->{login} =~ s|.*/||;
+
# check for user config file, could be missing or ???
eval { require("$userspath/$form->{login}.conf"); };
if ($@) {
# check for user config file, could be missing or ???
eval { require("$userspath/$form->{login}.conf"); };
if ($@) {