/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision e9a4d347

Von Philip Reetz vor etwa 19 Jahren hinzugefügt

ID e9a4d347c175c51f66a6270e349f66866b19f532
Vorgänger 9feb246d
Nachfolger 10e68b57

Bug #204 behoben: Storno geht jetzt auch bei Splitbuchungen

+        }
         # 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} = ();

             $form->{totalcredit} += $ref->{amount};
             $form->{"credit_$i"} = $ref->{amount};
+          }
           $form->{"taxchart_$i"} = "0--";
           $i++;
+        }
         if ($ref->{taxaccno} && !$tax) {
-...
               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))
-...
               . ($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" : "";
-...
               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 {
-...
             $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))
-...
         $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();
+    }
-...
       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}) {

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision e9a4d347

Von Philip Reetz vor etwa 19 Jahren hinzugefügt