From: Philip Reetz <p.reetz@linet-services.de>
Date: Wed, 17 Jan 2007 10:22:27 +0000 (+0000)
Subject: Fehler bei Lieferadressen die Anfuehrungszeichen im Namen enthalten
X-Git-Tag: release-2.4.1~1^2~31
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ddc3bbb167d3010b0058efa8f90936d15be76c2e;p=kivitendo-erp.git

Fehler bei Lieferadressen die Anfuehrungszeichen im Namen enthalten
---

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 981074862..67ffc4dd7 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -369,6 +369,7 @@ sub form_header {
 
     }
   } else {
+    $form->{selectshipto} = $form->unquote($form->{selectshipto});
     $form->{selectshipto} =~ s/ selected//g;
     if ($form->{shipto_id} ne "") {
       $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
@@ -377,8 +378,9 @@ sub form_header {
 
   $shipto = qq|
 		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>
-		<input type=hidden name=selectshipto value="$form->{selectshipto}">|;
+		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>|;
+  $form->{selectshipto} = $form->quote($form->{selectshipto});
+  $shipto .= qq| <input type=hidden name=selectshipto value="$form->{selectshipto}">|;
 
 
 
@@ -1080,7 +1082,7 @@ if ($form->{type} eq "credit_note") {
 
   if ($form->{id}) {
     print qq|
-    <input class=submit type=submit name=action value="|
+    <input class=submit type=submit accesskey="u" name=action value="|
       . $locale->text('Update') . qq|">
     <input class=submit type=submit name=action value="|
       . $locale->text('Ship to') . qq|">
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 0d96abf2d..694142486 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -432,11 +432,12 @@ sub form_header {
           "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
       } else {
         $form->{selectshipto} .=
-          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
+          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}</option>";
       }
 
     }
   } else {
+    $form->{selectshipto} = $form->unquote($form->{selectshipto});
     $form->{selectshipto} =~ s/ selected//g;
     if ($form->{shipto_id} ne "") {
       $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
@@ -445,9 +446,9 @@ sub form_header {
 
   $shipto = qq|
 		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select name=shipto_id>$form->{selectshipto}</select></td>
-		<input type=hidden name=selectshipto value="$form->{selectshipto}">|;
-
+		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>|;
+  $form->{selectshipto} = $form->quote($form->{selectshipto});
+  $shipto .= qq| <input type=hidden name=selectshipto value="$form->{selectshipto}">|;