From: Sven Schöling Date: Mon, 4 Feb 2008 16:37:21 +0000 (+0000) Subject: Kosmetik X-Git-Tag: release-2.6.0beta1~252 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=69b5b918fce6846162934ae897b521b508e2dfb5;p=kivitendo-erp.git Kosmetik --- diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index a64762009..f6b568676 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1045,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'),