Stammdaten -> Berichte -> Kunden: Nach Standardverkäufer filtern können.

diff --git a/SL/CT.pm b/SL/CT.pm
index b430272e018216cdca776c04c6dd1e250b8e68b1..ab931c04cf3da9543c44865b829957c15be3c95b 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -171,6 +171,11 @@ sub search {
     push(@values, conv_i($form->{business_id}));
   }
 
     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)) {
   # 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)) {

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index b5b83c19f01d4d20e144546d695958d4de78f749..5a2dbd6c50bc2b9e054b0ba853a0aa3fcbb61d3e 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -76,7 +76,8 @@ sub search {
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 

-  $form->get_lists("business_types" => "ALL_BUSINESS_TYPES");
+  $form->get_lists("business_types" => "ALL_BUSINESS_TYPES",
+                   "salesmen"       => "ALL_SALESMEN");

   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   $form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');
   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   $form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');


@@ -152,6 +153,12 @@ sub list_names {
       push @options, $label . " : " . $business->description;
     }
   }
       push @options, $label . " : " . $business->description;
     }
   }

+  if ($form->{salesman_id}) {
+    my $salesman = SL::DB::Manager::Employee->find_by(id => $form->{salesman_id});
+    if ($salesman) {
+      push @options, $locale->text('Salesman') . " : " . $salesman->name;
+    }
+  }

 
   my @columns = (
     'id',        'name',    "$form->{db}number",   'contact',   'phone',    'discount',
 
   my @columns = (
     'id',        'name',    "$form->{db}number",   'contact',   'phone',    'discount',


@@ -194,7 +201,7 @@ sub list_names {
 
   my @hidden_variables  = ( qw(
       db status obsolete name contact email cp_name addr_street addr_zipcode
 
   my @hidden_variables  = ( qw(
       db status obsolete name contact email cp_name addr_street addr_zipcode

-      addr_city addr_country business_id
+      addr_city addr_country business_id salesman_id

     ), "$form->{db}number",
     map({ "cvar_$_->{name}" } @searchable_custom_variables),
     map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)),
     ), "$form->{db}number",
     map({ "cvar_$_->{name}" } @searchable_custom_variables),
     map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)),

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 57b970cbefe04809fbacebe8cb71c85fad748b3e..933a7d1c063dd39625bece9c993a9bddbb6171fe 100644 (file)
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -57,6 +57,15 @@
    </tr>
    [% END %]
 
    </tr>
    [% END %]
 

+   [% IF IS_CUSTOMER && ALL_SALESMEN.size %]
+   <tr>
+    <th align="right" nowrap>[% 'Salesman' | $T8 %]</th>
+    <td>
+     [% L.select_tag('salesman_id', ALL_SALESMEN, title_key = 'name', with_empty = 1) %]
+    </td>
+   </tr>
+   [% END %]
+

    [% CUSTOM_VARIABLES_FILTER_CODE %]
 
    <tr>
    [% CUSTOM_VARIABLES_FILTER_CODE %]
 
    <tr>