X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fgl.pl;h=625490dc86958b6eb7b0eb393ef20dda90d6a692;hb=32c9d480547428dc9555539c8f354ab73d616a6e;hp=e642f7e420594973debe96e77194953cc5837a9e;hpb=7ecdb94715674d62df85fc746fe06db10c7ade9b;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index e642f7e42..625490dc8 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -31,6 +31,9 @@
#
#======================================================================
+use utf8;
+use strict;
+
use POSIX qw(strftime);
use List::Util qw(sum);
@@ -44,8 +47,6 @@ require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
require "bin/mozilla/reportgenerator.pl";
-use strict;
-
# this is for our long dates
# $locale->text('January')
# $locale->text('February')
@@ -217,7 +218,7 @@ sub search {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
$form->{title} = $locale->text('Journal');
@@ -233,7 +234,8 @@ sub search {
} (@{ $form->{all_departments} || [] });
}
- my $department = qq|
+ my $department;
+ $department = qq|
| . $locale->text('Department') . qq|
@@ -241,7 +243,8 @@ sub search {
| if $form->{selectdepartment};
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 1 });
+ "all" => 1},
+ "employees" => "ALL_EMPLOYEES" );
my %project_labels = ();
my @project_values = ("");
@@ -255,6 +258,20 @@ sub search {
'-values' => \@project_values,
'-labels' => \%project_labels));
+ my %employee_labels = ();
+ my @employee_values = ("");
+ foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) {
+ # value in Form "1234--Name" übergeben
+ my $id = "$item->{'id'}--$item->{'name'}";
+ push(@employee_values, "$id");
+ $employee_labels{$id} = $item->{"name"};
+ }
+
+ my $employeenumber =
+ NTI($cgi->popup_menu('-name' => "employee",
+ '-values' => \@employee_values,
+ '-labels' => \%employee_labels));
+
# use JavaScript Calendar or not
$form->{jsscript} = 1;
my $jsscript = "";
@@ -295,7 +312,7 @@ sub search {
@@ -435,7 +467,26 @@ sub generate_report {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- report_generator_set_default_sort('transdate', 1);
+ # generate_report wird beim ersten Aufruf per Weiter-Knopf und POST mit der hidden Variablen sort mit Wert "datesort" (früher "transdate" als Defaultsortiervariable) übertragen
+
+ #