From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 12 Dec 2006 16:29:44 +0000 (+0000)
Subject: Bei der Eingabe von Lieferadressen aus den Verkaufsmasken heraus können auch die... 
X-Git-Tag: release-2.4.0^2~63
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=cac65c52954be692d086e2af17fd2a079f361ab5;p=kivitendo-erp.git

Bei der Eingabe von Lieferadressen aus den Verkaufsmasken heraus können auch die beiden Felder für die Abteilungen angegeben werden. Fix für Bugzilla #397.
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 7643f14f1..1cf2d9c7b 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -2012,6 +2012,16 @@ sub ship_to {
 	  <td>$form->{name}</td>
 	  <td><input name=shiptoname size=35 value="$form->{shiptoname}"></td>
 	</tr>
+	<tr>
+	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+	  <td>$form->{department_1}</td>
+	  <td><input name=shiptodepartment_1 size=35 value="$form->{shiptodepartment_1}"></td>
+	</tr>
+	<tr>
+	  <th align=right nowrap>&nbsp;</th>
+	  <td>$form->{department_2}</td>
+	  <td><input name=shiptodepartment_2 size=35 value="$form->{shiptodepartment_2}"></td>
+	</tr>
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Street') . qq|</th>
 	  <td>$form->{street}</td>
@@ -2062,7 +2072,7 @@ sub ship_to {
 
   # delete shipto
   map { delete $form->{$_} }
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail header);
+    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 header);
   $form->{title} = $title;
 
   foreach $key (keys %$form) {
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index cfd55a404..91f422fa9 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -288,8 +288,6 @@ sub prepare_order {
   $form->{media}    = "screen";
   $form->{formname} = $form->{type} unless $form->{formname};
 
-  map { $form->{$_} =~ s/\"/&quot;/g }
-    qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
   my $i = 0;
   foreach $ref (@{ $form->{form_details} }) {
     $form->{rowcount} = ++$i;
@@ -334,6 +332,11 @@ sub form_header {
   $checkedopen   = ($form->{closed}) ? ""        : "checked";
   $checkedclosed = ($form->{closed}) ? "checked" : "";
 
+  map { $form->{$_} =~ s/\"/&quot;/g }
+    qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname
+       shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
+       shiptophone shiptofax shiptodepartment_1 shiptodepartment_2);
+
   # use JavaScript Calendar or not
   $form->{jsscript} = $form->{jscalendar};
   $jsscript = "";
@@ -830,6 +833,8 @@ $jsscript
 <input type=hidden name=shiptocontact value="$form->{shiptocontact}">
 <input type=hidden name=shiptophone value="$form->{shiptophone}">
 <input type=hidden name=shiptofax value="$form->{shiptofax}">
+<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
+<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
 <input type=hidden name=shiptoemail value="$form->{shiptoemail}">
 
 <!-- email variables -->
@@ -2691,6 +2696,8 @@ sub display_ship_receive {
 <input type=hidden name=shiptophone value="$form->{shiptophone}">
 <input type=hidden name=shiptofax value="$form->{shiptofax}">
 <input type=hidden name=shiptoemail value="$form->{shiptoemail}">
+<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
+<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
 
 <!-- email variables -->
 <input type=hidden name=message value="$form->{message}">