X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=886d756f8badff49761b640832028e1c5b09e985;hb=a96b6e954640c26516962ad7cee25a98b90eb883;hp=6f49848fcff76c7f6e9029152486a493e4ff40c4;hpb=53af5bf8cb24918ccdfc898ebaf916e4ef938c3c;p=kivitendo-erp.git diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 6f49848fc..886d756f8 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -422,7 +422,8 @@ sub generate_report { transdate gldate id reference description notes source doccnt debit debit_accno credit credit_accno debit_tax debit_tax_accno - credit_tax credit_tax_accno projectnumbers balance employee + credit_tax credit_tax_accno balance projectnumbers + department employee ); # add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table @@ -481,10 +482,11 @@ sub generate_report { 'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), }, 'balance' => { 'text' => $locale->text('Balance'), }, 'projectnumbers' => { 'text' => $locale->text('Project Numbers'), }, + 'department' => { 'text' => $locale->text('Department'), }, 'employee' => { 'text' => $locale->text('Employee'), }, ); - foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) { + foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno department)) { my $sortname = $name =~ m/accno/ ? 'accno' : $name; my $sortdir = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir"; @@ -572,7 +574,7 @@ 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 gldate employee); + map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee department); map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source); @@ -792,13 +794,6 @@ sub display_rows { $form->{totaldebit} = 0; $form->{totalcredit} = 0; - my %project_labels = (); - my @project_values = (""); - foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { - push(@project_values, $item->{"id"}); - $project_labels{$item->{"id"}} = $item->{"projectnumber"}; - } - my %charts_by_id = map { ($_->{id} => $_) } @{ $::form->{ALL_CHARTS} }; my $default_chart = $::form->{ALL_CHARTS}[0]; my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local; @@ -914,26 +909,23 @@ sub display_rows { } } - my $projectnumber = - NTI($cgi->popup_menu('-name' => "project_id_$i", - '-values' => \@project_values, - '-labels' => \%project_labels, - '-default' => $form->{"project_id_$i"} )); - my $projectnumber_hidden = qq| - |; + my $projectnumber = SL::Presenter::Project::picker("project_id_$i", $form->{"project_id_$i"}); + my $projectnumber_hidden = SL::Presenter::Tag::hidden_tag("project_id_$i", $form->{"project_id_$i"}); - my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR'); + my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : ''; + my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR'); # if we have a bt_chart_id we disallow changing the amount of the bank account if ($form->{bt_chart_id}) { $debitreadonly = $creditreadonly = "readonly" if ($form->{"accno_id_$i"} eq $form->{bt_chart_id}); + $copy2credit = '' if $i == 1; # and disallow copy2credit } print qq|