Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8299e7bc

Von Thomas Kasulke vor fast 18 Jahren hinzugefügt

  • ID 8299e7bc0d4463d5ba08e1feaccd8faa60f5c5ae
  • Vorgänger 7c3117b5
  • Nachfolger 54451a50

Ersatzmuster für Lieferanten/Kundennamen, die \n und/oder \r enthalten eingefügt (bug 543)

Unterschiede anzeigen:

bin/mozilla/oe.pl
249 249
  if (@{ $form->{"all_$form->{vc}"} }) {
250 250
    $form->{ $form->{vc} } =
251 251
      qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
252
    map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" }
252
    map { $form->{"select$form->{vc}"} .=
253
"<option>$_->{name}--$_->{id}</option>\n" }
253 254
      (@{ $form->{"all_$form->{vc}"} });
254 255
  }
255 256

  
......
259 260
  $form->{defaultcurrency} = $curr[0];
260 261
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
261 262

  
262
  map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
263
  map { $form->{selectcurrency} .= "<option>$_</option>\n" } @curr;
263 264

  
264 265
  $form->{taxincluded} = $taxincluded if ($form->{id});
265 266

  
......
270 271

  
271 272
    map {
272 273
      $form->{selectdepartment} .=
273
        "<option>$_->{description}--$_->{id}\n"
274
        "<option>$_->{description}--$_->{id}</option>\n"
274 275
    } (@{ $form->{all_departments} });
275 276
  }
276 277

  
......
279 280
  # sales staff
280 281
  if (@{ $form->{all_employees} }) {
281 282
    $form->{selectemployee} = "";
282
    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
283
    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}</option>\n" }
283 284
      (@{ $form->{all_employees} });
284 285
  }
285 286

  
......
416 417
  #quote select[customer|vendor] Bug 133
417 418
  $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"});
418 419

  
420
  #substitute \n and \r to \s (bug 543)
421
  $form->{"select$form->{vc}"} =~ s/[\n\r]/&nbsp;/g;
422
  
419 423
  my @old_project_ids = ($form->{"globalproject_id"});
420 424
  map({ push(@old_project_ids, $form->{"project_id_$_"})
421 425
          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
......
1340 1344
  $form->all_vc(\%myconfig, $form->{vc},
1341 1345
                ($form->{vc} eq 'customer') ? "AR" : "AP");
1342 1346

  
1343
  map { $vc .= "<option>$_->{name}--$_->{id}\n" }
1347
  map { $vc .= "<option>$_->{name}--$_->{id}</option>\n" }
1344 1348
    @{ $form->{"all_$form->{vc}"} };
1345 1349

  
1346 1350
  $vclabel = ucfirst $form->{vc};
......
1351 1355

  
1352 1356
  $vc =
1353 1357
    ($vc)
1354
    ? qq|<select name=$form->{vc}><option>\n$vc</select>|
1358
    ? qq|<select name=$form->{vc}><option>\n$vc</option></select>|
1355 1359
    : qq|<input name=$form->{vc} size=35>|;
1356 1360

  
1357 1361
  # departments
......
1360 1364

  
1361 1365
    map {
1362 1366
      $form->{selectdepartment} .=
1363
        "<option>$_->{description}--$_->{id}\n"
1367
        "<option>$_->{description}--$_->{id}</option>\n"
1364 1368
    } (@{ $form->{all_departments} });
1365 1369
  }
1366 1370

  
......
1444 1448
      <table>
1445 1449
        <tr>
1446 1450
          <th align=right>$vclabel</th>
1447
          <td colspan=3>$vc</td>
1451
          <td colspan="3">$vc</td>
1448 1452
        </tr>
1449 1453
	$department
1450 1454
        <tr>

Auch abrufbar als: Unified diff