X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fgl.pl;h=521bb07d24f90f5ad2470d33d836855f0694e490;hb=232ccb5f2622a7ecc4cfa40031aba17d7717957a;hp=734e9c4a64bb098e244bf6932caabcb5cf2e3f35;hpb=9feb246dea491959ab77055a5a1985ae64c9776f;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 734e9c4a6..521bb07d2 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -177,6 +177,7 @@ sub edit {
$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
+ $form->{"taxchart_$i"} = "0--";
$i++;
}
if ($ref->{taxaccno} && !$tax) {
@@ -304,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|
|
@@ -623,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};
#}
@@ -659,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 = "";
@@ -696,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};
}
@@ -714,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};
}
@@ -730,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}";
}
}
@@ -741,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}";
}
}
@@ -779,9 +780,8 @@ sub generate_report {
$column_data{gifi_accno} =
"