Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / CT.pm

diff --git a/SL/CT.pm b/SL/CT.pm
index 92011897c5e86ec04f5ee180e5e490bbb300d37e..44adb406c1ea27770626bfddefafccc11f4feb78 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -68,7 +68,7 @@ sub search {
       "email"              => "ct.email",
       "street"             => "ct.street",
       "taxnumber"          => "ct.taxnumber",
-      "business"           => "ct.business",
+      "business"           => "b.description",
       "invnumber"          => "ct.invnumber",
       "ordnumber"          => "ct.ordnumber",
       "quonumber"          => "ct.quonumber",
@@ -171,11 +171,16 @@ sub search {
     push(@values, conv_i($form->{business_id}));
   }
 
+  if ($form->{salesman_id}) {
+    $where .= qq| AND (ct.salesman_id = ?)|;
+    push(@values, conv_i($form->{salesman_id}));
+  }
+
   # Nur Kunden finden, bei denen ich selber der Verkäufer bin
   # Gilt nicht für Lieferanten
   if ($cv eq 'customer' &&   !$main::auth->assert('customer_vendor_all_edit', 1)) {
     $where .= qq| AND ct.salesman_id = (select em.id from employee em where em.login = ?)|;
-    push(@values, $form->{login});
+    push(@values, $::myconfig{login});
   }
 
   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',