Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 3db6a6d9

Von Holger Lindemann vor fast 18 Jahren hinzugefügt

  • ID 3db6a6d9cb7e46bc2c1e88d01c55a07193208053
  • Vorgänger 2071984a
  • Nachfolger 11fb5cc4

Sichern von abweichenden Lieferanschiften:
Kunden ohne trans_id, Lieferanten ohne 'CT', mehrfaches speichern der gleichen Anschrift

shiptodepartment_1 in die Auswahlbox mit übernommen, breite der Selectbox "shipto" und "konto" fixiert

Konflikt mit CRM

Unterschiede anzeigen:

bin/mozilla/ct.pl
895 895
  $form->{selectshipto} = "<option value=0></option>";
896 896
  if (@{ $form->{SHIPTO} }) {
897 897
    foreach $item (@{ $form->{SHIPTO} }) {
898
      if ($item->{id} == $form->{shipto_id}) {
898
      if ($item->{shipto_id} == $form->{shipto_id}) {
899 899
        $form->{selectshipto} .=
900
          "<option value=$item->{id} selected>$item->{shiptoname}\n";
900
          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}\n";
901 901
      } else {
902 902
        $form->{selectshipto} .=
903
          "<option value=$item->{id}>$item->{shiptoname}\n";
903
          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment_1}\n";
904 904
      }
905 905

  
906 906
    }
......
1598 1598
  if ($vertreter && $form->{db} eq "customer") {
1599 1599
    $form->isblank("salesman_id", $locale->text("Salesman missing!"));
1600 1600
  }
1601
  print(STDERR "SHIPTO in sub save $form->{shipto_id}\n");
1601 1602
  &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
1602 1603

  
1603 1604
  &edit;
bin/mozilla/is.pl
355 355
  if (@{ $form->{SHIPTO} }) {
356 356
    $form->{selectshipto} = "<option value=0></option>";
357 357
    foreach $item (@{ $form->{SHIPTO} }) {
358
      if ($item->{id} == $form->{shipto_id}) {
358
      if ($item->{shipto_id} == $form->{shipto_id}) {
359 359
        $form->{selectshipto} .=
360
          "<option value=$item->{id} selected>$item->{shiptoname}</option>";
360
          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
361 361
      } else {
362 362
        $form->{selectshipto} .=
363
          "<option value=$item->{id}>$item->{shiptoname}</option>";
363
          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}</option>";
364 364
      }
365 365

  
366 366
    }
......
373 373

  
374 374
  $shipto = qq|
375 375
		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
376
		<td><select name=shipto_id>$form->{selectshipto}</select></td>
376
		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>
377 377
		<input type=hidden name=selectshipto value="$form->{selectshipto}">|;
378 378

  
379 379

  
......
659 659
              $dunning
660 660
	      <tr>
661 661
		<th align=right nowrap>| . $locale->text('Record in') . qq|</th>
662
		<td colspan=3><select name=AR>$form->{selectAR}</select></td>
662
		<td colspan=3><select name=AR style="width:280px;">$form->{selectAR}</select></td>
663 663
		<input type=hidden name=selectAR value="$form->{selectAR}">
664 664
	      </tr>
665 665
              $taxzone
bin/mozilla/oe.pl
423 423
  if (@{ $form->{SHIPTO} }) {
424 424
    $form->{selectshipto} = "<option value=0></option>";
425 425
    foreach $item (@{ $form->{SHIPTO} }) {
426
      if ($item->{id} == $form->{shipto_id}) {
426
      if ($item->{shipto_id} == $form->{shipto_id}) {
427 427
        $form->{selectshipto} .=
428
          "<option value=$item->{id} selected>$item->{shiptoname}</option>";
428
          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
429 429
      } else {
430 430
        $form->{selectshipto} .=
431
          "<option value=$item->{id}>$item->{shiptoname}</option>";
431
          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
432 432
      }
433 433

  
434 434
    }

Auch abrufbar als: Unified diff