Spalten die Primarykey werden sollen vorher auf not null setzen

[kivitendo-erp.git] / bin / mozilla / gl.pl

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 734e9c4..445d4f3 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->{"taxchart_$i"} = "0--";
       $i++;
     }
     if ($ref->{taxaccno} && !$tax) {
@@ -304,12 +305,8 @@ sub search {
     . $locale->text('All') . qq|
                  <input name="category" class=radio type=radio value=A>&nbsp;|
     . $locale->text('Asset') . qq|
-                 <input name="category" class=radio type=radio value=C>&nbsp;|
-    . $locale->text('Contra') . qq|
                  <input name="category" class=radio type=radio value=L>&nbsp;|
     . $locale->text('Liability') . qq|
-                 <input name="category" class=radio type=radio value=Q>&nbsp;|
-    . $locale->text('Equity') . qq|
                  <input name="category" class=radio type=radio value=I>&nbsp;|
     . $locale->text('Revenue') . qq|
                  <input name="category" class=radio type=radio value=E>&nbsp;|
@@ -1058,10 +1055,10 @@ sub display_rows {
           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))
@@ -1110,14 +1107,14 @@ sub display_rows {
           . ($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" : "";
@@ -1131,7 +1128,7 @@ sub display_rows {
           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 {
 
@@ -1141,10 +1138,10 @@ sub display_rows {
         $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))
@@ -1179,16 +1176,15 @@ sub display_rows {
     $tax
     $source
     $memo
-    $project
   </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();
 
 }
@@ -1546,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}) {
 
@@ -1618,6 +1627,12 @@ sub post {
         } 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"} }