Bug in Auflistung von Lieferscheinen: Gibt es mehrere Aufträge mit der gleichen Auftr...

diff --git a/SL/DO.pm b/SL/DO.pm
index 3be64f819d69741f3a701a7eda9d754ab517fafe..2e61270d58b3f9a068eac46557412b2335e42750 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -62,14 +62,12 @@ sub transactions {
          dord.transaction_description,
          pr.projectnumber AS globalprojectnumber,
          e.name AS employee,
          dord.transaction_description,
          pr.projectnumber AS globalprojectnumber,
          e.name AS employee,

-         sm.name AS salesman,
-         oe.id AS oe_id
+         sm.name AS salesman

        FROM delivery_orders dord
        LEFT JOIN $vc ct ON (dord.${vc}_id = ct.id)
        LEFT JOIN employee e ON (dord.employee_id = e.id)
        LEFT JOIN employee sm ON (dord.salesman_id = sm.id)
        FROM delivery_orders dord
        LEFT JOIN $vc ct ON (dord.${vc}_id = ct.id)
        LEFT JOIN employee e ON (dord.employee_id = e.id)
        LEFT JOIN employee sm ON (dord.salesman_id = sm.id)

-       LEFT JOIN project pr ON (dord.globalproject_id = pr.id)
-       LEFT JOIN oe ON ((dord.ordnumber = oe.ordnumber) AND NOT COALESCE(oe.quotation, FALSE))|;
+       LEFT JOIN project pr ON (dord.globalproject_id = pr.id)|;

 
   push @where, ($form->{type} eq 'sales_delivery_order' ? '' : 'NOT ') . qq|COALESCE(dord.is_sales, FALSE)|;
 
 
   push @where, ($form->{type} eq 'sales_delivery_order' ? '' : 'NOT ') . qq|COALESCE(dord.is_sales, FALSE)|;
 


@@ -152,7 +150,23 @@ sub transactions {
 
   $form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   $form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $main::lxdebug->dump(0, "DO", $form->{DO});
+  if (scalar @{ $form->{DO} }) {
+    $query =
+      qq|SELECT id
+         FROM oe
+         WHERE NOT COALESCE(quotation, FALSE)
+           AND (ordnumber = ?)
+           AND (COALESCE(${vc}_id, 0) != 0)|;
+
+    my $sth = prepare_query($form, $dbh, $query);
+
+    foreach my $dord (@{ $form->{DO} }) {
+      do_statement($form, $sth, $query, $dord->{ordnumber});
+      ($dord->{oe_id}) = $sth->fetchrow_array();
+    }
+
+    $sth->finish();
+  }

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 79d8172e37c5e58d368e70a34384608ee55e0b82..8cc81f854f222b30acb727ab63821c389cff535e 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -383,7 +383,7 @@ sub search {
 
   check_do_access();
 
 
   check_do_access();
 

-  $form->{vc} = $form->{type} eq 'purchase_order' ? 'vendor' : 'customer';
+  $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer';

 
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS",
                                        "all" => 1 },
 
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS",
                                        "all" => 1 },


@@ -646,7 +646,7 @@ sub invoice {
   $lxdebug->enter_sub();
 
   check_do_access();
   $lxdebug->enter_sub();
 
   check_do_access();

-  $auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit');
+  $auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');

 
   $form->{deliverydate} = $form->{transdate};
   $form->{transdate}    = $form->{invdate} = $form->current_date(\%myconfig);
 
   $form->{deliverydate} = $form->{transdate};
   $form->{transdate}    = $form->{invdate} = $form->current_date(\%myconfig);