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 'b-3.6.1' of ../kivitendo-erp_20220811
[kivitendo-erp.git]
/
SL
/
Controller
/
Mebil.pm
diff --git
a/SL/Controller/Mebil.pm
b/SL/Controller/Mebil.pm
index
03a8917
..
99e20ff
100644
(file)
--- a/
SL/Controller/Mebil.pm
+++ b/
SL/Controller/Mebil.pm
@@
-51,10
+51,9
@@
sub action_showmap {
$::lxdebug->enter_sub;
my ($self) = @_;
$::lxdebug->enter_sub;
my ($self) = @_;
- # call model
+ # call model
-> diese Zeile ist fraglich, war ein Konflikt
$self->{data} = DB::MebilMapping::getMappings($::form->get_standard_dbh);
$self->{data} = DB::MebilMapping::getMappings($::form->get_standard_dbh);
-
$::form->{title} = $::locale->text('Mebil Map');
my $sql = "SELECT fromacc,typ,toacc from mebil_mapping order by ordering";
$::form->{title} = $::locale->text('Mebil Map');
my $sql = "SELECT fromacc,typ,toacc from mebil_mapping order by ordering";