X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/656902356dbfe87a8f1992c0119be3912cc59eed..c0713b66e59e458d4966b8954ec1c835e2bc0c5b:/SL/Controller/CustomerVendor.pm

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 60b26bb93..403413ffc 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -493,7 +493,7 @@ sub action_get_delivery {
 
      LEFT JOIN oe
        ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = ''
-           AND ". ($arap eq 'ar' ? 'oe.customer_id IS NOT NULL' : 'oe_vendor_id IS NOT NULL') ." )
+           AND ". ($arap eq 'ar' ? 'oe.customer_id IS NOT NULL' : 'oe.vendor_id IS NOT NULL') ." )
 
      ${where}
      ORDER BY ${arap}.transdate DESC LIMIT 15";
@@ -611,7 +611,7 @@ sub action_ajaj_autocomplete {
 
   my @hashes = map {
    +{
-     value       => $_->name,
+     value       => $_->displayable_name,
      label       => $_->displayable_name,
      id          => $_->id,
      $number     => $_->$number,
@@ -645,7 +645,7 @@ sub is_orphaned {
   }
 
   my $arap      = $self->is_vendor ? 'ap' : 'ar';
-  my $num_args  = 2;
+  my $num_args  = 3;
 
   my $cv = $self->is_vendor ? 'vendor' : 'customer';
 
@@ -660,6 +660,13 @@ sub is_orphaned {
     SELECT a.id
     FROM oe a
     JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id)
+    WHERE ct.id = ?
+
+    UNION
+
+    SELECT a.id
+    FROM delivery_orders a
+    JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id)
     WHERE ct.id = ?';
 
 
@@ -946,10 +953,10 @@ sub init_customer_models {
     model        => 'Customer',
     sorted => {
       _default  => {
-        by => 'name',
+        by => 'customernumber',
         dir  => 1,
       },
-      name  => t8('Name'),
+      customernumber => t8('Customer Number'),
     },
   );
 }
@@ -962,10 +969,10 @@ sub init_vendor_models {
     model      => 'Vendor',
     sorted => {
       _default  => {
-        by => 'name',
+        by => 'vendornumber',
         dir  => 1,
       },
-      name  => t8('Name'),
+      vendornumber => t8('Vendor Number'),
     },
   );
 }