X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=521bb07d24f90f5ad2470d33d836855f0694e490;hb=d05b351d2f468dfcf111178cc482a99a9d734a10;hp=0c7f7350c5fe98e1e741d104ebfe140ee83e1402;hpb=2ae62d30b25720dbd0a5c70d74bc6b7e83204a97;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 0c7f7350c..521bb07d2 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -160,6 +160,13 @@ sub edit {
if ($tax && ($ref->{accno} eq $taxaccno)) {
$form->{"tax_$j"} = abs($ref->{amount});
$form->{"taxchart_$j"} = $ref->{taxkey} . "--" . $ref->{taxrate};
+ if ($form->{taxincluded}) {
+ if ($ref->{amount} < 0) {
+ $form->{"debit_$j"} += $form->{"tax_$j"};
+ } else {
+ $form->{"credit_$j"} += $form->{"tax_$j"};
+ }
+ }
} else {
$form->{"accno_$i"} = "$ref->{accno}--$ref->{accnotaxkey}";
for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
@@ -170,6 +177,7 @@ sub edit {
$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
+ $form->{"taxchart_$i"} = "0--";
$i++;
}
if ($ref->{taxaccno} && !$tax) {
@@ -297,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|
|
@@ -391,7 +395,7 @@ sub generate_report {
$form->{title} = $locale->text('General Ledger');
- $ml = ($form->{ml} =~ /(A|E)/) ? -1 : 1;
+ $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
unless ($form->{category} eq 'X') {
$form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
@@ -616,8 +620,9 @@ sub generate_report {
|;
}
-
+ $form->{balance} *= $ml;
foreach $ref (@{ $form->{GL} }) {
+ $form->{balance} *= $ml;
# if item ne sort print subtotal
if ($form->{l_subtotal} eq 'Y') {
@@ -625,9 +630,10 @@ sub generate_report {
&gl_subtotal;
}
}
- foreach $key (sort keys(%{ $ref->{amount} })) {
- $form->{balance} += $ref->{amount}{$key};
- }
+
+ #foreach $key (sort keys(%{ $ref->{amount} })) {
+ # $form->{balance} += $ref->{amount}{$key};
+ #}
$debit = "";
foreach $key (sort keys(%{ $ref->{debit} })) {
@@ -639,6 +645,7 @@ sub generate_report {
$debit .=
"
" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{debit}{$key});
}
$credit = "";
@@ -651,6 +658,7 @@ sub generate_report {
$credit .= "
"
. $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
}
$debittax = "";
@@ -664,6 +672,7 @@ sub generate_report {
$debittax .= "
"
. $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{debit_tax}{$key});
}
$credittax = "";
@@ -677,6 +686,7 @@ sub generate_report {
$credittax .= "
"
. $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit_tax}{$key});
}
$debitaccno = "";
@@ -685,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};
}
@@ -703,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};
}
@@ -719,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}";
}
}
@@ -730,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}";
}
}
@@ -768,9 +780,8 @@ sub generate_report {
$column_data{gifi_accno} =
"