From: Holger Lindemann <hli@lx-system.de>
Date: Fri, 24 Nov 2006 16:47:37 +0000 (+0000)
Subject: Sichern von abweichenden Lieferanschiften:
X-Git-Tag: release-2.4.0^2~170
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3db6a6d9cb7e46bc2c1e88d01c55a07193208053;p=kivitendo-erp.git

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
---

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 2db7ce5b7..33267a18b 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -895,12 +895,12 @@ sub form_header {
   $form->{selectshipto} = "<option value=0></option>";
   if (@{ $form->{SHIPTO} }) {
     foreach $item (@{ $form->{SHIPTO} }) {
-      if ($item->{id} == $form->{shipto_id}) {
+      if ($item->{shipto_id} == $form->{shipto_id}) {
         $form->{selectshipto} .=
-          "<option value=$item->{id} selected>$item->{shiptoname}\n";
+          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}\n";
       } else {
         $form->{selectshipto} .=
-          "<option value=$item->{id}>$item->{shiptoname}\n";
+          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment_1}\n";
       }
 
     }
@@ -1598,6 +1598,7 @@ sub save {
   if ($vertreter && $form->{db} eq "customer") {
     $form->isblank("salesman_id", $locale->text("Salesman missing!"));
   }
+  print(STDERR "SHIPTO in sub save $form->{shipto_id}\n");
   &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
 
   &edit;
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 49e1b7f83..765635f5d 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -355,12 +355,12 @@ sub form_header {
   if (@{ $form->{SHIPTO} }) {
     $form->{selectshipto} = "<option value=0></option>";
     foreach $item (@{ $form->{SHIPTO} }) {
-      if ($item->{id} == $form->{shipto_id}) {
+      if ($item->{shipto_id} == $form->{shipto_id}) {
         $form->{selectshipto} .=
-          "<option value=$item->{id} selected>$item->{shiptoname}</option>";
+          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
       } else {
         $form->{selectshipto} .=
-          "<option value=$item->{id}>$item->{shiptoname}</option>";
+          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}</option>";
       }
 
     }
@@ -373,7 +373,7 @@ sub form_header {
 
   $shipto = qq|
 		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select name=shipto_id>$form->{selectshipto}</select></td>
+		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>
 		<input type=hidden name=selectshipto value="$form->{selectshipto}">|;
 
 
@@ -659,7 +659,7 @@ sub form_header {
               $dunning
 	      <tr>
 		<th align=right nowrap>| . $locale->text('Record in') . qq|</th>
-		<td colspan=3><select name=AR>$form->{selectAR}</select></td>
+		<td colspan=3><select name=AR style="width:280px;">$form->{selectAR}</select></td>
 		<input type=hidden name=selectAR value="$form->{selectAR}">
 	      </tr>
               $taxzone
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index e82e63ae1..20042ca75 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -423,12 +423,12 @@ sub form_header {
   if (@{ $form->{SHIPTO} }) {
     $form->{selectshipto} = "<option value=0></option>";
     foreach $item (@{ $form->{SHIPTO} }) {
-      if ($item->{id} == $form->{shipto_id}) {
+      if ($item->{shipto_id} == $form->{shipto_id}) {
         $form->{selectshipto} .=
-          "<option value=$item->{id} selected>$item->{shiptoname}</option>";
+          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
       } else {
         $form->{selectshipto} .=
-          "<option value=$item->{id}>$item->{shiptoname}</option>";
+          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
       }
 
     }