Fix zu Bug 455, jetzt werden einfach beide Daten angezeigt.

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index afcdb66..6987c71 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -670,6 +670,7 @@ sub select_item {
 <input name="new_longdescription_$i" type=hidden value="$ref->{longdescription}">
 <input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
 <input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
+<input name="new_partnotes_$i" type="hidden" value="| . Q($ref->{"partnotes"}) . qq|">
 
 <input name="new_id_$i" type=hidden value=$ref->{id}>
 
@@ -732,7 +733,9 @@ sub item_selected {
   $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
   map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
-    qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
+    qw(id partnumber description sellprice listprice inventory_accno
+       income_accno expense_accno bin unit weight assembly taxaccounts
+       partsgroup formel longdescription not_discountable partnotes);
   if ($form->{"part_payment_id_$i"} ne "") {
     $form->{payment_id} = $form->{"part_payment_id_$i"};
   }
@@ -1469,6 +1472,16 @@ sub print_options {
     $myconfig{"copies"} ? $myconfig{"copies"} :
     3;
 
+  $form->{"media"} =
+    $form->{"media"} ? $form->{"media"} :
+    $myconfig{"default_media"} ? $myconfig{"default_media"} :
+    "screen";
+
+  $form->{"printer_id"} =
+    defined($form->{"printer_id"}) ? $form->{"printer_id"} :
+    $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
+    "";
+
   $form->{PD}{ $form->{formname} } = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
@@ -1810,7 +1823,7 @@ sub print_form {
     $inv                  = "quo";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{"invdate"} = $form->{transdate};
+    $form->{"invdate"}    = $form->{transdate};
     $form->{label}        = $locale->text('Proforma Invoice');
     $numberfld            = "sqnumber";
     $order                = 1;
@@ -1828,7 +1841,9 @@ sub print_form {
   $form->isblank("email", $locale->text('E-mail address missing!'))
     if ($form->{media} eq 'email');
   $form->isblank("${inv}date",
-                 $locale->text($form->{label} . ' Date missing!'));
+           $locale->text($form->{label}) 
+           . ": "
+           . $locale->text(' Date missing!'));
 
   # $locale->text('Invoice Number missing!')
   # $locale->text('Invoice Date missing!')