X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=9820c3c42125cf507650b6d76bce206ed80fcfd7;hb=87c7db6a14d2276b72c85a8423e3995f20255b6a;hp=f55d5a7cc5917a33a321a58bba44972ca0a4d2e9;hpb=a143b82a56e889cfda60c2d42fe7d0bdaf73aa83;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index f55d5a7cc..9820c3c42 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -249,7 +249,8 @@ sub order_links { if (@{ $form->{"all_$form->{vc}"} }) { $form->{ $form->{vc} } = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - map { $form->{"select$form->{vc}"} .= "\n" } (@{ $form->{"all_$form->{vc}"} }); } @@ -259,7 +260,7 @@ sub order_links { $form->{defaultcurrency} = $curr[0]; $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - map { $form->{selectcurrency} .= "\n" } @curr; $form->{taxincluded} = $taxincluded if ($form->{id}); @@ -270,7 +271,7 @@ sub order_links { map { $form->{selectdepartment} .= - "\n" } (@{ $form->{all_departments} }); } @@ -279,7 +280,7 @@ sub order_links { # sales staff if (@{ $form->{all_employees} }) { $form->{selectemployee} = ""; - map { $form->{selectemployee} .= "\n" } (@{ $form->{all_employees} }); } @@ -416,6 +417,9 @@ sub form_header { #quote select[customer|vendor] Bug 133 $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); + #substitute \n and \r to \s (bug 543) + $form->{"select$form->{vc}"} =~ s/[\n\r]/ /g; + my @old_project_ids = ($form->{"globalproject_id"}); map({ push(@old_project_ids, $form->{"project_id_$_"}) if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); @@ -427,7 +431,8 @@ sub form_header { "old_id" => \@old_project_ids }, "employees" => "ALL_SALESMEN"); - my (%labels, @values); + my %labels; + my @values = (undef); foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { push(@values, $item->{"cp_id"}); $labels{$item->{"cp_id"}} = $item->{"cp_name"} . @@ -670,7 +675,10 @@ sub form_header { $vc = ($form->{"select$form->{vc}"}) - ? qq|\n{vc}"}">| + ? qq|\n{vc}"}) . qq|">| : qq|{vc} value="$form->{$form->{vc}}" size=35>|; $department = qq| @@ -1055,7 +1063,7 @@ sub form_footer {
$vclabel | -$vc | +$vc | ||||
---|---|---|---|---|---|---|