Revision 820545bc
Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt
SL/IS.pm | ||
---|---|---|
489 | 489 |
my ($query, $sth, $null, $project_id, $deliverydate, @values); |
490 | 490 |
my $exchangerate = 0; |
491 | 491 |
|
492 |
($null, $form->{employee_id}) = split(/--/, $form->{employee}); |
|
493 |
unless ($form->{employee_id}) { |
|
492 |
if (!$form->{employee_id}) { |
|
494 | 493 |
$form->get_employee($dbh); |
495 | 494 |
} |
496 | 495 |
|
bin/mozilla/is.pl | ||
---|---|---|
357 | 357 |
@values = (); |
358 | 358 |
foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { |
359 | 359 |
push(@values, $item->{"id"}); |
360 |
$labels{$item->{"id"}} = $item->{"name"};
|
|
360 |
$labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
|
|
361 | 361 |
} |
362 | 362 |
|
363 | 363 |
my $employees = qq| |
364 | 364 |
<tr> |
365 | 365 |
<th align="right">| . $locale->text('Employee') . qq|</th> |
366 | 366 |
<td>| . |
367 |
NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee_id"}, |
|
367 |
NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
|
|
368 | 368 |
'-values' => \@values, '-labels' => \%labels)) . qq| |
369 | 369 |
</td> |
370 | 370 |
</tr>|; |
... | ... | |
438 | 438 |
'-default' => $form->{"globalproject_id"})); |
439 | 439 |
|
440 | 440 |
%labels = (); |
441 |
@values = ("");
|
|
441 |
@values = (); |
|
442 | 442 |
foreach my $item (@{ $form->{ALL_SALESMEN} }) { |
443 | 443 |
push(@values, $item->{id}); |
444 | 444 |
$labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login}; |
... | ... | |
448 | 448 |
qq|<tr> |
449 | 449 |
<th align="right">| . $locale->text('Salesman') . qq|</th> |
450 | 450 |
<td>| . |
451 |
NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id}, |
|
452 |
'-values' => \@values, '-labels' => \%labels))
|
|
451 |
NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id} ? $form->{salesman_id} : $form->{employee_id},
|
|
452 |
'-values' => \@values, '-labels' => \%labels)) |
|
453 | 453 |
. qq|</td> |
454 | 454 |
</tr>|; |
455 | 455 |
|
Auch abrufbar als: Unified diff
Verkaufsrechnung: Die Drop-Down-Box für den Bearbeiter heißt nun employee_id (wie auch in oe.pl) und wird richtig befüllt und vorausgewählt.