X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a851fde7ef0995a2848c0edb732fe1d50a58d82b..848ff82dda324979b7958eaad58a9b84e38bb27e:/SL/AP.pm

diff --git a/SL/AP.pm b/SL/AP.pm
index b63abab88..a3b7d1e26 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -90,7 +90,7 @@ sub post_transaction {
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
 
   for $i (1 .. $form->{rowcount}) {
-   ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+    ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
 
     $query =
       qq|SELECT c.accno, t.taxkey, t.rate | .
@@ -189,27 +189,18 @@ sub post_transaction {
   my $datepaid = ($form->{invpaid} != 0) ? $form->{datepaid} : undef;
 
   $query = qq|UPDATE ap SET
-              invnumber = ?,
-              transdate = ?,
-              ordnumber = ?,
-              vendor_id = ?,
-              taxincluded = ?,
-              amount = ?,
-              duedate = ?,
-              paid = ?,
-              datepaid = ?,
-              netamount = ?,
-              curr = ?,
-              notes = ?,
-              department_id = ?
-              WHERE id = ?|;
+              invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
+              amount = ?, duedate = ?, paid = ?, datepaid = ?, netamount = ?,
+              curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?
+             WHERE id = ?|;
   my @values = ($form->{invnumber}, conv_date($form->{transdate}),
                 $form->{ordnumber}, conv_i($form->{vendor_id}),
                 $form->{taxincluded} ? 't' : 'f', $form->{invtotal},
                 conv_date($form->{duedate}), $form->{invpaid},
                 conv_date($datepaid), $form->{netamount},
                 $form->{currency}, $form->{notes},
-                conv_i($form->{department_id}), $form->{id});
+                conv_i($form->{department_id}), $form->{storno},
+                $form->{storno_id}, $form->{id});
   do_query($form, $dbh, $query, @values);
 
   # update exchangerate
@@ -415,7 +406,7 @@ sub ap_transactions {
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;
 
-  my $where;
+  my $where = qq| WHERE storno != true |;
   my @values;
 
   if ($form->{vendor_id}) {
@@ -466,7 +457,7 @@ sub ap_transactions {
   }
 
   if ($where) {
-    substr($where, 0, 4) = "WHERE";
+#     substr($where, 0, 4) = "WHERE";
     $query .= $where;
   }