From f3edd66d124fbbb15e062be399f2600f66fae478 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stephan=20K=C3=B6hler?= Date: Mon, 16 Jan 2006 15:44:11 +0000 Subject: [PATCH] Merge von 779 aus unstable: Bugfix 259 Steuerkonten wurden nicht angezeigt, wenn Rechnung und Zahlung vom gleichen Tag. Fixed Bug#259 --- SL/GL.pm | 3 +++ bin/mozilla/gl.pl | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/SL/GL.pm b/SL/GL.pm index 8ec98c8e5..3b0e74e82 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -38,6 +38,8 @@ package GL; +use Data::Dumper; + sub delete_transaction { my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); @@ -518,6 +520,7 @@ sub all_transactions { ($form->{gifi_account_description}) = $sth->fetchrow_array; $sth->finish; } + print(STDERR Dumper($form->{GL})); $main::lxdebug->leave_sub(); $dbh->disconnect; diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index d07dc1de7..ed8aadca3 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -698,9 +698,9 @@ sub generate_report { $debitaccno .= "
{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}"; } - if ($ref->{debit_taxkey}{$key} eq $debittaxkey) { - $ref->{debit_tax_accno}{$key} = $taxaccno; - } +# if ($ref->{debit_taxkey}{$key} eq $debittaxkey) { +# $ref->{debit_tax_accno}{$key} = $taxaccno; +# } $taxaccno = $ref->{debit_tax_accno}{$key}; $debittaxkey = $ref->{debit_taxkey}{$key}; } @@ -716,9 +716,9 @@ sub generate_report { $creditaccno .= "
{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}"; } - if ($ref->{credit_taxkey}{$key} eq $credittaxkey) { - $ref->{credit_tax_accno}{$key} = $taxaccno; - } +# if ($ref->{credit_taxkey}{$key} eq $credittaxkey) { +# $ref->{credit_tax_accno}{$key} = $taxaccno; +# } $taxaccno = $ref->{credit_tax_accno}{$key}; $credittaxkey = $ref->{credit_taxkey}{$key}; } -- 2.20.1