X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=521bb07d24f90f5ad2470d33d836855f0694e490;hb=d05b351d2f468dfcf111178cc482a99a9d734a10;hp=6d4cb661efeb8f9310a782c2be8b314e8da12b3c;hpb=0acabd54649b034ca83525776b3f1a511532802b;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 6d4cb661e..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 = "";
@@ -698,9 +700,10 @@ 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 +719,10 @@ 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};
}
@@ -776,9 +780,8 @@ sub generate_report {
$column_data{gifi_accno} =
"