X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fgl.pl;h=625490dc86958b6eb7b0eb393ef20dda90d6a692;hb=d4a434e1deba2695ef4d4a3fc0d51ac1b2044fb0;hp=b8c2881184167d39bb1ac5ce0cae55f50917723b;hpb=4000272e5ea3a605f3625934f07033472832de49;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index b8c288118..625490dc8 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -218,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');
@@ -234,7 +234,8 @@ sub search {
} (@{ $form->{all_departments} || [] });
}
- my $department = qq|
+ my $department;
+ $department = qq|
| . $locale->text('Department') . qq| |
|
@@ -342,14 +343,12 @@ sub search {
| . $locale->text('Project Number') . qq| |
$projectnumber |
-
- | . $locale->text('From') . qq| |
| . $locale->text('Employee') . qq| |
$employeenumber |
- | . $locale->text('Date Sorting') . qq| |
+ | . $locale->text('Filter date by') . qq| |
| . $locale->text('Booking Date') . qq|
| . $locale->text('Invoice Date') . qq|
@@ -509,9 +508,9 @@ sub generate_report {
my @columns = qw(
gldate transdate id reference description
- notes source debit debit_accno
+ notes source debit debit_accno
credit credit_accno debit_tax debit_tax_accno
- credit_tax credit_tax_accno projectnumbers balance
+ credit_tax credit_tax_accno projectnumbers balance employee
);
# add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
@@ -658,9 +657,9 @@ sub generate_report {
$row->{balance}->{data} = $data;
$row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
- map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes);
+ map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee);
- map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate gldate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
+ map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
foreach my $col (qw(debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
$row->{$col}->{link} = [ map { "${callback}&accno=" . E($_) } @{ $rows{$col} } ];
@@ -863,7 +862,7 @@ sub display_rows {
my $form = $main::form;
my %myconfig = %main::myconfig;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
$form->{debit_1} = 0 if !$form->{"debit_1"};
$form->{totaldebit} = 0;
@@ -1019,7 +1018,7 @@ sub display_rows {
my $projectnumber_hidden = qq|
|;
- my $copy2credit = 'onkeyup="copy_debit_to_credit()"' if $i == 1;
+ my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : '';
print qq| |
$accno
@@ -1081,10 +1080,9 @@ sub form_header {
$form->{title} = $locale->text("$title General Ledger Transaction");
my $readonly = ($form->{id}) ? "readonly" : "";
- my $show_details_checked = "checked" if $form->{show_details};
-
- my $ob_transaction_checked = "checked" if $form->{ob_transaction};
- my $cb_transaction_checked = "checked" if $form->{cb_transaction};
+ my $show_details_checked = $form->{show_details} ? "checked" : '';
+ my $ob_transaction_checked = $form->{ob_transaction} ? "checked" : '';
+ my $cb_transaction_checked = $form->{cb_transaction} ? "checked" : '';
# $locale->text('Add General Ledger Transaction')
# $locale->text('Edit General Ledger Transaction')
@@ -1349,7 +1347,7 @@ sub form_footer {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
my $follow_ups_block;
if ($form->{id}) {
@@ -1412,7 +1410,7 @@ $follow_ups_block
} else {
if ($form->{draft_id}) {
- my $remove_draft_checked = 'checked' if ($form->{remove_draft});
+ my $remove_draft_checked = $form->{remove_draft} ? 'checked' : '';
print qq|\n|
. qq| |
. qq| \n|