X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=16aaf775a768d0b917b64b7760873677136b3b21;hb=dd5cd96c8b0018f73b6b344b6158bf36c9362898;hp=e6abc55241ecf06807b53d9db311a2330e968376;hpb=ab924a3008d313efb2081ab9bc191da2bf15808b;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index e6abc5524..16aaf775a 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);
@@ -673,7 +675,7 @@ sub update {
my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
my @flds =
- qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+ qw(accno_id debit credit projectnumber fx_transaction source memo tax taxchart);
for my $i (1 .. $form->{rowcount}) {
$form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) for qw(debit credit tax);
@@ -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|
$accno
| ${balance} |
$fx_transaction
- |
+ |
|
$form->{"tax_$i"} |
$tax_ddbox|;
@@ -1097,16 +1089,15 @@ sub form_header {
my ($init) = @_;
- $::request->layout->add_javascripts("autocomplete_chart.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js");
-
- my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
+ $::request->layout->add_javascripts("autocomplete_chart.js", "autocomplete_project.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.Validator.js");
- $::form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 0,
- "old_id" => \@old_project_ids },
+ my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
+ my @conditions = @old_project_ids ? (id => \@old_project_ids) : ();
+ $::form->{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => [ or => [ active => 1, @conditions ]]);
- "charts" => { "key" => "ALL_CHARTS",
- "transdate" => $::form->{transdate} });
+ $::form->get_lists(
+ "charts" => { "key" => "ALL_CHARTS", "transdate" => $::form->{transdate} },
+ );
# we cannot book on charttype header
@{ $::form->{ALL_CHARTS} } = grep { $_->{charttype} ne 'H' } @{ $::form->{ALL_CHARTS} };
@@ -1213,7 +1204,7 @@ sub post_transaction {
my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
- my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+ my @flds = qw(accno_id debit credit projectnumber fx_transaction source memo tax taxchart);
for my $i (1 .. $form->{rowcount}) {
next if $form->{"debit_$i"} eq "" && $form->{"credit_$i"} eq "";
@@ -1374,8 +1365,9 @@ sub post_transaction {
die "guru meditation error: Can only assign amount to one bank account booking" if scalar @{ $payment } > 1;
# credit/debit * -1 matches the sign for bt.amount and bt.invoice_amount
- die "Can only assign the full (partial) bank amount to a single general ledger booking"
- unless $bt->not_assigned_amount == $payment->[0]->amount * -1;
+
+ die "Can only assign the full (partial) bank amount to a single general ledger booking" . $bt->not_assigned_amount . " " . ($payment->[0]->amount * -1)
+ unless (abs($bt->not_assigned_amount - ($payment->[0]->amount * -1)) < 0.001);
$bt->update_attributes(invoice_amount => $bt->invoice_amount + ($payment->[0]->amount * -1));