Einen Filter für den Kunden-/Lieferantentypen bei Berichten über Kunden-/Lieferantens...

diff --git a/SL/CT.pm b/SL/CT.pm
index 82e360c..ad92d4c 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -630,6 +630,11 @@ sub search {
     $where .= qq| AND NOT obsolete|;
   }
 
+  if ($form->{business_id}) {
+    $where .= qq| AND (business_id = ?)|;
+    push(@values, conv_i($form->{business_id}));
+  }
+
   my $query =
     qq|SELECT ct.*, b.description AS business | .
     qq|FROM $cv ct | .

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 4ad5c3b..de23197 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -68,6 +68,31 @@ sub add {
 sub search {
   $lxdebug->enter_sub();
 
+  my $vc_business_type = $form->{db} eq "customer" ?
+    $locale->text("Customer type") : $locale->text("Vendor type");
+
+  $form->get_lists("business_types" => "ALL_BUSINESS_TYPES");
+  my (%labels, @values);
+
+  my $business_types;
+  if (scalar(@{ $form->{ALL_BUSINESS_TYPES} }) != 0) {
+    push(@values, undef);
+    foreach my $item (@{ $form->{ALL_BUSINESS_TYPES} }) {
+      push(@values, $item->{id});
+      $labels{$item->{id}} = $item->{description};
+    }
+
+    $business_types =
+      qq|  <tr>
+    <th align="right" nowrap>${vc_business_type}</th>
+    <td>|
+      . NTI($cgi->popup_menu('-name' => 'business_id', '-values' => \@values,
+                             '-labels' => \%labels))
+      . qq|</td>
+  </tr>
+|;
+  }
+
   $label = ucfirst $form->{db};
   $form->{title} = $locale->text($label . "s");
 
@@ -104,6 +129,7 @@ sub search {
          <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
          <td><input name=email size=35></td>
        </tr>
+  $business_types
        <tr>
          <td></td>
          <td><input name=status class=radio type=radio value=all checked>&nbsp;|
@@ -150,7 +176,7 @@ sub search {
                <td><input name="l_sic_code" type=checkbox class=checkbox value=Y> |
     . $locale->text('SIC') . qq|</td>
                <td><input name="l_business" type=checkbox class=checkbox value=Y> |
-    . $locale->text('Type of Business') . qq|</td>
+    . $vc_business_type . qq|</td>
              </tr>
              <tr>
                <td><input name="l_invnumber" type=checkbox class=checkbox value=Y> |

diff --git a/locale/de/all b/locale/de/all
index 4377e95..d6d032c 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -308,6 +308,7 @@ aktualisieren wollen?',
   'Customer not on file or locked!' => 'Dieser Kunde existiert nicht oder ist gesperrt.',
   'Customer not on file!'       => 'Kunde ist nicht in der Datenbank!',
   'Customer saved!'             => 'Kunde gespeichert!',
+  'Customer type'               => 'Kundentyp',
   'Customername'                => 'Kundenname',
   'Customernumberinit'          => 'Kunden-/Lieferantennummernkreis',
   'Customers'                   => 'Kunden',
@@ -1159,6 +1160,7 @@ gestartet',
   'Vendor not on file or locked!' => 'Dieser Lieferant existiert nicht oder ist gesperrt.',
   'Vendor not on file!'         => 'Lieferant ist nicht in der Datenbank!',
   'Vendor saved!'               => 'Lieferant gespeichert!',
+  'Vendor type'                 => 'Lieferantentyp',
   'Vendors'                     => 'Lieferanten',
   'Verrechnungseinheit'         => 'Verrechnungseinheit',
   'Version'                     => 'Version',

diff --git a/locale/de/ct b/locale/de/ct
index 1a1c150..5103aad 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -26,6 +26,7 @@ $self->{texts} = {
   'Customer Number'             => 'Kundennummer',
   'Customer deleted!'           => 'Kunde gelöscht!',
   'Customer saved!'             => 'Kunde gespeichert!',
+  'Customer type'               => 'Kundentyp',
   'Customers'                   => 'Kunden',
   'DELETED'                     => 'Gelöscht',
   'DUNNING STARTED'             => 'DUNNING STARTED',
@@ -134,6 +135,7 @@ $self->{texts} = {
   'Vendor Number'               => 'Lieferantennummer',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor saved!'               => 'Lieferant gespeichert!',
+  'Vendor type'                 => 'Lieferantentyp',
   'Vendors'                     => 'Lieferanten',
   'Zipcode'                     => 'PLZ',
   'bin_list'                    => 'Lagerliste',