X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=28eb85436718d973686be97d99944b3b018e31ec;hb=26ba876e4863567ba21fddd5ec8f909aacfbdfde;hp=3f623ec6d63b60a734dd39335f52031946bb3cde;hpb=94e11003809e9090514026a733e58e72e636a6bb;p=kivitendo-erp.git

diff --git a/SL/DO.pm b/SL/DO.pm
index 3f623ec6d..28eb85436 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -142,12 +142,13 @@ sub transactions {
     "transaction_description" => "dord.transaction_description"
   );
 
-  my $sortoder = "dord.id";
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortorder = "dord.id";
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     $sortorder = $allowed_sort_columns{$form->{sort}};
   }
 
-  $query .= qq| ORDER by | . $sortorder;
+  $query .= qq| ORDER by | . $sortorder . " $sortdir";
 
   $form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
 
@@ -388,13 +389,11 @@ sub mark_orders_if_delivered {
 
   my ($oe_id)  = $links[0]->{from_id} if (scalar @links);
 
-  $main::lxdebug->message(0, "oe_id $oe_id");
-
   return $main::lxdebug->leave_sub() if (!$oe_id);
 
   my $all_units = AM->retrieve_all_units();
 
-  $query        = qq|SELECT oi.parts_id, oi.qty, oi.unit, p.unit AS partunit
+  my $query     = qq|SELECT oi.parts_id, oi.qty, oi.unit, p.unit AS partunit
                      FROM orderitems oi
                      LEFT JOIN parts p ON (oi.parts_id = p.id)
                      WHERE (oi.trans_id = ?)|;
@@ -404,8 +403,6 @@ sub mark_orders_if_delivered {
                                          'oe_id' => $oe_id,);
   my %ordered   = ();
 
-  do_statement($form, $sth, $query, $oe_id);
-
   while (my $ref = $sth->fetchrow_hashref()) {
     $ref->{baseqty} = $ref->{qty} * $all_units->{$ref->{unit}}->{factor} / $all_units->{$ref->{partunit}}->{factor};