X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=a10880d5678ec752d90629bb7c3266a73e223653;hb=98e5f0698f9419d600ee8652620217d17a3392f2;hp=62be081c11ddaad170073db3e580127201bf77c6;hpb=46d3c6157bf6494b1fb65e554715e73b4cf967ef;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index 62be081c1..a10880d56 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2477,10 +2477,9 @@ sub save_history {
 sub get_history {
   $main::lxdebug->enter_sub();
 
-  my $self = shift();
-  my $dbh = shift();
-  my $trans_id = shift();
-  my $restriction = shift();
+  my ($self, $dbh, $trans_id, $restriction, $order) = @_;
+  my ($orderBy, $desc) = split(/\-\-/, $order);
+  $order = " ORDER BY " . ($order eq "" ? " h.itime " : ($desc == 1 ? $orderBy . " DESC " : $orderBy . " "));
   my @tempArray;
   my $i = 0;
   if ($trans_id ne "") {
@@ -2488,7 +2487,7 @@ sub get_history {
       qq|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name, h.snumbers, h.trans_id AS id | .
       qq|FROM history_erp h | .
       qq|LEFT JOIN employee emp ON (emp.id = h.employee_id) | .
-      qq|WHERE trans_id = ? |
+      qq|WHERE trans_id = ? |. $order
       . $restriction;
 
     my $sth = $dbh->prepare($query) || $self->dberror($query);