X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=f6b5686760fd3b76850bf1039d7465f70fdb1b12;hb=eeb07c164e0c3398f14372308b404fb07e2102cf;hp=ba11452462bf07bef5cf1c612a3c453455537c9b;hpb=755822a826214b0981138e155c2c33f46ee21dec;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index ba1145246..f6b568676 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -134,7 +134,6 @@ sub add {
 sub edit {
   $lxdebug->enter_sub();
 
-  $form->{"Watchdog::description_3"} = 1;
   check_oe_access();
 
   # show history button
@@ -1046,49 +1045,24 @@ sub orders {
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
-
   $report->set_export_options('orders', @hidden_variables);
-
   $report->set_sort_indicator($form->{sort}, 1);
 
   my @options;
-  if ($form->{customer}) {
-    push @options, $locale->text('Customer') . " : $form->{customer}";
-  }
-  if ($form->{vendor}) {
-    push @options, $locale->text('Vendor') . " : $form->{vendor}";
-  }
-  if ($form->{department}) {
-    ($department) = split /--/, $form->{department};
-    push @options, $locale->text('Department') . " : $department";
-  }
-  if ($form->{ordnumber}) {
-    push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
-  }
-  if ($form->{notes}) {
-    push @options, $locale->text('Notes') . " : $form->{notes}";
-  }
-  if ($form->{transaction_description}) {
-    push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
-  }
-  if ($form->{transdatefrom}) {
-    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
-  }
-  if ($form->{transdateto}) {
-    push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
-  }
-  if ($form->{open}) {
-    push @options, $locale->text('Open');
-  }
-  if ($form->{closed}) {
-    push @options, $locale->text('Closed');
-  }
-  if ($form->{delivered}) {
-    push @options, $locale->text('Delivered');
-  }
-  if ($form->{notdelivered}) {
-    push @options, $locale->text('Not delivered');
-  }
+
+  push @options, $locale->text('Customer') . " : $form->{customer}"                                       if $form->{customer};
+  push @options, $locale->text('Vendor') . " : $form->{vendor}"                                           if $form->{vendor};
+  ($department) = split /--/, $form->{department};
+  push @options, $locale->text('Department') . " : $department"                                           if $form->{department};
+  push @options, $locale->text('Order Number') . " : $form->{ordnumber}"                                  if $form->{ordnumber};
+  push @options, $locale->text('Notes') . " : $form->{notes}"                                             if $form->{notes};
+  push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"         if $form->{transaction_description};
+  push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)  if $form->{transdatefrom};
+  push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1)     if $form->{transdateto};
+  push @options, $locale->text('Open')                                                                    if $form->{open};
+  push @options, $locale->text('Closed')                                                                  if $form->{closed};
+  push @options, $locale->text('Delivered')                                                               if $form->{delivered};
+  push @options, $locale->text('Not delivered')                                                           if $form->{notdelivered};
 
   $report->set_options('top_info_text'        => join("\n", @options),
                        'raw_top_info_text'    => $form->parse_html_template('oe/orders_top'),