X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/3c40c9140408450ed18939f8cc55fa30be0ecf7f..f73ef83b744b60ee18c232726ca8904cad42b1bc:/bin/mozilla/io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 0c7b9736e..c1d5bfe08 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -152,10 +152,17 @@ sub display_row {
       qq|<th align=left nowrap width=30 class=listheading>|
     . $locale->text('Part Description')
     . qq|</th>|;
-  $column_data{ship} =
+  if ($form->{"type"} eq "purchase_order") {
+    $column_data{ship} =
       qq|<th align=left nowrap width=5 class=listheading>|
-    . $locale->text('Ship')
-    . qq|</th>|;
+      . $locale->text('Ship rcvd')
+      . qq|</th>|;
+  } else {
+    $column_data{ship} =
+      qq|<th align=left nowrap width=5 class=listheading>|
+      . $locale->text('Ship')
+      . qq|</th>|;
+  }
   $column_data{qty} =
       qq|<th align=left nowrap width=5 class=listheading>|
     . $locale->text('Qty')
@@ -198,9 +205,11 @@ sub display_row {
     . qq|</th>|;
 ############## ENDE Neueintrag ##################
 
-  $form->{"show_details"} =
-    !defined($form->{"show_details"}) ? 1 :
-    $form->{"show_details"} ? 1 : 0;
+  $myconfig{"show_form_details"} = 1
+    unless (defined($myconfig{"show_form_details"}));
+  $form->{"show_details"} = $myconfig{"show_form_details"}
+    unless (defined($form->{"show_details"}));
+  $form->{"show_details"} = $form->{"show_details"} ? 1 : 0;
   my $show_details_new = 1 - $form->{"show_details"};
   my $show_details_checked = $form->{"show_details"} ? "checked" : "";
 
@@ -305,10 +314,10 @@ sub display_row {
 
     if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
       $column_data{description} =
-        qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>$form->{"description_$i"}</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
+        qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>| . H($form->{"description_$i"}) . qq|</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
     } else {
       $column_data{description} =
-        qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
+        qq|<td><input name="description_$i" size=30 value="| . $form->quote($form->{"description_$i"}) . qq|"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
     }
 
     (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
@@ -422,7 +431,7 @@ sub display_row {
 
 <input type=hidden name="pricegroup_old_$i" value=$form->{"pricegroup_old_$i"}>
 <input type=hidden name="price_old_$i" value=$form->{"price_old_$i"}>
-<input type=hidden name="unit_old_$i" value="$form->{"selected_unit_$i"}">
+<input type=hidden name="unit_old_$i" value="| . $form->quote($form->{"selected_unit_$i"}) . qq|">
 <input type=hidden name="price_new_$i" value=|
       . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
 
@@ -430,7 +439,7 @@ sub display_row {
 <input type=hidden name="inventory_accno_$i" value=$form->{"inventory_accno_$i"}>
 <input type=hidden name="bin_$i" value="$form->{"bin_$i"}">
 <input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">
-<input type=hidden name="partnotes_$i" value="$form->{"partnotes_$i"}">
+<input type=hidden name="partnotes_$i" value="| . $form->quote($form->{"partnotes_$i"}) . qq|">
 <input type=hidden name="income_accno_$i" value=$form->{"income_accno_$i"}>
 <input type=hidden name="expense_accno_$i" value=$form->{"expense_accno_$i"}>
 <input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
@@ -439,7 +448,7 @@ sub display_row {
 <input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
 <input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
 <input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
-<input type=hidden name="longdescription_$i" value="$form->{"longdescription_$i"}">
+<input type=hidden name="longdescription_$i" value="| . $form->quote($form->{"longdescription_$i"}) . qq|">
 <input type=hidden name="basefactor_$i" value="$form->{"basefactor_$i"}">
 
 |;
@@ -1793,7 +1802,7 @@ sub print_form {
   $language_saved = $form->{language_id};
   $payment_id_saved = $form->{payment_id};
 
-  &{"$form->{vc}_details"};
+  &{"$form->{vc}_details"}();
 
   $form->{language_id} = $language_saved;
   $form->{payment_id} = $payment_id_saved;
@@ -2014,14 +2023,14 @@ sub print_form {
 
 sub customer_details {
   $lxdebug->enter_sub();
-  IS->customer_details(\%myconfig, \%$form);
+  IS->customer_details(\%myconfig, \%$form, @_);
   $lxdebug->leave_sub();
 }
 
 sub vendor_details {
   $lxdebug->enter_sub();
 
-  IR->vendor_details(\%myconfig, \%$form);
+  IR->vendor_details(\%myconfig, \%$form, @_);
 
   $lxdebug->leave_sub();
 }
@@ -2049,8 +2058,17 @@ sub ship_to {
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
 
+  my @shipto_vars =
+    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+       shiptocontact shiptophone shiptofax shiptoemail
+       shiptodepartment_1 shiptodepartment_2);
+
+  my @addr_vars =
+    (qw(name department_1 department_2 street zipcode city country
+        contact email phone fax));
+
   # get details for name
-  &{"$form->{vc}_details"};
+  &{"$form->{vc}_details"}(@addr_vars);
 
   $number =
     ($form->{vc} eq 'customer')
@@ -2131,12 +2149,12 @@ sub ship_to {
 	</tr>
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Phone') . qq|</th>
-	  <td>$form->{"$form->{vc}phone"}</td>
+	  <td>$form->{phone}</td>
 	  <td><input name=shiptophone size=20 value="$form->{shiptophone}"></td>
 	</tr>
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Fax') . qq|</th>
-	  <td>$form->{"$form->{vc}fax"}</td>
+	  <td>$form->{fax}</td>
 	  <td><input name=shiptofax size=20 value="$form->{shiptofax}"></td>
 	</tr>
 	<tr>
@@ -2153,8 +2171,7 @@ sub ship_to {
 |;
 
   # delete shipto
-  map { delete $form->{$_} }
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 header);
+  map({ delete $form->{$_} } (@shipto_vars, qw(header)));
   $form->{title} = $title;
 
   foreach $key (keys %$form) {