From: Stephan Köhler Date: Wed, 28 Dec 2005 13:32:05 +0000 (+0000) Subject: Merge von 699 aus unstable: Bugfix 222, 210, 212 X-Git-Tag: release-2.2.0~67 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ac8a1c94847373ed0084849719d82ebce90a4d6b;p=kivitendo-erp.git Merge von 699 aus unstable: Bugfix 222, 210, 212 Solve Bugs 222, 210, 212: Finanzbuchhaltung verlinkt Konten unintuitiv/falsch --- diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 445d4f3fa..ea47e2a1c 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -693,10 +693,10 @@ sub generate_report { foreach $key (sort keys(%{ $ref->{debit_accno} })) { if ($key == 0) { $debitaccno = - "{accno}&callback=$callback>$ref->{debit_accno}{$key}"; + "{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}"; } else { $debitaccno .= - "
{accno}&callback=$callback>$ref->{debit_accno}{$key}"; + "
{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}"; } if ($ref->{debit_taxkey}{$key} eq $debittaxkey) { $ref->{debit_tax_accno}{$key} = $taxaccno; @@ -711,10 +711,10 @@ sub generate_report { foreach $key (sort keys(%{ $ref->{credit_accno} })) { if ($key == 0) { $creditaccno = - "{accno}&callback=$callback>$ref->{credit_accno}{$key}"; + "{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}"; } else { $creditaccno .= - "
{accno}&callback=$callback>$ref->{credit_accno}{$key}"; + "
{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}"; } if ($ref->{credit_taxkey}{$key} eq $credittaxkey) { $ref->{credit_tax_accno}{$key} = $taxaccno; @@ -727,10 +727,10 @@ sub generate_report { foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) { if ($key == 0) { $debittaxaccno = - "{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}"; + "{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}"; } else { $debittaxaccno .= - "
{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}"; + "
{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}"; } } @@ -738,10 +738,10 @@ sub generate_report { foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) { if ($key == 0) { $credittaxaccno = - "{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}"; + "{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}"; } else { $credittaxaccno .= - "
{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}"; + "
{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}"; } }