X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=445d4f3faae9d02c3c1356731b084fb060754ea2;hb=5f0d47eb2561ba03f64b70fbaf7d1d41485d33fe;hp=da2da5b37dc84cca62c6141a1a0c3bde72be2ba1;hpb=1ef9fe2f5208b9d372cba17d896050f5f3e01bd9;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index da2da5b37..445d4f3fa 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|
|
@@ -1051,10 +1055,10 @@ sub display_rows {
qq|
| |;
- if ($form->{selectprojectnumber}) {
- $project = qq|
- | |;
- }
+# if ($form->{selectprojectnumber}) {
+# $project = qq|
+# | |;
+# }
$korrektur =
qq|{"debit_$i"} != 0) {
$form->{totaldebit} += $form->{"debit_$i"};
- $form->{totaldebit} += $form->{"tax_$i"};
+ if (!$form->{taxincluded}) {
+ $form->{totaldebit} += $form->{"tax_$i"};
+ }
} else {
$form->{totalcredit} += $form->{"credit_$i"};
- $form->{totalcredit} += $form->{"tax_$i"};
+ if (!$form->{taxincluded}) {
+ $form->{totalcredit} += $form->{"tax_$i"};
+ }
}
for (qw(debit credit tax)) {
@@ -1099,14 +1107,14 @@ sub display_rows {
. ($i + 10 + (($i - 1) * 8))
. qq|>$tax | |;
- if ($form->{selectprojectnumber}) {
- $form->{"projectnumber_$i"} = ""
- if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
-
- $project = $form->{"projectnumber_$i"};
- $project =~ s/--.*//;
- $project = qq|$project | |;
- }
+# if ($form->{selectprojectnumber}) {
+# $form->{"projectnumber_$i"} = ""
+# if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
+#
+# $project = $form->{"projectnumber_$i"};
+# $project =~ s/--.*//;
+# $project = qq|$project | |;
+# }
if ($form->{transfer}) {
$checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
@@ -1120,7 +1128,7 @@ sub display_rows {
qq| | |;
- $form->hide_form("accno_$i", "projectnumber_$i");
+ $form->hide_form("accno_$i");
} else {
@@ -1130,10 +1138,10 @@ sub display_rows {
$tax = qq|
| |;
- if ($form->{selectprojectnumber}) {
- $project = qq|
- | |;
- }
+# if ($form->{selectprojectnumber}) {
+# $project = qq|
+# | |;
+# }
$korrektur =
qq|
|;
}
$form->hide_form(qw(rowcount selectaccno));
- print qq|
-|;
+# print qq|
+# |;
$lxdebug->leave_sub();
}
@@ -1535,6 +1542,19 @@ sub post {
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+ if ($form->{storno}) {
+ for my $i (1 .. $form->{rowcount}) {
+ unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
+ if ($form->{"debit_$i"} ne "") {
+ $form->{"credit_$i"} = $form->{"debit_$i"};
+ $form->{"debit_$i"} = "";
+ } elsif ($form->{"credit_$i"} ne "") {
+ $form->{"debit_$i"} = $form->{"credit_$i"};
+ $form->{"credit_$i"} = "";
+ }
+ }
+ }
+ }
for my $i (1 .. $form->{rowcount}) {
@@ -1596,12 +1616,23 @@ sub post {
}
if ($form->{taxincluded}) {
$form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
+ if ($debitcredit) {
+ $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
+ } else {
+ $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+ }
} else {
$form->{"tax_$i"} = $amount * $rate;
}
} else {
$form->{"tax_$i"} = 0;
}
+ } elsif ($form->{taxincluded}) {
+ if ($debitcredit) {
+ $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
+ } else {
+ $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+ }
}
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
@@ -1629,8 +1660,12 @@ sub post {
));
}
if ($form->{taxincluded}) {
- $debit += $dr;
- $credit += $cr;
+ if ($dr) {
+ $debit += $dr + $tax;
+ }
+ if ($cr) {
+ $credit += $cr + $tax;
+ }
$taxtotal += $tax;
} else {
if ($dr) {
|