Date: Wed, 9 Nov 2005 15:52:09 +0000 (+0000)
Subject: Bug #204 behoben: Storno geht jetzt auch bei Splitbuchungen
X-Git-Tag: release-2.4.0^2~474
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;ds=sidebyside;h=e9a4d347c175c51f66a6270e349f66866b19f532;hp=9feb246dea491959ab77055a5a1985ae64c9776f;p=kivitendo-erp.git
Bug #204 behoben: Storno geht jetzt auch bei Splitbuchungen
---
diff --git a/SL/GL.pm b/SL/GL.pm
index dc9ecdd34..aacd602ff 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -548,7 +548,7 @@ sub transaction {
}
# get tax description
- $query = qq| SELECT * FROM tax t|;
+ $query = qq| SELECT * FROM tax t order by t.taxkey|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$form->{TAX} = ();
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 734e9c4a6..c66fdf997 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) {
@@ -1058,10 +1059,10 @@ sub display_rows {
qq| | |;
- if ($form->{selectprojectnumber}) {
- $project = qq|
- | |;
- }
+# if ($form->{selectprojectnumber}) {
+# $project = qq|
+# | |;
+# }
$korrektur =
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" : "";
@@ -1131,7 +1132,7 @@ sub display_rows {
qq| | |;
- $form->hide_form("accno_$i", "projectnumber_$i");
+ $form->hide_form("accno_$i");
} else {
@@ -1141,10 +1142,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();
}
@@ -1546,6 +1546,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}) {
|