X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=402df0d289499d82cfa23d61273aece22cdb6490;hb=84bed7a655edfe816ad2a04b5549b6bd6a968c79;hp=cd90a8578d02acd93719eb7f635d6cf6ee08bc01;hpb=2ff471a7b78c1085bbc0adff525fbf589127d819;p=kivitendo-erp.git

diff --git a/SL/IS.pm b/SL/IS.pm
index cd90a8578..402df0d28 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -382,8 +382,12 @@ sub invoice_details {
       $form->{paid} += $form->parse_amount($myconfig, $form->{"paid_$i"});
     }
   }
-
-  $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+  if($form->{taxincluded}) {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{total} - $tax, 2);
+  }
+  else {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+  }
   $yesdiscount = $form->{nodiscount_total} - $nodiscount;
   $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
   $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
@@ -707,9 +711,8 @@ sub post_invoice {
           $sth->execute || $form->dberror($query);
 
           if ($sth->fetchrow_array) {
-            $form->update_balance($dbh, "parts", "onhand",
-                                  qq|id = $form->{"id_$i"}|,
-                                  $baseqty * -1)
+            $form->update_balance($dbh, "parts", "onhand", qq|id = ?|,
+                                  $baseqty * -1, $form->{"id_$i"})
               unless $form->{shipped};
           }
           $sth->finish;
@@ -717,9 +720,8 @@ sub post_invoice {
           # record assembly item as allocated
           &process_assembly($dbh, $form, $form->{"id_$i"}, $baseqty);
         } else {
-          $form->update_balance($dbh, "parts", "onhand",
-                                qq|id = $form->{"id_$i"}|,
-                                $baseqty * -1)
+          $form->update_balance($dbh, "parts", "onhand", qq|id = ?|,
+                                $baseqty * -1, $form->{"id_$i"})
             unless $form->{shipped};
 
           $allocated = &cogs($dbh, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i);
@@ -1696,12 +1698,12 @@ sub get_customer {
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   my $query = qq|SELECT sum(a.amount - a.paid) AS dunning_amount FROM ar a 
-                 WHERE a.paid < a.amount AND a.customer_id = ? AND a.dunning_id IS NOT NULL|;
+                 WHERE a.paid < a.amount AND a.customer_id = ? AND a.dunning_config_id IS NOT NULL|;
   $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id});
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   my $query = qq|SELECT dnn.dunning_description AS max_dunning_level FROM dunning_config dnn 
-                 WHERE id in (SELECT dunning_id from ar WHERE paid < amount AND customer_id = ? AND dunning_id IS NOT NULL)
+                 WHERE id in (SELECT dunning_config_id from ar WHERE paid < amount AND customer_id = ? AND dunning_config_id IS NOT NULL)
                  ORDER BY dunning_level DESC LIMIT 1|;
   $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id});
   map { $form->{$_} = $ref->{$_} } keys %$ref;