Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 94f827e0

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID 94f827e02c0f1b89964ed48d2d42e294cf717984
  • Vorgänger ea5b6825
  • Nachfolger fe70b1f3

Kunden/Lieferanten-Bericht: nach Abteilung filtern

Abteilungen im neuen Design anzeigen

Unterschiede anzeigen:

SL/CT.pm
66 66
      "customernumber"     => "ct.customernumber",
67 67
      "vendornumber"       => "ct.vendornumber",
68 68
      "name"               => "ct.name",
69
      "department_1"       => "ct.department_1",
70
      "department_2"       => "ct.department_2",
69 71
      "contact"            => "ct.contact",
70 72
      "phone"              => "ct.phone",
71 73
      "fax"                => "ct.fax",
......
114 116
    push(@values, like($form->{"${cv}number"}));
115 117
  }
116 118

  
117
  foreach my $key (qw(name contact email)) {
118
    if ($form->{$key}) {
119
  foreach my $key (qw(name department_1 department_2 contact email)) {
120
    if ($form->{$key} ne '') {
119 121
      $where .= " AND ct.$key ILIKE ?";
120 122
      push(@values, like($form->{$key}));
121 123
    }
bin/mozilla/ct.pl
148 148
  my $zugferd_filter        = $form->{create_zugferd_invoices} eq '' ? undef : $zugferd_settings_list[$form->{create_zugferd_invoices} + 1]->[1];
149 149

  
150 150
  push @options, $locale->text('Name')                               . " : $form->{name}"                  if $form->{name};
151
  push @options, $locale->text('Department') . ' 1'                  . " : $form->{department_1}"          if $form->{department_1};
152
  push @options, $locale->text('Department') . ' 2'                  . " : $form->{department_2}"          if $form->{department_2};
151 153
  push @options, $locale->text('Contact')                            . " : $form->{contact}"               if $form->{contact};
152 154
  push @options, $locale->text('Number')                           . qq| : $form->{"$form->{db}number"}|   if $form->{"$form->{db}number"};
153 155
  push @options, $locale->text('E-mail')                             . " : $form->{email}"                 if $form->{email};
......
240 242
  my @hidden_variables  = ( qw(
241 243
      db status obsolete name contact email cp_name addr_street addr_zipcode
242 244
      addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all
243
      all_phonenumbers dunning_lock
245
      all_phonenumbers dunning_lock department_1 department_2
244 246
    ), "$form->{db}number",
245 247
    map({ "cvar_$_->{name}" } @searchable_custom_variables),
246 248
    map({'cvar_'. $_->{name} .'_from'} grep({$_->{type} eq 'date'} @searchable_custom_variables)),
templates/design40_webpages/ct/search.html
21 21
          <th>[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][% ELSE %][% 'Vendor Name' | $T8 %][% END %] </th>
22 22
          <td><input type="text" id="name" name="name" class="initial_focus wi-normal"></td>
23 23
        </tr>
24
        <tr>
25
          <th>[% 'Department' | $T8 %]</th>
26
          <td><input type="text" name="department_1" class="wi-normal"></td>
27
        </tr>
28
        <tr>
29
          <th></th>
30
          <td><input type="text" name="department_2" class="wi-normal"></td>
31
        </tr>
24 32
        <tr>
25 33
          <th>[% 'Contact' | $T8 %] </th>
26 34
          <td><input type="text" name="contact" class="wi-normal"></td>
......
149 157
      <input name="l_name" id="l_name" type="checkbox" value="Y" checked>
150 158
      <label for="l_name"> [% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][% ELSE %][% 'Vendor Name' | $T8 %][% END %] </label>
151 159
    </div>
160
    <div>
161
      <input name="l_department_1" id="l_department_1" type="checkbox" value="Y">
162
      <label for="l_department_1"> [% 'Department' | $T8 %] 1</label>
163
    </div>
164
    <div>
165
      <input name="l_department_2" id="l_department_2" type="checkbox" value="Y">
166
      <label for="l_department_2"> [% 'Department' | $T8 %] 2</label>
167
    </div>
152 168
    <div>
153 169
      <input name="l_contact" id="l_contact" type="checkbox" value="Y" checked>
154 170
      <label for="l_contact"> [% 'Contact' | $T8 %] </label>
templates/webpages/ct/search.html
18 18
    <td><input id="name" name="name" size="35" class="initial_focus"></td>
19 19
   </tr>
20 20

  
21
   <tr>
22
    <th align="right" nowrap>[% 'Department' | $T8 %]</th>
23
    <td><input type="text" name="department_1" size="35"></td>
24
   </tr>
25
   <tr>
26
    <th></th>
27
    <td><input type="text" name="department_2" size="35"></td>
28
   </tr>
29

  
21 30
   <tr>
22 31
    <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
23 32
    <td><input name="contact" size="35"></td>

Auch abrufbar als: Unified diff