projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4fa31aa
)
SL::Form->get_lists für employees: Gelöschte nur auf Anfrage mitliefern
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Tue, 7 Jan 2014 13:11:35 +0000
(14:11 +0100)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Tue, 7 Jan 2014 13:11:35 +0000
(14:11 +0100)
Behebt #2116.
SL/Form.pm
patch
|
blob
|
history
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
f0500d3
..
e115f97
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-2137,10
+2137,22
@@
sub _get_taxzones {
sub _get_employees {
$main::lxdebug->enter_sub();
sub _get_employees {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $default_key, $key) = @_;
+ my ($self, $dbh, $params) = @_;
+
+ my $deleted = 0;
+
+ my $key;
+ if (ref $params eq 'HASH') {
+ $key = $params->{key};
+ $deleted = $params->{deleted};
+
+ } else {
+ $key = $params;
+ }
- $key = $default_key unless ($key);
- $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee ORDER BY lower(name)|);
+ $key ||= "all_employees";
+ my $filter = $deleted ? '' : 'WHERE NOT COALESCE(deleted, FALSE)';
+ $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee $filter ORDER BY lower(name)|);
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
@@
-2380,7
+2392,7
@@
sub get_lists {
}
if ($params{"employees"}) {
}
if ($params{"employees"}) {
- $self->_get_employees($dbh,
"all_employees",
$params{"employees"});
+ $self->_get_employees($dbh, $params{"employees"});
}
if ($params{"salesmen"}) {
}
if ($params{"salesmen"}) {