X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/23c7245a5a0bef08132071fbe2b087a1df0099c1..b2f45e7ebfee8fd1cf79632baccad61d6814fd8c:/SL/DO.pm diff --git a/SL/DO.pm b/SL/DO.pm index 390f51f32..28eb85436 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -142,7 +142,7 @@ sub transactions { "transaction_description" => "dord.transaction_description" ); - my $sortdir = $form->{sortdir} ? 'ASC' : 'DESC'; + 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}}; @@ -389,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 = ?)|; @@ -405,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};