Fehlende Localesläufe aus 4091 und 4093.

[mfinanz.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index 620f1e06a5c8504ff82597db5667777a8e912218..50905ec014f2b7838e7b34d79ba1dfee8953e07a 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -393,7 +393,7 @@ sub mark_orders_if_delivered {
 
   my $all_units = AM->retrieve_all_units();
 
 
   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 = ?)|;
                      FROM orderitems oi
                      LEFT JOIN parts p ON (oi.parts_id = p.id)
                      WHERE (oi.trans_id = ?)|;


@@ -403,8 +403,6 @@ sub mark_orders_if_delivered {
                                          'oe_id' => $oe_id,);
   my %ordered   = ();
 
                                          '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};
 
   while (my $ref = $sth->fetchrow_hashref()) {
     $ref->{baseqty} = $ref->{qty} * $all_units->{$ref->{unit}}->{factor} / $all_units->{$ref->{partunit}}->{factor};
 


@@ -898,10 +896,10 @@ sub get_item_availability {
        LEFT JOIN warehouse w ON (i.warehouse_id = w.id)
        LEFT JOIN bin b       ON (i.bin_id       = b.id)
        WHERE (i.parts_id IN (| . join(', ', ('?') x scalar(@parts_ids)) . qq|))
        LEFT JOIN warehouse w ON (i.warehouse_id = w.id)
        LEFT JOIN bin b       ON (i.bin_id       = b.id)
        WHERE (i.parts_id IN (| . join(', ', ('?') x scalar(@parts_ids)) . qq|))

-         AND qty > 0

        GROUP BY i.warehouse_id, i.bin_id, i.chargenumber, i.parts_id, w.description, b.description
        GROUP BY i.warehouse_id, i.bin_id, i.chargenumber, i.parts_id, w.description, b.description

-       ORDER BY LOWER(w.description), LOWER(b.description), LOWER(i.chargenumber)|;
-
+       HAVING SUM(qty) > 0
+       ORDER BY LOWER(w.description), LOWER(b.description), LOWER(i.chargenumber)
+|;

   my $contents = selectall_hashref_query($form, $form->get_standard_dbh($myconfig), $query, @parts_ids);
 
   $main::lxdebug->leave_sub();
   my $contents = selectall_hashref_query($form, $form->get_standard_dbh($myconfig), $query, @parts_ids);
 
   $main::lxdebug->leave_sub();