Re-Datum und Knopf neben einander anordnen mit "nowrap"

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

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 79b787c..a0f9288 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1059,7 +1059,7 @@ sub print_options {
     ($form->{type} =~ /_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
       opthash('pick_list',           $form->{PD}{pick_list},           $locale->text('Pick List')),
-    ) : undef;
+    ) : undef,
     ($form->{type} eq 'credit_note') ?
       opthash("credit_note",         $form->{PD}{credit_note},         $locale->text('Credit Note')) : undef;
 
@@ -1366,7 +1366,8 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
-  $form->get_salesman(\%myconfig, $salesman_id_saved);
+  $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});
+  $form->get_employee_data('prefix' => 'salesman', 'id' => $salesman_id_saved);
 
   if ($form->{shipto_id}) {
     $form->get_shipto(\%myconfig);
@@ -1485,6 +1486,9 @@ sub print_form {
   delete $form->{OUT};
 
   if ($form->{media} eq 'printer') {
+    print (STDERR "io--------------------------------------");
+    print (STDERR  $form->{printer_command});
+    #$form->{OUT} = "| $form->{printer_command} ";
     $form->{OUT} = "| $form->{printer_command} &>/dev/null";
     $form->{printed} .= " $form->{formname}";
     $form->{printed} =~ s/^ //;
@@ -1877,7 +1881,7 @@ sub _update_part_information {
 sub _update_ship {
   $lxdebug->enter_sub();
 
-  if (!$form->{ordnumber}) {
+  if (!$form->{ordnumber} || !$form->{id}) {
     map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount});
     $lxdebug->leave_sub();
     return;