X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=6d4cb661efeb8f9310a782c2be8b314e8da12b3c;hb=264b38c7465f95066b47588c2fbe85f102bd022c;hp=c66fdf997c7f1dafbc2581aa1117b2527b829cd7;hpb=e9a4d347c175c51f66a6270e349f66866b19f532;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index c66fdf997..6d4cb661e 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -305,12 +305,8 @@ sub search {
. $locale->text('All') . qq|
|
. $locale->text('Asset') . qq|
- |
- . $locale->text('Contra') . qq|
|
. $locale->text('Liability') . qq|
- |
- . $locale->text('Equity') . qq|
|
. $locale->text('Revenue') . qq|
|
@@ -697,14 +693,14 @@ 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}";
- }
- if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
- $ref->{debit_tax_accno}{$key} = $taxaccno;
+ "
{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}";
}
+# if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
+# $ref->{debit_tax_accno}{$key} = $taxaccno;
+# }
$taxaccno = $ref->{debit_tax_accno}{$key};
$debittaxkey = $ref->{debit_taxkey}{$key};
}
@@ -715,14 +711,14 @@ 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}";
- }
- if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
- $ref->{credit_tax_accno}{$key} = $taxaccno;
+ "
{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}";
}
+# if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
+# $ref->{credit_tax_accno}{$key} = $taxaccno;
+# }
$taxaccno = $ref->{credit_tax_accno}{$key};
$credittaxkey = $ref->{credit_taxkey}{$key};
}
@@ -731,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}";
}
}
@@ -742,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}";
}
}
@@ -1045,18 +1041,18 @@ sub display_rows {
for $i (1 .. $form->{rowcount}) {
$source = qq|
-