X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=6f49848fcff76c7f6e9029152486a493e4ff40c4;hb=bfd5682ab8cad5878260ec2cafcd630dd3c05eff;hp=fe621122b72051b40b920f34e9022daf809921e5;hpb=731991d49695123cea7a6de1d7c8b0e649d2dba2;p=kivitendo-erp.git diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index fe621122b..6f49848fc 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -673,7 +673,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); @@ -707,10 +707,10 @@ sub update { $form->{debitlock} = 1; } if ($debitcredit && $credittax) { - $form->{"taxchart_$i"} = "$notax_id--0.00"; + $form->{"taxchart_$i"} = "$notax_id--0.00000"; } if (!$debitcredit && $debittax) { - $form->{"taxchart_$i"} = "$notax_id--0.00"; + $form->{"taxchart_$i"} = "$notax_id--0.00000"; } $amount = ($form->{"debit_$i"} == 0) @@ -718,7 +718,7 @@ sub update { : $form->{"debit_$i"}; my $j = $#a; if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) { - $form->{"taxchart_$i"} = "$notax_id--0.00"; + $form->{"taxchart_$i"} = "$notax_id--0.00000"; $form->{"tax_$i"} = 0; } my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"}); @@ -922,20 +922,18 @@ sub display_rows { my $projectnumber_hidden = qq| |; - my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : ''; - my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR'); + 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|; @@ -1215,7 +1213,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 ""; @@ -1255,17 +1253,17 @@ sub post_transaction { $form->{debitlock} = 1; } if ($debitcredit && $credittax) { - $form->{"taxchart_$i"} = "$notax_id--0.00"; + $form->{"taxchart_$i"} = "$notax_id--0.00000"; } if (!$debitcredit && $debittax) { - $form->{"taxchart_$i"} = "$notax_id--0.00"; + $form->{"taxchart_$i"} = "$notax_id--0.00000"; } my $amount = ($form->{"debit_$i"} == 0) ? $form->{"credit_$i"} : $form->{"debit_$i"}; my $j = $#a; if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) { - $form->{"taxchart_$i"} = "$notax_id--0.00"; + $form->{"taxchart_$i"} = "$notax_id--0.00000"; $form->{"tax_$i"} = 0; } my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});