Bug #204 behoben: Storno geht jetzt auch bei Splitbuchungen

diff --git a/SL/GL.pm b/SL/GL.pm
index dc9ecdd34e98a880efea6be064d387b5b155ea8b..aacd602ff9c3cacf85dba7a776bcafef3b15d8da 100644 (file)
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -548,7 +548,7 @@ sub transaction {
     }
 
     # get tax description
     }
 
     # 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} = ();
     $sth   = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
     $form->{TAX} = ();

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 734e9c4a64bb098e244bf6932caabcb5cf2e3f35..c66fdf997c7f1dafbc2581aa1117b2527b829cd7 100644 (file)
--- 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->{totalcredit} += $ref->{amount};
         $form->{"credit_$i"} = $ref->{amount};
       }

+      $form->{"taxchart_$i"} = "0--";

       $i++;
     }
     if ($ref->{taxaccno} && !$tax) {
       $i++;
     }
     if ($ref->{taxaccno} && !$tax) {


@@ -1058,10 +1059,10 @@ sub display_rows {
           qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
         . ($i + 10 + (($i - 1) * 8))
         . qq|>$form->{taxchart}</select></td>|;
           qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
         . ($i + 10 + (($i - 1) * 8))
         . qq|>$form->{taxchart}</select></td>|;

-      if ($form->{selectprojectnumber}) {
-        $project = qq|
-    <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-      }
+#       if ($form->{selectprojectnumber}) {
+#         $project = qq|
+#     <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+#       }

       $korrektur =
         qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
         . ($i + 9 + (($i - 1) * 8))
       $korrektur =
         qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
         . ($i + 9 + (($i - 1) * 8))


@@ -1110,14 +1111,14 @@ sub display_rows {
           . ($i + 10 + (($i - 1) * 8))
           . qq|>$tax</select></td>|;
 
           . ($i + 10 + (($i - 1) * 8))
           . qq|>$tax</select></td>|;
 

-        if ($form->{selectprojectnumber}) {
-          $form->{"projectnumber_$i"} = ""
-            if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
-
-          $project = $form->{"projectnumber_$i"};
-          $project =~ s/--.*//;
-          $project = qq|<td>$project</td>|;
-        }
+#         if ($form->{selectprojectnumber}) {
+#           $form->{"projectnumber_$i"} = ""
+#             if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
+# 
+#           $project = $form->{"projectnumber_$i"};
+#           $project =~ s/--.*//;
+#           $project = qq|<td>$project</td>|;
+#         }

 
         if ($form->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
 
         if ($form->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";


@@ -1131,7 +1132,7 @@ sub display_rows {
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked tabindex=|
           . ($i + 9 + (($i - 1) * 8))
           . qq|></td>|;
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked tabindex=|
           . ($i + 9 + (($i - 1) * 8))
           . qq|></td>|;

-        $form->hide_form("accno_$i", "projectnumber_$i");
+        $form->hide_form("accno_$i");

 
       } else {
 
 
       } else {
 


@@ -1141,10 +1142,10 @@ sub display_rows {
         $tax = qq|
       <td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
           . ($i + 10 + (($i - 1) * 8)) . qq|>$taxchart</select></td>|;
         $tax = qq|
       <td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
           . ($i + 10 + (($i - 1) * 8)) . qq|>$taxchart</select></td>|;

-        if ($form->{selectprojectnumber}) {
-          $project = qq|
-      <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-        }
+#         if ($form->{selectprojectnumber}) {
+#           $project = qq|
+#       <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+#         }

         $korrektur =
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
           . ($i + 9 + (($i - 1) * 8))
         $korrektur =
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
           . ($i + 9 + (($i - 1) * 8))


@@ -1179,16 +1180,15 @@ sub display_rows {
     $tax
     $source
     $memo
     $tax
     $source
     $memo

-    $project

   </tr>
 
   |;
   }
 
   $form->hide_form(qw(rowcount selectaccno));
   </tr>
 
   |;
   }
 
   $form->hide_form(qw(rowcount selectaccno));

-  print qq|
-<input type=hidden name=selectprojectnumber value="|
-    . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
+#   print qq|
+# <input type=hidden name=selectprojectnumber value="|
+#     . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;

   $lxdebug->leave_sub();
 
 }
   $lxdebug->leave_sub();
 
 }


@@ -1546,6 +1546,19 @@ sub post {
 
   my @flds =
     qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
 
   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}) {
 
 
   for my $i (1 .. $form->{rowcount}) {