Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f5c1b2e1

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID f5c1b2e1b8d2899f8beb17b65a93a652105272dd
  • Vorgänger 71021b2c
  • Nachfolger 12c4c658

Die Kunden-/Lieferantenfilterauswahl bei den Berichten war verschwunden.

Unterschiede anzeigen:

bin/mozilla/oe.pl
403 403
  map({ push(@old_project_ids, $form->{"project_id_$_"})
404 404
          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
405 405

  
406
  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
406 407
  $form->get_lists("contacts" => "ALL_CONTACTS",
407 408
                   "shipto" => "ALL_SHIPTO",
408 409
                   "projects" => { "key" => "ALL_PROJECTS",
......
411 412
                   "employees" => "ALL_SALESMEN",
412 413
                   "taxzones" => "ALL_TAXZONES",
413 414
                   "payments" => "ALL_PAYMENTS",
414
                   "currencies" => "ALL_CURRENCIES");
415
                  ($form->{vc} eq "customer" 
416
                      ? $form->get_lists("customers" => "ALL_CUSTOMERS") 
417
                      : $form->get_lists("vendors" => "ALL_VENDORS"));
418
  
415
                   "currencies" => "ALL_CURRENCIES",
416
                   $vc => "ALL_" . uc($vc));
417

  
419 418
  my %labels;
420 419
  my @values = (undef);
421 420
  foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
......
435 434
    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
436 435
  }
437 436

  
438
  my $vc = qq|
437
  $vc = qq|
439 438
      <input type="hidden" name="old$form->{vc}" value="| . H($form->{"old$form->{vc}"}) . qq|">
440 439
      <th align="right">| . $locale->text(ucfirst($form->{vc})) . qq|</th>
441 440
      <td>| . 
......
1429 1428
                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\></td>|;
1430 1429
  }
1431 1430

  
1431
  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
1432

  
1432 1433
  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
1433
                                   "all" => 1 });
1434
                                   "all" => 1 },
1435
                   $vc => "ALL_" . uc($vc));
1434 1436

  
1435 1437
  my %labels = ();
1436 1438
  my @values = ("");
......
1442 1444
    NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
1443 1445
                         '-labels' => \%labels));
1444 1446

  
1447
  %labels = ();
1448
  @values = ("");
1449

  
1450
  foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) {
1451
    push(@values, $item->{name}.qq|--|.$item->{"id"});
1452
    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
1453
  }
1454

  
1455
  my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor');
1456
  $vc =
1457
    $myconfig{vclimit} <=  scalar(@values)
1458
    ? qq|<input type="text" value="| . H($form->{"old$form->{vc}"}) . qq|" name="$form->{vc}">|
1459
    : NTI($cgi->popup_menu('-name' => "$form->{vc}",
1460
                           '-default' => $form->{"old$form->{vc}"},
1461
                           '-onChange' => 'document.getElementById(\'update_button\').click();',
1462
                           '-values' => \@values,
1463
                           '-labels' => \%labels));
1464

  
1445 1465
  $form->header;
1446 1466

  
1447 1467
  print qq|
......
1458 1478
    <td>
1459 1479
      <table>
1460 1480
        <tr>
1461
          $vc
1481
          <th align=right>$vc_label</th>
1482
          <td colspan=3>$vc</td>
1462 1483
        </tr>
1463 1484
	$department
1464 1485
        <tr>

Auch abrufbar als: Unified diff