projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
common.pl
diff --git
a/bin/mozilla/common.pl
b/bin/mozilla/common.pl
index
85fb3fb
..
82a988e
100644
(file)
--- a/
bin/mozilla/common.pl
+++ b/
bin/mozilla/common.pl
@@
-183,7
+183,7
@@
sub part_selection_internal {
my @header_sort = qw(partnumber description);
my %header_title = ( "partnumber" => $locale->text("Part Number"),
my @header_sort = qw(partnumber description);
my %header_title = ( "partnumber" => $locale->text("Part Number"),
- "description" => $locale->text("Part
d
escription"),
+ "description" => $locale->text("Part
D
escription"),
);
my @header =
);
my @header =
@@
-509,8
+509,6
@@
sub show_history {
# -------------------------------------------------------------------------
# -------------------------------------------------------------------------
-my %_called_subs = ();
-
sub call_sub {
$main::lxdebug->enter_sub();
sub call_sub {
$main::lxdebug->enter_sub();
@@
-529,8
+527,8
@@
sub call_sub {
$form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
}
$form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
}
- $
_
called_subs{$name}++;
-
# confess "RECURSION DETECTION: call_sub($name) called " . $_called_subs{$name} . " time(s)" if $_
called_subs{$name} > 10;
+ $
::
called_subs{$name}++;
+
confess "RECURSION DETECTION: call_sub($name) called " . $::called_subs{$name} . " time(s)" if $::
called_subs{$name} > 10;
{
no strict "refs";
{
no strict "refs";
@@
-729,4
+727,13
@@
sub gl_transaction {
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
+if ($::use_rdbo) {
+ eval {
+ require SL::DB::Helpers::Mappings;
+ sub db {
+ goto &SL::DB::Helpers::Mappings::db;
+ }
+ } or die $@;
+}
+
1;
1;