X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=521bb07d24f90f5ad2470d33d836855f0694e490;hb=d05b351d2f468dfcf111178cc482a99a9d734a10;hp=445d4f3faae9d02c3c1356731b084fb060754ea2;hpb=6ce732c8e61b47d9bf59ca49715dec96706d64c0;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 445d4f3fa..521bb07d2 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -620,15 +620,17 @@ sub generate_report {
|;
}
- $form->{balance} *= $ml;
+ $form->{balance} *= $ml;
foreach $ref (@{ $form->{GL} }) {
$form->{balance} *= $ml;
+
# if item ne sort print subtotal
if ($form->{l_subtotal} eq 'Y') {
if ($sameitem ne $ref->{ $form->{sort} }) {
&gl_subtotal;
}
}
+
#foreach $key (sort keys(%{ $ref->{amount} })) {
# $form->{balance} += $ref->{amount}{$key};
#}
@@ -656,7 +658,7 @@ sub generate_report {
$credit .= "
"
. $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
}
- $form->{balance} = abs($form->{balance}) - abs( $ref->{credit}{$key});
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
}
$debittax = "";
@@ -693,14 +695,15 @@ 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};
}
@@ -711,14 +714,15 @@ 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};
}
@@ -727,10 +731,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 +742,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}";
}
}
@@ -776,9 +780,8 @@ sub generate_report {
$column_data{gifi_accno} =
"