X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=98a53536f97f6f735ccb2b2252d9991370b80d53;hb=357d134d265637fb37ed2cd47da2ce3ef44d015a;hp=a02f4fbd96b7864665b7de07113ae8cc43ccaf4f;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git

diff --git a/SL/IR.pm b/SL/IR.pm
index a02f4fbd9..5ff85e573 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -34,329 +34,348 @@
 
 package IR;
 
+use SL::AM;
+use SL::ARAP;
+use SL::Common;
+use SL::CVar;
+use SL::DATEV qw(:CONSTANTS);
+use SL::DBUtils;
+use SL::DO;
+use SL::GenericTranslations;
+use SL::IO;
+use SL::MoreCommon;
+use SL::DB::Default;
+use List::Util qw(min);
+
+use strict;
+
 sub post_invoice {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, $provided_dbh, $payments_only) = @_;
 
   # connect to database, turn off autocommit
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
 
-  my ($query, $sth, $null, $project_id);
+  my $ic_cvar_configs = CVar->get_configs(module => 'IC',
+                                          dbh    => $dbh);
+
+  my ($query, $sth, @values, $project_id);
+  my ($allocated, $taxrate, $taxamount, $taxdiff, $item);
+  my ($amount, $linetotal, $lastinventoryaccno, $lastexpenseaccno);
+  my ($netamount, $invoicediff, $expensediff) = (0, 0, 0);
   my $exchangerate = 0;
-  my $allocated;
-  my $taxrate;
-  my $taxamount;
-  my $taxdiff;
-  my $item;
+  my ($basefactor, $baseqty, @taxaccounts, $totaltax);
 
-  if ($form->{id}) {
+  my $all_units = AM->retrieve_units($myconfig, $form);
 
-    &reverse_invoice($dbh, $form);
+  if (!$payments_only) {
+    if ($form->{id}) {
+      &reverse_invoice($dbh, $form);
+    } else {
+      ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
+      do_query($form, $dbh, qq|INSERT INTO ap (id, invnumber) VALUES (?, '')|, $form->{id});
+    }
+  }
 
+  my ($currencies)    = selectfirst_array_query($form, $dbh, qq|SELECT curr FROM defaults|);
+  my $defaultcurrency = (split m/:/, $currencies)[0];
+
+  if ($form->{currency} eq $defaultcurrency) {
+    $form->{exchangerate} = 1;
   } else {
-    my $uid = rand() . time;
+    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, 'sell');
+  }
 
-    $uid .= $form->{login};
+  $form->{exchangerate} = $exchangerate || $form->parse_amount($myconfig, $form->{exchangerate});
+  $form->{exchangerate} = 1 unless ($form->{exchangerate} * 1);
 
-    $uid = substr($uid, 2, 75);
+  my %item_units;
+  my $q_item_unit = qq|SELECT unit FROM parts WHERE id = ?|;
+  my $h_item_unit = prepare_query($form, $dbh, $q_item_unit);
 
-    $query = qq|INSERT INTO ap (invnumber, employee_id)
-                VALUES ('$uid', (SELECT e.id FROM employee e
-		                 WHERE e.login = '$form->{login}'))|;
-    $dbh->do($query) || $form->dberror($query);
+  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+  my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
+  my $price_factor;
 
-    $query = qq|SELECT a.id FROM ap a
-                WHERE a.invnumber = '$uid'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+  for my $i (1 .. $form->{rowcount}) {
+    next unless $form->{"id_$i"};
 
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
-  }
+    $form->{"qty_$i"}  = $form->parse_amount($myconfig, $form->{"qty_$i"});
+    $form->{"qty_$i"} *= -1 if $form->{storno};
 
-  ($null, $form->{contact_id}) = split /--/, $form->{contact};
-  $form->{contact_id} *= 1;
+    if ( $::instance_conf->get_inventory_system eq 'periodic') {
+      # inventory account number is overwritten with expense account number, so
+      # never book incoming to inventory account but always to expense account
+      $form->{"inventory_accno_$i"} = $form->{"expense_accno_$i"}
+    };
 
-  map { $form->{$_} =~ s/\'/\'\'/g } qw(invnumber ordnumber quonumber);
+    # get item baseunit
+    if (!$item_units{$form->{"id_$i"}}) {
+      do_statement($form, $h_item_unit, $q_item_unit, $form->{"id_$i"});
+      ($item_units{$form->{"id_$i"}}) = $h_item_unit->fetchrow_array();
+    }
 
-  my ($amount, $linetotal, $lastinventoryaccno, $lastexpenseaccno);
-  my ($netamount, $invoicediff, $expensediff) = (0, 0, 0);
+    my $item_unit = $item_units{$form->{"id_$i"}};
 
-  if ($form->{currency} eq $form->{defaultcurrency}) {
-    $form->{exchangerate} = 1;
-  } else {
-    $exchangerate =
-      $form->check_exchangerate($myconfig, $form->{currency},
-                                $form->{transdate}, 'sell');
-  }
+    if (defined($all_units->{$item_unit}->{factor})
+            && ($all_units->{$item_unit}->{factor} ne '')
+            && ($all_units->{$item_unit}->{factor} * 1 != 0)) {
+      $basefactor = $all_units->{$form->{"unit_$i"}}->{factor} / $all_units->{$item_unit}->{factor};
+    } else {
+      $basefactor = 1;
+    }
+    $baseqty = $form->{"qty_$i"} * $basefactor;
 
-  $form->{exchangerate} =
-    ($exchangerate)
-    ? $exchangerate
-    : $form->parse_amount($myconfig, $form->{exchangerate});
+    @taxaccounts = split / /, $form->{"taxaccounts_$i"};
+    $taxdiff     = 0;
+    $allocated   = 0;
+    $taxrate     = 0;
 
-  for my $i (1 .. $form->{rowcount}) {
-    $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
+    $form->{"sellprice_$i"} = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+    (my $fxsellprice = $form->{"sellprice_$i"}) =~ /\.(\d+)/;
+    my $dec = length $1;
+    my $decimalplaces = ($dec > 2) ? $dec : 2;
 
-    if ($form->{"qty_$i"} != 0) {
+    map { $taxrate += $form->{"${_}_rate"} } @taxaccounts;
 
-      map { $form->{"${_}_$i"} =~ s/\'/\'\'/g }
-        qw(partnumber description unit);
+    $price_factor = $price_factors{ $form->{"price_factor_id_$i"} } || 1;
+    #####################################################################
+    # das ist aus IS.pm kopiert. schlimm. jb 7.10.2009
+    # ich würde mir wünschen, dass diese vier stellen zusammengefasst werden
+    # ... vier stellen = (einkauf + verkauf) * (maske + backend)
+    # ansonsten stolpert man immer wieder viermal statt einmal heftig
+    # und auch das undo discount formatting ist nicht besonders wartungsfreundlich
 
-      @taxaccounts = split / /, $form->{"taxaccounts_$i"};
-      $taxdiff     = 0;
-      $allocated   = 0;
-      $taxrate     = 0;
+    # keine ahnung wofür das in IS.pm gemacht wird:
+    #      my ($dec) = ($fxsellprice =~ /\.(\d+)/);
+    #  $dec = length $dec;
+    #  my $decimalplaces = ($dec > 2) ? $dec : 2;
 
-      $form->{"sellprice_$i"} =
-        $form->parse_amount($myconfig, $form->{"sellprice_$i"});
-      my $fxsellprice = $form->{"sellprice_$i"};
+    # undo discount formatting
+    $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
+    # deduct discount
+    $form->{"sellprice_$i"} = $fxsellprice * (1 - $form->{"discount_$i"});
 
-      my ($dec) = ($fxsellprice =~ /\.(\d+)/);
-      $dec = length $dec;
-      my $decimalplaces = ($dec > 2) ? $dec : 2;
+    ######################################################################
+    if ($form->{"inventory_accno_$i"}) {
 
-      map { $taxrate += $form->{"${_}_rate"} } @taxaccounts;
+      $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2);
 
-      if ($form->{"inventory_accno_$i"}) {
+      if ($form->{taxincluded}) {
 
-        $linetotal =
-          $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+        $taxamount              = $linetotal * ($taxrate / (1 + $taxrate));
+        $form->{"sellprice_$i"} = $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
 
-        if ($form->{taxincluded}) {
-          $taxamount = $linetotal * ($taxrate / (1 + $taxrate));
-          $form->{"sellprice_$i"} =
-            $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
-        } else {
-          $taxamount = $linetotal * $taxrate;
-        }
+      } else {
+        $taxamount = $linetotal * $taxrate;
+      }
 
-        $netamount += $linetotal;
-
-        if ($form->round_amount($taxrate, 7) == 0) {
-          if ($form->{taxincluded}) {
-            foreach $item (@taxaccounts) {
-              $taxamount =
-                $form->round_amount($linetotal * $form->{"${item}_rate"} /
-                                      (1 + abs($form->{"${item}_rate"})),
-                                    2);
-              $taxdiff += $taxamount;
-              $form->{amount}{ $form->{id} }{$item} -= $taxamount;
-            }
-            $form->{amount}{ $form->{id} }{ $taxaccounts[0] } += $taxdiff;
-          } else {
-            map {
-              $form->{amount}{ $form->{id} }{$_} -=
-                $linetotal * $form->{"${_}_rate"}
-            } @taxaccounts;
+      $netamount += $linetotal;
+
+      if ($form->round_amount($taxrate, 7) == 0) {
+        if ($form->{taxincluded}) {
+          foreach $item (@taxaccounts) {
+            $taxamount =
+              $form->round_amount($linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"})), 2);
+            $taxdiff                              += $taxamount;
+            $form->{amount}{ $form->{id} }{$item} -= $taxamount;
           }
+          $form->{amount}{ $form->{id} }{ $taxaccounts[0] } += $taxdiff;
+
         } else {
-          map {
-            $form->{amount}{ $form->{id} }{$_} -=
-              $taxamount * $form->{"${_}_rate"} / $taxrate
-          } @taxaccounts;
+          map { $form->{amount}{ $form->{id} }{$_} -= $linetotal * $form->{"${_}_rate"} } @taxaccounts;
         }
 
-        # add purchase to inventory, this one is without the tax!
-        $amount =
-          $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate};
-        $linetotal =
-          $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2) *
-          $form->{exchangerate};
-        $linetotal = $form->round_amount($linetotal, 2);
-
-        # this is the difference for the inventory
-        $invoicediff += ($amount - $linetotal);
-
-        $form->{amount}{ $form->{id} }{ $form->{"inventory_accno_$i"} } -=
-          $linetotal;
-
-        # adjust and round sellprice
-        $form->{"sellprice_$i"} =
-          $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate},
-                              $decimalplaces);
-
-        # update parts table
-        $query = qq|UPDATE parts SET
-		    lastcost = $form->{"sellprice_$i"}
-	            WHERE id = $form->{"id_$i"}|;
-
-        $dbh->do($query) || $form->dberror($query);
-
-        $form->update_balance($dbh, "parts", "onhand",
-                              qq|id = $form->{"id_$i"}|,
-                              $form->{"qty_$i"})
-          unless $form->{shipped};
-
-        # check if we sold the item already and
-        # make an entry for the expense and inventory
-        $query = qq|SELECT i.id, i.qty, i.allocated, i.trans_id,
-		    p.inventory_accno_id, p.expense_accno_id, a.transdate
-		    FROM invoice i, ar a, parts p
-		    WHERE i.parts_id = p.id
-	            AND i.parts_id = $form->{"id_$i"}
-		    AND (i.qty + i.allocated) > 0
-		    AND i.trans_id = a.id
-		    ORDER BY transdate|;
-        $sth = $dbh->prepare($query);
-        $sth->execute || $form->dberror($query);
-
-        my $totalqty = $form->{"qty_$i"};
-
-        while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-          my $qty = $ref->{qty} + $ref->{allocated};
-
-          if (($qty - $totalqty) > 0) {
-            $qty = $totalqty;
-          }
+      } else {
+        map { $form->{amount}{ $form->{id} }{$_} -= $taxamount * $form->{"${_}_rate"} / $taxrate } @taxaccounts;
+      }
 
-          $linetotal = $form->round_amount($form->{"sellprice_$i"} * $qty, 2);
+      # add purchase to inventory, this one is without the tax!
+      $amount    = $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate} / $price_factor;
+      $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2) * $form->{exchangerate};
+      $linetotal = $form->round_amount($linetotal, 2);
+
+      # this is the difference for the inventory
+      $invoicediff += ($amount - $linetotal);
+
+      $form->{amount}{ $form->{id} }{ $form->{"inventory_accno_$i"} } -= $linetotal;
+
+      # adjust and round sellprice
+      $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate}, $decimalplaces);
+
+      $lastinventoryaccno = $form->{"inventory_accno_$i"};
+
+      next if $payments_only;
+
+      # update parts table by setting lastcost to current price, don't allow negative values by using abs
+      $query = qq|UPDATE parts SET lastcost = ? WHERE id = ?|;
+      @values = (abs($form->{"sellprice_$i"} / $basefactor), conv_i($form->{"id_$i"}));
+      do_query($form, $dbh, $query, @values);
+
+      # check if we sold the item already and
+      # make an entry for the expense and inventory
+      $query =
+        qq|SELECT i.id, i.qty, i.allocated, i.trans_id, i.base_qty,
+             p.inventory_accno_id, p.expense_accno_id, a.transdate
+           FROM invoice i, ar a, parts p
+           WHERE (i.parts_id = p.id)
+             AND (i.parts_id = ?)
+             AND ((i.base_qty + i.allocated) > 0)
+             AND (i.trans_id = a.id)
+           ORDER BY transdate|;
+           # ORDER BY transdate guarantees FIFO
+
+# sold two items without having bought them yet, example result of query:
+# id | qty | allocated | trans_id | inventory_accno_id | expense_accno_id | transdate
+# ---+-----+-----------+----------+--------------------+------------------+------------
+#  9 |   2 |         0 |        9 |                 15 |              151 | 2011-01-05
+
+# base_qty + allocated > 0 if article has already been sold but not bought yet
+
+# select qty,allocated,base_qty,sellprice from invoice where trans_id = 9;
+#  qty | allocated | base_qty | sellprice
+# -----+-----------+----------+------------
+#    2 |         0 |        2 | 1000.00000
+
+      $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id_$i"}));
+
+      my $totalqty = $baseqty;
+
+      while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+        my $qty    = min $totalqty, ($ref->{base_qty} + $ref->{allocated});
+        $linetotal = $form->round_amount(($form->{"sellprice_$i"} * $qty) / $basefactor, 2);
+
+        if  ( $::instance_conf->get_inventory_system eq 'perpetual' ) {
+        # Warenbestandsbuchungen nur bei Bestandsmethode
 
           if ($ref->{allocated} < 0) {
 
-            # we have an entry for it already, adjust amount
-            $form->update_balance(
-              $dbh,
-              "acc_trans",
-              "amount",
-              qq|trans_id = $ref->{trans_id} AND chart_id = $ref->{inventory_accno_id} AND transdate = '$ref->{transdate}'|,
-              $linetotal);
+# we have an entry for it already, adjust amount
+            $form->update_balance($dbh, "acc_trans", "amount",
+                qq|    (trans_id = $ref->{trans_id})
+                AND (chart_id = $ref->{inventory_accno_id})
+                AND (transdate = '$ref->{transdate}')|,
+                $linetotal);
 
-            $form->update_balance(
-              $dbh,
-              "acc_trans",
-              "amount",
-              qq|trans_id = $ref->{trans_id} AND chart_id = $ref->{expense_accno_id} AND transdate = '$ref->{transdate}'|,
-              $linetotal * -1);
+            $form->update_balance($dbh, "acc_trans", "amount",
+                qq|    (trans_id = $ref->{trans_id})
+                AND (chart_id = $ref->{expense_accno_id})
+                AND (transdate = '$ref->{transdate}')|,
+                $linetotal * -1);
 
-          } else {
+          } elsif ($linetotal != 0) {
 
+            # allocated >= 0
             # add entry for inventory, this one is for the sold item
-            if ($linetotal != 0) {
-              $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, 
-			  transdate)
-			  VALUES ($ref->{trans_id}, $ref->{inventory_accno_id},
-			  $linetotal, '$ref->{transdate}')|;
-              $dbh->do($query) || $form->dberror($query);
-
-              # add expense
-              $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, 
-			  transdate, taxkey)
-			  VALUES ($ref->{trans_id}, $ref->{expense_accno_id},
-			  | . ($linetotal * -1) . qq|, '$ref->{transdate}', 
-                          (SELECT taxkey from tax WHERE chart_id = $ref->{expense_accno_id}))|;
-              $dbh->do($query) || $form->dberror($query);
-            }
+            $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?, (SELECT taxkey_id FROM chart WHERE id = ?),
+                                (SELECT tax_id FROM taxkeys WHERE taxkey_id= (SELECT taxkey_id  FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|;
+            @values = ($ref->{trans_id},  $ref->{inventory_accno_id}, $linetotal, $ref->{transdate}, $ref->{inventory_accno_id}, $ref->{inventory_accno_id}, $ref->{transdate});
+            do_query($form, $dbh, $query, @values);
+
+# add expense
+            $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?, (SELECT taxkey from tax WHERE chart_id = ?),
+                                (SELECT tax_id FROM taxkeys WHERE taxkey_id= (SELECT taxkey_id  FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|;
+            @values = ($ref->{trans_id},  $ref->{expense_accno_id}, ($linetotal * -1), $ref->{transdate}, $ref->{expense_accno_id}, $ref->{expense_accno_id}, $ref->{transdate});
+            do_query($form, $dbh, $query, @values);
           }
+        };
 
-          # update allocated for sold item
-          $form->update_balance($dbh, "invoice", "allocated",
-                                qq|id = $ref->{id}|,
-                                $qty * -1);
+        # update allocated for sold item
+        $form->update_balance($dbh, "invoice", "allocated", qq|id = $ref->{id}|, $qty * -1);
 
-          $allocated += $qty;
+        $allocated += $qty;
 
-          last if (($totalqty -= $qty) <= 0);
-        }
+        last if ($totalqty -= $qty) <= 0;
+      }
 
-        $sth->finish;
+      $sth->finish();
 
-        $lastinventoryaccno = $form->{"inventory_accno_$i"};
+    } else {                    # if ($form->{"inventory_accno_id_$i"})
+      # part doesn't have an inventory_accno_id
+      # lastcost of the part is updated at the end
 
-      } else {
+      $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2);
 
-        $linetotal =
-          $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+      if ($form->{taxincluded}) {
+        $taxamount              = $linetotal * ($taxrate / (1 + $taxrate));
+        $form->{"sellprice_$i"} = $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
 
-        if ($form->{taxincluded}) {
-          $taxamount = $linetotal * ($taxrate / (1 + $taxrate));
+      } else {
+        $taxamount = $linetotal * $taxrate;
+      }
 
-          $form->{"sellprice_$i"} =
-            $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
-        } else {
-          $taxamount = $linetotal * $taxrate;
-        }
+      $netamount += $linetotal;
 
-        $netamount += $linetotal;
-
-        if ($form->round_amount($taxrate, 7) == 0) {
-          if ($form->{taxincluded}) {
-            foreach $item (@taxaccounts) {
-              $taxamount =
-                $linetotal * $form->{"${item}_rate"} /
-                (1 + abs($form->{"${item}_rate"}));
-              $totaltax += $taxamount;
-              $form->{amount}{ $form->{id} }{$item} -= $taxamount;
-            }
-          } else {
-            map {
-              $form->{amount}{ $form->{id} }{$_} -=
-                $linetotal * $form->{"${_}_rate"}
-            } @taxaccounts;
+      if ($form->round_amount($taxrate, 7) == 0) {
+        if ($form->{taxincluded}) {
+          foreach $item (@taxaccounts) {
+            $taxamount = $linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"}));
+            $totaltax += $taxamount;
+            $form->{amount}{ $form->{id} }{$item} -= $taxamount;
           }
         } else {
-          map {
-            $form->{amount}{ $form->{id} }{$_} -=
-              $taxamount * $form->{"${_}_rate"} / $taxrate
-          } @taxaccounts;
+          map { $form->{amount}{ $form->{id} }{$_} -= $linetotal * $form->{"${_}_rate"} } @taxaccounts;
         }
+      } else {
+        map { $form->{amount}{ $form->{id} }{$_} -= $taxamount * $form->{"${_}_rate"} / $taxrate } @taxaccounts;
+      }
 
-        $amount =
-          $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate};
-        $linetotal =
-          $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2) *
-          $form->{exchangerate};
-        $linetotal = $form->round_amount($linetotal, 2);
-
-        # this is the difference for expense
-        $expensediff += ($amount - $linetotal);
-
-        # add amount to expense
-        $form->{amount}{ $form->{id} }{ $form->{"expense_accno_$i"} } -=
-          $linetotal;
+      $amount    = $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate} / $price_factor;
+      $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2) * $form->{exchangerate};
+      $linetotal = $form->round_amount($linetotal, 2);
 
-        $lastexpenseaccno = $form->{"expense_accno_$i"};
+      # this is the difference for expense
+      $expensediff += ($amount - $linetotal);
 
-        # adjust and round sellprice
-        $form->{"sellprice_$i"} =
-          $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate},
-                              $decimalplaces);
+      # add amount to expense
+      $form->{amount}{ $form->{id} }{ $form->{"expense_accno_$i"} } -= $linetotal;
 
-        # update lastcost
-        $query = qq|UPDATE parts SET
-		    lastcost = $form->{"sellprice_$i"}
-	            WHERE id = $form->{"id_$i"}|;
+      $lastexpenseaccno = $form->{"expense_accno_$i"};
 
-        $dbh->do($query) || $form->dberror($query);
+      # adjust and round sellprice
+      $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate}, $decimalplaces);
 
-      }
+      next if $payments_only;
 
-      $project_id = 'NULL';
-      if ($form->{"projectnumber_$i"}) {
-        $project_id = $form->{"projectnumber_$i"};
-      }
-      print(STDERR $project_id, " Project_id\n");
-      $deliverydate =
-        ($form->{"deliverydate_$i"})
-        ? qq|'$form->{"deliverydate_$i"}'|
-        : "NULL";
-
-      # save detail record in invoice table
-      $query = qq|INSERT INTO invoice (trans_id, parts_id, description, qty,
-                  sellprice, fxsellprice, allocated, unit, deliverydate,
-		  project_id, serialnumber)
-		  VALUES ($form->{id}, $form->{"id_$i"},
-		  '$form->{"description_$i"}', | . ($form->{"qty_$i"} * -1) . qq|,
-		  $form->{"sellprice_$i"}, $fxsellprice, $allocated,
-		  '$form->{"unit_$i"}', $deliverydate, (SELECT id FROM project WHERE projectnumber = '$project_id'),
-		  '$form->{"serialnumber_$i"}')|;
-      $dbh->do($query) || $form->dberror($query);
-      print(STDERR $query, "\n\n");
+      # update lastcost
+      $query = qq|UPDATE parts SET lastcost = ? WHERE id = ?|;
+      do_query($form, $dbh, $query, $form->{"sellprice_$i"} / $basefactor, conv_i($form->{"id_$i"}));
     }
+
+    next if $payments_only;
+
+    # save detail record in invoice table
+    my ($invoice_id) = selectfirst_array_query($form, $dbh, qq|SELECT nextval('invoiceid')|);
+
+    $query =
+      qq|INSERT INTO invoice (id, trans_id, parts_id, description, longdescription, qty, base_qty,
+                              sellprice, fxsellprice, discount, allocated, unit, deliverydate,
+                              project_id, serialnumber, price_factor_id, price_factor, marge_price_factor)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT factor FROM price_factors WHERE id = ?), ?)|;
+    @values = ($invoice_id, conv_i($form->{id}), conv_i($form->{"id_$i"}),
+               $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"} * -1,
+               $baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated,
+               $form->{"unit_$i"}, conv_date($form->{deliverydate}),
+               conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"},
+               conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}));
+    do_query($form, $dbh, $query, @values);
+
+    CVar->save_custom_variables(module       => 'IC',
+                                sub_module   => 'invoice',
+                                trans_id     => $invoice_id,
+                                configs      => $ic_cvar_configs,
+                                variables    => $form,
+                                name_prefix  => 'ic_',
+                                name_postfix => "_$i",
+                                dbh          => $dbh);
   }
 
+  $h_item_unit->finish();
+
+  $project_id = conv_i($form->{"globalproject_id"});
+
   $form->{datepaid} = $form->{invdate};
 
   # all amounts are in natural state, netamount includes the taxes
@@ -365,9 +384,9 @@ sub post_invoice {
 
   # total payments
   for my $i (1 .. $form->{paidaccounts}) {
-    $form->{"paid_$i"} = $form->parse_amount($myconfig, $form->{"paid_$i"});
-    $form->{paid} += $form->{"paid_$i"};
-    $form->{datepaid} = $form->{"datepaid_$i"} if ($form->{"datepaid_$i"});
+    $form->{"paid_$i"}  = $form->parse_amount($myconfig, $form->{"paid_$i"});
+    $form->{paid}      += $form->{"paid_$i"};
+    $form->{datepaid}   = $form->{"datepaid_$i"} if $form->{"datepaid_$i"};
   }
 
   my ($tax, $paiddiff) = (0, 0);
@@ -382,238 +401,322 @@ sub post_invoice {
     $netamount = $amount;
 
     foreach $item (split / /, $form->{taxaccounts}) {
-      $amount = $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate};
+      $amount                               = $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate};
       $form->{amount}{ $form->{id} }{$item} = $form->round_amount($amount, 2);
-      $amount = $form->{amount}{ $form->{id} }{$item} * -1;
-      $tax += $amount;
+
+      $amount     = $form->{amount}{ $form->{id} }{$item} * -1;
+      $tax       += $amount;
       $netamount -= $amount;
     }
 
     $invoicediff += $paiddiff;
     $expensediff += $paiddiff;
 
-    ######## this only applies to tax included
-    if ($lastinventoryaccno) {
-      $form->{amount}{ $form->{id} }{$lastinventoryaccno} -= $invoicediff;
-    }
-    if ($lastexpenseaccno) {
-      $form->{amount}{ $form->{id} }{$lastexpenseaccno} -= $expensediff;
-    }
+######## this only applies to tax included
+
+    # in the sales invoice case rounding errors only have to be corrected for
+    # income accounts, it is enough to add the total rounding error to one of
+    # the income accounts, with the one assigned to the last row being used
+    # (lastinventoryaccno)
+
+    # in the purchase invoice case rounding errors may be split between
+    # inventory accounts and expense accounts. After rounding, an error of 1
+    # cent is introduced if the total rounding error exceeds 0.005. The total
+    # error is made up of $invoicediff and $expensediff, however, so if both
+    # values are below 0.005, but add up to a total >= 0.005, correcting
+    # lastinventoryaccno and lastexpenseaccno separately has no effect after
+    # rounding. This caused bug 1579. Therefore when the combined total exceeds
+    # 0.005, but neither do individually, the account with the larger value
+    # shall receive the total rounding error, and the next time it is rounded
+    # the 1 cent correction will be introduced.
+
+    $form->{amount}{ $form->{id} }{$lastinventoryaccno} -= $invoicediff if $lastinventoryaccno;
+    $form->{amount}{ $form->{id} }{$lastexpenseaccno}   -= $expensediff if $lastexpenseaccno;
+
+    if ( (abs($expensediff)+abs($invoicediff)) >= 0.005 and abs($expensediff) < 0.005 and abs($invoicediff) < 0.005 ) {
+
+      # in total the rounding error adds up to 1 cent effectively, correct the
+      # larger of the two numbers
+
+      if ( abs($form->{amount}{ $form->{id} }{$lastinventoryaccno}) > abs($form->{amount}{ $form->{id} }{$lastexpenseaccno}) ) {
+        # $invoicediff has already been deducted, now also deduct expensediff
+        $form->{amount}{ $form->{id} }{$lastinventoryaccno}   -= $expensediff;
+      } else {
+        # expensediff has already been deducted, now also deduct invoicediff
+        $form->{amount}{ $form->{id} }{$lastexpenseaccno}   -= $invoicediff;
+      };
+    };
 
   } else {
     $amount    = $form->round_amount($netamount * $form->{exchangerate}, 2);
     $paiddiff  = $amount - $netamount * $form->{exchangerate};
     $netamount = $amount;
+
     foreach my $item (split / /, $form->{taxaccounts}) {
-      $form->{amount}{ $form->{id} }{$item} =
-        $form->round_amount($form->{amount}{ $form->{id} }{$item}, 2);
-      $amount =
-        $form->round_amount(
-            $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate} * -1,
-            2);
-      $paiddiff +=
-        $amount - $form->{amount}{ $form->{id} }{$item} *
-        $form->{exchangerate} * -1;
-      $form->{amount}{ $form->{id} }{$item} =
-        $form->round_amount($amount * -1, 2);
-      $amount = $form->{amount}{ $form->{id} }{$item} * -1;
-      $tax += $amount;
+      $form->{amount}{ $form->{id} }{$item}  = $form->round_amount($form->{amount}{ $form->{id} }{$item}, 2);
+      $amount                                = $form->round_amount( $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate} * -1, 2);
+      $paiddiff                             += $amount - $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate} * -1;
+      $form->{amount}{ $form->{id} }{$item}  = $form->round_amount($amount * -1, 2);
+      $amount                                = $form->{amount}{ $form->{id} }{$item} * -1;
+      $tax                                  += $amount;
     }
   }
 
   $form->{amount}{ $form->{id} }{ $form->{AP} } = $netamount + $tax;
 
-  if ($form->{paid} != 0) {
-    $form->{paid} =
-      $form->round_amount($form->{paid} * $form->{exchangerate} + $paiddiff,
-                          2);
-  }
 
-  # update exchangerate
-  if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, 0,
-                               $form->{exchangerate});
-  }
+  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate} + $paiddiff, 2) if $form->{paid} != 0;
 
-  # record acc_trans transactions
+# update exchangerate
+
+  $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, 0, $form->{exchangerate})
+    if ($form->{currency} ne $defaultcurrency) && !$exchangerate;
+
+# record acc_trans transactions
   foreach my $trans_id (keys %{ $form->{amount} }) {
     foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
-      if (
-          ($form->{amount}{$trans_id}{$accno} =
-           $form->round_amount($form->{amount}{$trans_id}{$accno}, 2)
-          ) != 0
-        ) {
-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, 
-		    transdate, taxkey)
-		    VALUES ($trans_id, (SELECT c.id FROM chart c
-		                         WHERE c.accno = '$accno'),
-		    $form->{amount}{$trans_id}{$accno}, '$form->{invdate}',
-		    (SELECT taxkey_id  FROM chart WHERE accno = '$accno'))|;
-        $dbh->do($query) || $form->dberror($query);
-      }
+      $form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2);
+
+
+      next if $payments_only || !$form->{amount}{$trans_id}{$accno};
+
+      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id)
+                  VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+                  (SELECT taxkey_id  FROM chart WHERE accno = ?), ?,
+                  (SELECT tax_id FROM taxkeys WHERE taxkey_id= (SELECT taxkey_id  FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|;
+      @values = ($trans_id, $accno, $form->{amount}{$trans_id}{$accno},
+                 conv_date($form->{invdate}), $accno, $project_id, $accno, conv_date($form->{invdate}));
+      do_query($form, $dbh, $query, @values);
     }
   }
 
   # deduct payment differences from paiddiff
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {
-      $amount =
-        $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
+      $amount    = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
       $paiddiff -= $amount - $form->{"paid_$i"} * $form->{exchangerate};
     }
   }
 
   # force AP entry if 0
-  $form->{amount}{ $form->{id} }{ $form->{AP} } = $form->{paid}
-    if ($form->{amount}{ $form->{id} }{ $form->{AP} } == 0);
+
+  $form->{amount}{ $form->{id} }{ $form->{AP} } = $form->{paid} if $form->{amount}{$form->{id}}{$form->{AP}} == 0;
 
   # record payments and offsetting AP
   for my $i (1 .. $form->{paidaccounts}) {
+    if ($form->{"acc_trans_id_$i"}
+        && $payments_only
+        && (SL::DB::Default->get->payments_changeable == 0)) {
+      next;
+    }
 
-    if ($form->{"paid_$i"} != 0) {
-      my ($accno) = split /--/, $form->{"AP_paid_$i"};
-      $form->{"datepaid_$i"} = $form->{invdate}
-        unless ($form->{"datepaid_$i"});
-      $form->{datepaid} = $form->{"datepaid_$i"};
-
-      $amount = (
-                 $form->round_amount(
-                      $form->{"paid_$i"} * $form->{exchangerate} + $paiddiff, 2
-                 )
-      ) * -1;
-
-      # record AP
-
-      if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-		    transdate)
-		    VALUES ($form->{id}, (SELECT c.id FROM chart c
-					WHERE c.accno = '$form->{AP}'),
-		    $amount, '$form->{"datepaid_$i"}')|;
-        $dbh->do($query) || $form->dberror($query);
-      }
+    next if $form->{"paid_$i"} == 0;
 
-      # record payment
+    my ($accno)            = split /--/, $form->{"AP_paid_$i"};
+    $form->{"datepaid_$i"} = $form->{invdate} unless ($form->{"datepaid_$i"});
+    $form->{datepaid}      = $form->{"datepaid_$i"};
 
-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                  source, memo)
-                  VALUES ($form->{id}, (SELECT c.id FROM chart c
-		                      WHERE c.accno = '$accno'),
-                  $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
-		  '$form->{"source_$i"}', '$form->{"memo_$i"}')|;
-      $dbh->do($query) || $form->dberror($query);
+    $amount = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate} + $paiddiff, 2) * -1;
 
-      $exchangerate = 0;
+    # record AP
+    if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
+      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id)
+                  VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+                          (SELECT taxkey_id FROM chart WHERE accno = ?), ?,
+                          (SELECT tax_id FROM taxkeys WHERE taxkey_id= (SELECT taxkey_id  FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|;
+      @values = (conv_i($form->{id}), $form->{AP}, $amount,
+                 $form->{"datepaid_$i"}, $form->{AP}, $project_id, $form->{AP}, conv_date($form->{"datepaid_$i"}));
+      do_query($form, $dbh, $query, @values);
+    }
 
-      if ($form->{currency} eq $form->{defaultcurrency}) {
-        $form->{"exchangerate_$i"} = 1;
-      } else {
-        $exchangerate =
-          $form->check_exchangerate($myconfig, $form->{currency},
-                                    $form->{"datepaid_$i"}, 'sell');
-
-        $form->{"exchangerate_$i"} =
-          ($exchangerate)
-          ? $exchangerate
-          : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
-      }
+    # record payment
+    my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
+
+    $query =
+      qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, taxkey, project_id, tax_id)
+                VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?,
+                (SELECT taxkey_id FROM chart WHERE accno = ?), ?,
+                (SELECT tax_id FROM taxkeys WHERE taxkey_id= (SELECT taxkey_id  FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|;
+    @values = (conv_i($form->{id}), $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"},
+               $gldate, $form->{"source_$i"}, $form->{"memo_$i"}, $accno, $project_id, $accno, conv_date($form->{"datepaid_$i"}));
+    do_query($form, $dbh, $query, @values);
+
+    $exchangerate = 0;
+
+    if ($form->{currency} eq $defaultcurrency) {
+      $form->{"exchangerate_$i"} = 1;
+    } else {
+      $exchangerate              = $form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+      $form->{"exchangerate_$i"} = $exchangerate || $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
+    }
 
-      # exchangerate difference
-      $form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=
-        $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) + $paiddiff;
-
-      # gain/loss
-      $amount =
-        ($form->{"paid_$i"} * $form->{exchangerate}) -
-        ($form->{"paid_$i"} * $form->{"exchangerate_$i"});
-      if ($amount > 0) {
-        $form->{fx}{ $form->{fxgain_accno} }{ $form->{"datepaid_$i"} } +=
-          $amount;
-      } else {
-        $form->{fx}{ $form->{fxloss_accno} }{ $form->{"datepaid_$i"} } +=
-          $amount;
-      }
+    # exchangerate difference
+    $form->{fx}{$accno}{ $form->{"datepaid_$i"} } += $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) + $paiddiff;
+
+    # gain/loss
+    $amount =
+      ($form->{"paid_$i"} * $form->{exchangerate}) -
+      ($form->{"paid_$i"} * $form->{"exchangerate_$i"});
+    if ($amount > 0) {
+      $form->{fx}{ $form->{fxgain_accno} }{ $form->{"datepaid_$i"} } += $amount;
+    } else {
+      $form->{fx}{ $form->{fxloss_accno} }{ $form->{"datepaid_$i"} } += $amount;
+    }
 
-      $paiddiff = 0;
+    $paiddiff = 0;
 
-      # update exchange rate
-      if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-        $form->update_exchangerate($dbh, $form->{currency},
-                                   $form->{"datepaid_$i"},
-                                   0, $form->{"exchangerate_$i"});
-      }
-    }
+    # update exchange rate
+    $form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, 0, $form->{"exchangerate_$i"})
+      if ($form->{currency} ne $defaultcurrency) && !$exchangerate;
   }
 
   # record exchange rate differences and gains/losses
   foreach my $accno (keys %{ $form->{fx} }) {
     foreach my $transdate (keys %{ $form->{fx}{$accno} }) {
-      if (
-          ($form->{fx}{$accno}{$transdate} =
-           $form->round_amount($form->{fx}{$accno}{$transdate}, 2)
-          ) != 0
-        ) {
-
-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-	            transdate, cleared, fx_transaction)
-	            VALUES ($form->{id}, (SELECT c.id FROM chart c
-		                        WHERE c.accno = '$accno'),
-                    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1')|;
-        $dbh->do($query) || $form->dberror($query);
-      }
+      $form->{fx}{$accno}{$transdate} = $form->round_amount($form->{fx}{$accno}{$transdate}, 2);
+      next if ($form->{fx}{$accno}{$transdate} == 0);
+
+      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, taxkey, project_id, tax_id)
+                  VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, '0', '1', 0, ?,
+                  (SELECT tax_id FROM taxkeys WHERE taxkey_id= (SELECT taxkey_id  FROM chart WHERE accno = ?) AND startdate <= ? ORDER BY startdate DESC LIMIT 1))|;
+      @values = (conv_i($form->{id}), $accno, $form->{fx}{$accno}{$transdate}, conv_date($transdate), $project_id, $accno, $form->{fx}{$accno}{$transdate});
+      do_query($form, $dbh, $query, @values);
     }
   }
 
+  IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
+
+  if ($payments_only) {
+    $query = qq|UPDATE ap SET paid = ? WHERE id = ?|;
+    do_query($form, $dbh, $query, $form->{paid}, conv_i($form->{id}));
+
+    if (!$provided_dbh) {
+      $dbh->commit();
+      $dbh->disconnect();
+    }
+
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
   $amount = $netamount + $tax;
 
   # set values which could be empty
-  $form->{taxincluded} *= 1;
-  my $datepaid = ($form->{paid})    ? qq|'$form->{datepaid}'| : "NULL";
-  my $duedate  = ($form->{duedate}) ? qq|'$form->{duedate}'|  : "NULL";
-
-  ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
+  my $taxzone_id         = $form->{taxzone_id} * 1;
+
+  # Seit neuestem wird die department_id schon übergeben UND $form->department nicht mehr
+  # korrekt zusammengebaut. Sehr wahrscheinlich beim Umstieg auf T8 kaputt gegangen
+  # Ich lass den Code von 2005 erstmal noch stehen ;-) jb 03-2011
+  # copy & paste von IS.pm
+  if (!$form->{department_id}){
+    $form->{department_id} = (split /--/, $form->{department})[1];
+  }
+  $form->{invnumber}     = $form->{id} unless $form->{invnumber};
 
-  $form->{invnumber} = $form->{id} unless $form->{invnumber};
+  $taxzone_id = 0 if (3 < $taxzone_id) || (0 > $taxzone_id);
 
   # save AP record
-  $query = qq|UPDATE ap set
-              invnumber = '$form->{invnumber}',
-	      ordnumber = '$form->{ordnumber}',
-	      quonumber = '$form->{quonumber}',
-              transdate = '$form->{invdate}',
-              vendor_id = $form->{vendor_id},
-              amount = $amount,
-              netamount = $netamount,
-              paid = $form->{paid},
-	      datepaid = $datepaid,
-	      duedate = $duedate,
-	      invoice = '1',
-	      taxincluded = '$form->{taxincluded}',
-	      notes = '$form->{notes}',
-	      intnotes = '$form->{intnotes}',
-	      curr = '$form->{currency}',
-	      department_id = $form->{department_id},
-              cp_id = $form->{contact_id}
-              WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|UPDATE ap SET
+                invnumber    = ?, ordnumber   = ?, quonumber     = ?, transdate   = ?,
+                orddate      = ?, quodate     = ?, vendor_id     = ?, amount      = ?,
+                netamount    = ?, paid        = ?, duedate       = ?,
+                invoice      = ?, taxzone_id  = ?, notes         = ?, taxincluded = ?,
+                intnotes     = ?, curr        = ?, storno_id     = ?, storno      = ?,
+                cp_id        = ?, employee_id = ?, department_id = ?,
+                globalproject_id = ?
+              WHERE id = ?|;
+  @values = (
+                $form->{invnumber},          $form->{ordnumber},           $form->{quonumber},      conv_date($form->{invdate}),
+      conv_date($form->{orddate}), conv_date($form->{quodate}),     conv_i($form->{vendor_id}),               $amount,
+                $netamount,                  $form->{paid},      conv_date($form->{duedate}),
+            '1',                             $taxzone_id,                  $form->{notes},          $form->{taxincluded} ? 't' : 'f',
+                $form->{intnotes},           $form->{currency},     conv_i($form->{storno_id}),     $form->{storno}      ? 't' : 'f',
+         conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}),
+         conv_i($form->{globalproject_id}),
+         conv_i($form->{id})
+  );
+  do_query($form, $dbh, $query, @values);
+
+  if ($form->{storno}) {
+    $query = qq|UPDATE ap SET paid = paid + amount WHERE id = ?|;
+    do_query($form, $dbh, $query, conv_i($form->{storno_id}));
+
+    $query = qq|UPDATE ap SET storno = 't' WHERE id = ?|;
+    do_query($form, $dbh, $query, conv_i($form->{storno_id}));
+
+    $query = qq!UPDATE ap SET intnotes = ? || intnotes WHERE id = ?!;
+    do_query($form, $dbh, $query, "Rechnung storniert am $form->{invdate} ", conv_i($form->{storno_id}));
+
+    $query = qq|UPDATE ap SET paid = amount WHERE id = ?|;
+    do_query($form, $dbh, $query, conv_i($form->{id}));
+  }
+
 
   # add shipto
   $form->{name} = $form->{vendor};
-  $form->{name} =~ s/--$form->{vendor_id}//;
-  $form->add_shipto($dbh, $form->{id});
+  $form->{name} =~ s/--\Q$form->{vendor_id}\E//;
+  $form->add_shipto($dbh, $form->{id}, "AP");
 
   # delete zero entries
-  $query = qq|DELETE FROM acc_trans
-              WHERE amount = 0|;
-  $dbh->do($query) || $form->dberror($query);
-
-  if ($form->{webdav}) {
-    &webdav_folder($myconfig, $form);
+  do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE amount = 0|);
+
+  Common::webdav_folder($form);
+
+  # Link this record to the records it was created from.
+  RecordLinks->create_links('dbh'        => $dbh,
+                            'mode'       => 'ids',
+                            'from_table' => 'oe',
+                            'from_ids'   => $form->{convert_from_oe_ids},
+                            'to_table'   => 'ap',
+                            'to_id'      => $form->{id},
+    );
+  delete $form->{convert_from_oe_ids};
+
+  my @convert_from_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{convert_from_do_ids};
+  if (scalar @convert_from_do_ids) {
+    DO->close_orders('dbh' => $dbh,
+                     'ids' => \@convert_from_do_ids);
+
+    RecordLinks->create_links('dbh'        => $dbh,
+                              'mode'       => 'ids',
+                              'from_table' => 'delivery_orders',
+                              'from_ids'   => \@convert_from_do_ids,
+                              'to_table'   => 'ap',
+                              'to_id'      => $form->{id},
+      );
+  }
+  delete $form->{convert_from_do_ids};
+
+  ARAP->close_orders_if_billed('dbh'     => $dbh,
+                               'arap_id' => $form->{id},
+                               'table'   => 'ap',);
+
+  # safety check datev export
+  if ($::instance_conf->get_datev_check_on_purchase_invoice) {
+    my $transdate = $::form->{invdate} ? DateTime->from_lxoffice($::form->{invdate}) : undef;
+    $transdate  ||= DateTime->today;
+
+    my $datev = SL::DATEV->new(
+      exporttype => DATEV_ET_BUCHUNGEN,
+      format     => DATEV_FORMAT_KNE,
+      dbh        => $dbh,
+      from       => $transdate,
+      to         => $transdate,
+    );
+
+    $datev->export;
+
+    if ($datev->errors) {
+      $dbh->rollback;
+      die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+    }
   }
 
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  my $rc = 1;
+  if (!$provided_dbh) {
+    $rc = $dbh->commit();
+    $dbh->disconnect();
+  }
 
   $main::lxdebug->leave_sub();
 
@@ -626,85 +729,74 @@ sub reverse_invoice {
   my ($dbh, $form) = @_;
 
   # reverse inventory items
-  my $query = qq|SELECT i.parts_id, p.inventory_accno_id, p.expense_accno_id,
-                 i.qty, i.allocated, i.sellprice
-                 FROM invoice i, parts p
-		 WHERE i.parts_id = p.id
-                 AND i.trans_id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query =
+    qq|SELECT i.parts_id, p.inventory_accno_id, p.expense_accno_id, i.qty, i.allocated, i.sellprice
+       FROM invoice i, parts p
+       WHERE (i.parts_id = p.id)
+         AND (i.trans_id = ?)|;
+  my $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
 
   my $netamount = 0;
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     $netamount += $form->round_amount($ref->{sellprice} * $ref->{qty} * -1, 2);
 
-    if ($ref->{inventory_accno_id}) {
-
-      # update onhand
-      $form->update_balance($dbh, "parts", "onhand", qq|id = $ref->{parts_id}|,
-                            $ref->{qty});
-
-      # if $ref->{allocated} > 0 than we sold that many items
-      if ($ref->{allocated} > 0) {
-
-        # get references for sold items
-        $query = qq|SELECT i.id, i.trans_id, i.allocated, a.transdate
-	            FROM invoice i, ar a
-		    WHERE i.parts_id = $ref->{parts_id}
-		    AND i.allocated < 0
-		    AND i.trans_id = a.id
-		    ORDER BY transdate DESC|;
-        my $sth = $dbh->prepare($query);
-        $sth->execute || $form->dberror($query);
-
-        while (my $pthref = $sth->fetchrow_hashref(NAME_lc)) {
-          my $qty = $ref->{allocated};
-          if (($ref->{allocated} + $pthref->{allocated}) > 0) {
-            $qty = $pthref->{allocated} * -1;
-          }
+    next unless $ref->{inventory_accno_id};
+
+    # if $ref->{allocated} > 0 than we sold that many items
+    next if ($ref->{allocated} <= 0);
+
+    # get references for sold items
+    $query =
+      qq|SELECT i.id, i.trans_id, i.allocated, a.transdate
+         FROM invoice i, ar a
+         WHERE (i.parts_id = ?)
+           AND (i.allocated < 0)
+           AND (i.trans_id = a.id)
+         ORDER BY transdate DESC|;
+      my $sth2 = prepare_execute_query($form, $dbh, $query, $ref->{parts_id});
+
+      while (my $pthref = $sth2->fetchrow_hashref("NAME_lc")) {
+        my $qty = $ref->{allocated};
+        if (($ref->{allocated} + $pthref->{allocated}) > 0) {
+          $qty = $pthref->{allocated} * -1;
+        }
 
-          my $amount = $form->round_amount($ref->{sellprice} * $qty, 2);
+        my $amount = $form->round_amount($ref->{sellprice} * $qty, 2);
 
-          #adjust allocated
-          $form->update_balance($dbh, "invoice", "allocated",
-                                qq|id = $pthref->{id}|, $qty);
+        #adjust allocated
+        $form->update_balance($dbh, "invoice", "allocated", qq|id = $pthref->{id}|, $qty);
 
-          $form->update_balance(
-            $dbh,
-            "acc_trans",
-            "amount",
-            qq|trans_id = $pthref->{trans_id} AND chart_id = $ref->{expense_accno_id} AND transdate = '$pthref->{transdate}'|,
-            $amount);
+        $form->update_balance($dbh, "acc_trans", "amount",
+                              qq|    (trans_id = $pthref->{trans_id})
+                                 AND (chart_id = $ref->{expense_accno_id})
+                                 AND (transdate = '$pthref->{transdate}')|,
+                              $amount);
 
-          $form->update_balance(
-            $dbh,
-            "acc_trans",
-            "amount",
-            qq|trans_id = $pthref->{trans_id} AND chart_id = $ref->{inventory_accno_id} AND transdate = '$pthref->{transdate}'|,
-            $amount * -1);
+        $form->update_balance($dbh, "acc_trans", "amount",
+                              qq|    (trans_id = $pthref->{trans_id})
+                                 AND (chart_id = $ref->{inventory_accno_id})
+                                 AND (transdate = '$pthref->{transdate}')|,
+                              $amount * -1);
 
-          last if (($ref->{allocated} -= $qty) <= 0);
-        }
-        $sth->finish;
+        last if (($ref->{allocated} -= $qty) <= 0);
       }
-    }
+    $sth2->finish();
   }
-  $sth->finish;
+  $sth->finish();
+
+  my $id = conv_i($form->{id});
 
   # delete acc_trans
-  $query = qq|DELETE FROM acc_trans
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
+  do_query($form, $dbh, $query, $id);
 
   # delete invoice entries
-  $query = qq|DELETE FROM invoice
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM invoice WHERE trans_id = ?|;
+  do_query($form, $dbh, $query, $id);
 
-  $query = qq|DELETE FROM shipto
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM shipto WHERE (trans_id = ?) AND (module = 'AP')|;
+  do_query($form, $dbh, $query, $id);
 
   $main::lxdebug->leave_sub();
 }
@@ -713,21 +805,19 @@ sub delete_invoice {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-
+  my $query;
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   &reverse_invoice($dbh, $form);
 
   # delete zero entries
-  my $query = qq|DELETE FROM acc_trans
-                 WHERE amount = 0|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM acc_trans WHERE amount = 0|;
+  do_query($form, $dbh, $query);
 
   # delete AP record
-  my $query = qq|DELETE FROM ap
-                 WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM ap WHERE id = ?|;
+  do_query($form, $dbh, $query, conv_i($form->{id}));
 
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -743,156 +833,168 @@ sub retrieve_invoice {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $form->dbconnect($myconfig);
 
-  my $query;
+  my ($query, $sth, $ref, $q_invdate);
+
+  if (!$form->{id}) {
+    $q_invdate = qq|, COALESCE((SELECT transdate FROM ar WHERE id = (SELECT MAX(id) FROM ar)), current_date) AS invdate|;
+    if ($form->{vendor_id}) {
+      my $vendor_id = $dbh->quote($form->{vendor_id} * 1);
+      $q_invdate .=
+        qq|, COALESCE((SELECT transdate FROM ar WHERE id = (SELECT MAX(id) FROM ar)), current_date) +
+             COALESCE((SELECT pt.terms_netto
+                       FROM vendor v
+                       LEFT JOIN payment_terms pt ON (v.payment_id = pt.id)
+                       WHERE v.id = $vendor_id),
+                      0) AS duedate|;
+    }
+  }
 
-  if ($form->{id}) {
-
-    # get default accounts and last invoice number
-    $query = qq|SELECT (SELECT c.accno FROM chart c
-                        WHERE d.inventory_accno_id = c.id) AS inventory_accno,
-                       (SELECT c.accno FROM chart c
-		        WHERE d.income_accno_id = c.id) AS income_accno,
-                       (SELECT c.accno FROM chart c
-		        WHERE d.expense_accno_id = c.id) AS expense_accno,
-		       (SELECT c.accno FROM chart c
-		        WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
-		       (SELECT c.accno FROM chart c
-		        WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-                d.curr AS currencies
-	 	FROM defaults d|;
-  } else {
-    $query = qq|SELECT (SELECT c.accno FROM chart c
-                        WHERE d.inventory_accno_id = c.id) AS inventory_accno,
-                       (SELECT c.accno FROM chart c
-		        WHERE d.income_accno_id = c.id) AS income_accno,
-                       (SELECT c.accno FROM chart c
-		        WHERE d.expense_accno_id = c.id) AS expense_accno,
-		       (SELECT c.accno FROM chart c
-		        WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
-		       (SELECT c.accno FROM chart c
-		        WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-                d.curr AS currencies,
-		current_date AS invdate
-	 	FROM defaults d|;
+  # get default accounts and last invoice number
+
+  $query = qq|SELECT
+               (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno,
+               (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id)    AS income_accno,
+               (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id)   AS expense_accno,
+               (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id)    AS fxgain_accno,
+               (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno,
+               d.curr AS currencies
+               $q_invdate
+               FROM defaults d|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query);
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
+
+  if (!$form->{id}) {
+    $dbh->disconnect();
+    $main::lxdebug->leave_sub();
+
+    return;
   }
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  # retrieve invoice
+  $query = qq|SELECT cp_id, invnumber, transdate AS invdate, duedate,
+                orddate, quodate, globalproject_id,
+                ordnumber, quonumber, paid, taxincluded, notes, taxzone_id, storno, gldate,
+                intnotes, curr AS currency
+              FROM ap
+              WHERE id = ?|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
-
-  if ($form->{id}) {
-
-    # retrieve invoice
-    $query = qq|SELECT a.cp_id, a.invnumber, a.transdate AS invdate, a.duedate,
-                a.ordnumber, a.quonumber, a.paid, a.taxincluded, a.notes,
-		a.intnotes, a.curr AS currency
-		FROM ap a
-		WHERE a.id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
-
-    $form->{exchangerate} =
-      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
-                              "sell");
-
-    # get shipto
-    $query = qq|SELECT s.* FROM shipto s
-                WHERE s.trans_id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
-
-    # retrieve individual items
-    $query = qq|SELECT c1.accno AS inventory_accno,
-                       c2.accno AS income_accno,
-		       c3.accno AS expense_accno,
-		p.partnumber, i.description, i.qty, i.fxsellprice AS sellprice,
-		i.parts_id AS id, i.unit, p.bin, i.deliverydate,
-		pr.projectnumber,
-                i.project_id, i.serialnumber,
-		pg.partsgroup
-		FROM invoice i
-		JOIN parts p ON (i.parts_id = p.id)
-		LEFT JOIN chart c1 ON (p.inventory_accno_id = c1.id)
-		LEFT JOIN chart c2 ON (p.income_accno_id = c2.id)
-		LEFT JOIN chart c3 ON (p.expense_accno_id = c3.id)
-		LEFT JOIN project pr ON (i.project_id = pr.id)
-		LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
-		WHERE i.trans_id = $form->{id}
-		ORDER BY i.id|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-      #set expense_accno=inventory_accno if they are different => bilanz
-      $vendor_accno =
-        ($ref->{expense_accno} != $ref->{inventory_accno})
-        ? $ref->{inventory_accno}
-        : $ref->{expense_accno};
-      $vendor_accno =
-        ($ref->{inventory_accno})
-        ? $ref->{inventory_accno}
-        : $ref->{expense_accno};
-
-      # get tax rates and description
-      $accno_id =
-        ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
-      $query = qq|SELECT c.accno, c.description, t.rate, t.taxnumber
-	         FROM chart c, tax t
-	         WHERE c.id=t.chart_id AND t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
-	         ORDER BY accno|;
-      $stw = $dbh->prepare($query);
-      $stw->execute || $form->dberror($query);
-      $ref->{taxaccounts} = "";
-      while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
-
-        #    if ($customertax{$ref->{accno}}) {
-        $ref->{taxaccounts} .= "$ptr->{accno} ";
-        if (!($form->{taxaccounts} =~ /$ptr->{accno}/)) {
-          $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
-          $form->{"$ptr->{accno}_description"} = $ptr->{description};
-          $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
-          $form->{taxaccounts} .= "$ptr->{accno} ";
-        }
 
-      }
+  # remove any trailing whitespace
+  $form->{currency} =~ s/\s*$//;
 
-      chop $ref->{taxaccounts};
-      push @{ $form->{invoice_details} }, $ref;
-      $stw->finish;
+  $form->{exchangerate}  = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
+
+  # get shipto
+  $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module = 'AP')|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
+  delete $ref->{id};
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
+
+  my $transdate  = $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";
+  my $taxzone_id = $form->{taxzone_id} * 1;
+
+  $taxzone_id = 0 if ((3 < $taxzone_id) || (0 > $taxzone_id));
+
+  # retrieve individual items
+  $query =
+    qq|SELECT
+        c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from AS inventory_valid,
+        c2.accno AS income_accno,    c2.new_chart_id AS income_new_chart,    date($transdate) - c2.valid_from AS income_valid,
+        c3.accno AS expense_accno,   c3.new_chart_id AS expense_new_chart,   date($transdate) - c3.valid_from AS expense_valid,
+
+        i.id AS invoice_id,
+        i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.parts_id AS id, i.unit, i.deliverydate, i.project_id, i.serialnumber,
+        i.price_factor_id, i.price_factor, i.marge_price_factor, i.discount,
+        p.partnumber, p.inventory_accno_id AS part_inventory_accno_id, p.bin, pr.projectnumber, pg.partsgroup
+
+        FROM invoice i
+        JOIN parts p ON (i.parts_id = p.id)
+        LEFT JOIN chart c1 ON ((SELECT inventory_accno_id             FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id)
+        LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id}  FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
+        LEFT JOIN chart c3 ON ((SELECT expense_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c3.id)
+        LEFT JOIN project pr    ON (i.project_id = pr.id)
+        LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
+
+        WHERE i.trans_id = ?
+
+        ORDER BY i.id|;
+  $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
+
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    # Retrieve custom variables.
+    my $cvars = CVar->get_custom_variables(dbh        => $dbh,
+                                           module     => 'IC',
+                                           sub_module => 'invoice',
+                                           trans_id   => $ref->{invoice_id},
+                                          );
+    map { $ref->{"ic_cvar_$_->{name}"} = $_->{value} } @{ $cvars };
+    delete $ref->{invoice_id};
+
+    map({ delete($ref->{$_}); } qw(inventory_accno inventory_new_chart inventory_valid)) if !$ref->{"part_inventory_accno_id"};
+    delete($ref->{"part_inventory_accno_id"});
+
+    foreach my $type (qw(inventory income expense)) {
+      while ($ref->{"${type}_new_chart"} && ($ref->{"${type}_valid"} >=0)) {
+        my $query = qq|SELECT accno, new_chart_id, date($transdate) - valid_from FROM chart WHERE id = ?|;
+        @$ref{ map $type.$_, qw(_accno _new_chart _valid) } = selectrow_query($form, $dbh, $query, $ref->{"${type}_new_chart"});
+      }
     }
-    $sth->finish;
 
-    if ($form->{webdav}) {
-      &webdav_folder($myconfig, $form);
+    # get tax rates and description
+    my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+    $query =
+      qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber FROM tax t
+         LEFT JOIN chart c ON (c.id = t.chart_id)
+         WHERE t.id in
+           (SELECT tk.tax_id FROM taxkeys tk
+            WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
+              AND (startdate <= $transdate)
+            ORDER BY startdate DESC
+            LIMIT 1)
+         ORDER BY c.accno|;
+    my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
+    $ref->{taxaccounts} = "";
+
+    my $i = 0;
+    while (my $ptr = $stw->fetchrow_hashref("NAME_lc")) {
+      if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
+        $i++;
+        $ptr->{accno} = $i;
+      }
+
+      $ref->{taxaccounts} .= "$ptr->{accno} ";
+
+      if (!($form->{taxaccounts} =~ /\Q$ptr->{accno}\E/)) {
+        $form->{"$ptr->{accno}_rate"}         = $ptr->{rate};
+        $form->{"$ptr->{accno}_description"}  = $ptr->{taxdescription};
+        $form->{"$ptr->{accno}_taxnumber"}    = $ptr->{taxnumber};
+        $form->{taxaccounts}                 .= "$ptr->{accno} ";
+      }
+
     }
 
+    chop $ref->{taxaccounts};
+    push @{ $form->{invoice_details} }, $ref;
+    $stw->finish();
   }
+  $sth->finish();
 
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  Common::webdav_folder($form);
 
-  $main::lxdebug->leave_sub();
+  $dbh->disconnect();
 
-  return $rc;
+  $main::lxdebug->leave_sub();
 }
 
 sub get_vendor {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, $params) = @_;
+
+  $params = $form unless defined $params && ref $params eq "HASH";
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
@@ -900,123 +1002,114 @@ sub get_vendor {
   my $dateformat = $myconfig->{dateformat};
   $dateformat .= "yy" if $myconfig->{dateformat} !~ /^y/;
 
+  my $vid = conv_i($params->{vendor_id});
+  my $vnr = conv_i($params->{vendornumber});
+
   my $duedate =
-    ($form->{invdate})
-    ? "to_date('$form->{invdate}', '$dateformat')"
+    ($params->{invdate})
+    ? "to_date(" . $dbh->quote($params->{invdate}) . ", '$dateformat')"
     : "current_date";
 
-  $form->{vendor_id} *= 1;
-
   # get vendor
-  my $query = qq|SELECT v.name AS vendor, v.creditlimit, v.terms,
-                 v.email, v.cc, v.bcc, v.language,
-		 v.street, v.zipcode, v.city, v.country,
-                 $duedate + v.terms AS duedate, v.notes AS intnotes
-                 FROM vendor v
-	         WHERE v.id = $form->{vendor_id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $ref = $sth->fetchrow_hashref(NAME_lc);
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
-
-  $form->{creditremaining} = $form->{creditlimit};
-  $query = qq|SELECT SUM(a.amount - a.paid)
-              FROM ap a
-	      WHERE a.vendor_id = $form->{vendor_id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($form->{creditremaining}) -= $sth->fetchrow_array;
-
-  $sth->finish;
+  my @values = ();
+  my $where = '';
+  if ($vid) {
+    $where .= 'AND v.id = ?';
+    push @values, $vid;
+  }
+  if ($vnr) {
+    $where .= 'AND v.vendornumber = ?';
+    push @values, $vnr;
+  }
+  my $query =
+    qq|SELECT
+         v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount,
+         v.creditlimit, v.terms, v.notes AS intnotes,
+         v.email, v.cc, v.bcc, v.language_id, v.payment_id,
+         v.street, v.zipcode, v.city, v.country, v.taxzone_id, v.curr,
+         $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
+         b.description AS business
+       FROM vendor v
+       LEFT JOIN business b       ON (b.id = v.business_id)
+       LEFT JOIN payment_terms pt ON (v.payment_id = pt.id)
+       WHERE 1=1 $where|;
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
+  map { $params->{$_} = $ref->{$_} } keys %$ref;
+
+  # remove any trailing whitespace
+  $form->{curr} =~ s/\s*$//;
+
+  # use vendor currency if not empty
+  $form->{currency} = $form->{curr} if $form->{curr};
+
+  $params->{creditremaining} = $params->{creditlimit};
+
+  $query = qq|SELECT SUM(amount - paid) FROM ap WHERE vendor_id = ?|;
+  my ($unpaid_invoices) = selectfirst_array_query($form, $dbh, $query, $vid);
+  $params->{creditremaining} -= $unpaid_invoices;
 
   $query = qq|SELECT o.amount,
-                (SELECT e.sell FROM exchangerate e
-		 WHERE e.curr = o.curr
-		 AND e.transdate = o.transdate)
-	      FROM oe o
-	      WHERE o.vendor_id = $form->{vendor_id}
-	      AND o.quotation = '0'
-	      AND o.closed = '0'|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my ($amount, $exch) = $sth->fetchrow_array) {
+                (SELECT e.sell
+                 FROM exchangerate e
+                 WHERE (e.curr = o.curr)
+                   AND (e.transdate = o.transdate)) AS exch
+              FROM oe o
+              WHERE (o.vendor_id = ?) AND (o.quotation = '0') AND (o.closed = '0')|;
+  my $sth = prepare_execute_query($form, $dbh, $query, $vid);
+  while (my ($amount, $exch) = $sth->fetchrow_array()) {
     $exch = 1 unless $exch;
-    $form->{creditremaining} -= $amount * $exch;
-  }
-  $sth->finish;
-
-  $form->get_contacts($dbh, $form->{vendor_id});
-
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
-
-  # get contact if selected
-  if ($form->{contact} ne "--" && $form->{contact} ne "") {
-    $form->get_contact($dbh, $form->{cp_id});
+    $params->{creditremaining} -= $amount * $exch;
   }
+  $sth->finish();
 
   # get shipto if we do not convert an order or invoice
-  if (!$form->{shipto}) {
-    map { delete $form->{$_} }
-      qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
-
-    $query = qq|SELECT s.* FROM shipto s
-                WHERE s.trans_id = $form->{vendor_id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
-  }
+  if (!$params->{shipto}) {
+    delete @{$params}{qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail)};
 
-  # get taxes for vendor
-  $query = qq|SELECT c.accno
-              FROM chart c
-	      JOIN vendortax v ON (v.chart_id = c.id)
-	      WHERE v.vendor_id = $form->{vendor_id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $vendortax = ();
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $vendortax{ $ref->{accno} } = 1;
+    $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module= 'CT')|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, $vid);
+    @{$params}{keys %$ref} = @{$ref}{keys %$ref};
+    map { $params->{$_} = $ref->{$_} } keys %$ref;
   }
-  $sth->finish;
-
-  if (!$form->{id} && $form->{type} !~ /_(order|quotation)/) {
 
+  if (!$params->{id} && $params->{type} !~ /_(order|quotation)/) {
     # setup last accounts used
-    $query = qq|SELECT c.accno, c.description, c.link, c.category
-		FROM chart c
-		JOIN acc_trans ac ON (ac.chart_id = c.id)
-		JOIN ap a ON (a.id = ac.trans_id)
-		WHERE a.vendor_id = $form->{vendor_id}
-		AND NOT (c.link LIKE '%_tax%' OR c.link LIKE '%_paid%')
-		AND a.id IN (SELECT max(a2.id) FROM ap a2
-			     WHERE a2.vendor_id = $form->{vendor_id})|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $query =
+      qq|SELECT c.id, c.accno, c.description, c.link, c.category
+         FROM chart c
+         JOIN acc_trans ac ON (ac.chart_id = c.id)
+         JOIN ap a         ON (a.id = ac.trans_id)
+         WHERE (a.vendor_id = ?)
+           AND (NOT ((c.link LIKE '%_tax%') OR (c.link LIKE '%_paid%')))
+           AND (a.id IN (SELECT max(a2.id) FROM ap a2 WHERE a2.vendor_id = ?))|;
+    my $refs = selectall_hashref_query($form, $dbh, $query, $vid, $vid);
 
     my $i = 0;
-    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    for $ref (@$refs) {
       if ($ref->{category} eq 'E') {
         $i++;
-        $form->{"AP_amount_$i"} = "$ref->{accno}--$ref->{description}";
+        my ($tax_id, $rate);
+        if ($params->{initial_transdate}) {
+          my $tax_query = qq|SELECT tk.tax_id, t.rate FROM taxkeys tk
+                             LEFT JOIN tax t ON (tk.tax_id = t.id)
+                             WHERE (tk.chart_id = ?) AND (startdate <= ?)
+                             ORDER BY tk.startdate DESC
+                             LIMIT 1|;
+          ($tax_id, $rate) = selectrow_query($form, $dbh, $tax_query, $ref->{id}, $params->{initial_transdate});
+          $params->{"taxchart_$i"} = "${tax_id}--${rate}";
+        }
+
+        $params->{"AP_amount_$i"} = "$ref->{accno}--$tax_id";
       }
+
       if ($ref->{category} eq 'L') {
-        $form->{APselected} = $form->{AP_1} =
-          "$ref->{accno}--$ref->{description}";
+        $params->{APselected} = $params->{AP_1} = $ref->{accno};
       }
     }
-    $sth->finish;
-    $form->{rowcount} = $i if ($i && !$form->{type});
+    $params->{rowcount} = $i if ($i && !$params->{type});
   }
 
-  $dbh->disconnect;
+  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
 }
@@ -1026,24 +1119,31 @@ sub retrieve_item {
 
   my ($self, $myconfig, $form) = @_;
 
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
   my $i = $form->{rowcount};
 
   # don't include assemblies or obsolete parts
   my $where = "NOT p.assembly = '1' AND NOT p.obsolete = '1'";
+  my @values;
 
-  if ($form->{"partnumber_$i"}) {
-    my $partnumber = $form->like(lc $form->{"partnumber_$i"});
-    $where .= " AND lower(p.partnumber) LIKE '$partnumber'";
-  }
-
-  if ($form->{"description_$i"}) {
-    my $description = $form->like(lc $form->{"description_$i"});
-    $where .= " AND lower(p.description) LIKE '$description'";
+  foreach my $table_column (qw(p.partnumber p.description pg.partsgroup)) {
+    my $field = (split m{\.}, $table_column)[1];
+    next unless $form->{"${field}_${i}"};
+    $where .= " AND lower(${table_column}) LIKE lower(?)";
+    push @values, '%' . $form->{"${field}_${i}"} . '%';
   }
-
-  if ($form->{"partsgroup_$i"}) {
-    my $partsgroup = $form->like(lc $form->{"partsgroup_$i"});
-    $where .= " AND lower(pg.partsgroup) LIKE '$partsgroup'";
+  #Es soll auch nach EAN gesucht werden, ohne Einschränkung durch Beschreibung
+  if ($form->{"partnumber_$i"} && !$form->{"description_$i"}) {
+      $where .= qq| OR (NOT p.obsolete = '1' AND p.ean = ? )|;
+      push @values, $form->{"partnumber_$i"};
+   }
+
+  # Search for part ID overrides all other criteria.
+  if ($form->{"id_${i}"}) {
+    $where  = qq|p.id = ?|;
+    @values = ($form->{"id_${i}"});
   }
 
   if ($form->{"description_$i"}) {
@@ -1052,69 +1152,153 @@ sub retrieve_item {
     $where .= " ORDER BY p.partnumber";
   }
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $transdate = "";
+  if ($form->{type} eq "invoice") {
+    $transdate = $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";
+  } else {
+    $transdate = $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
+  }
+
+  my $taxzone_id = $form->{taxzone_id} * 1;
+  $taxzone_id    = 0 if ((3 < $taxzone_id) || (0 > $taxzone_id));
 
-  my $query = qq|SELECT p.id, p.partnumber, p.description,
-                 c1.accno AS inventory_accno,
-		 c2.accno AS income_accno,
-		 c3.accno AS expense_accno,
-		 pg.partsgroup,
-                 p.lastcost AS sellprice, p.unit, p.bin, p.onhand, p.notes AS partnotes
-                 FROM parts p
-		 LEFT JOIN chart c1 ON (p.inventory_accno_id = c1.id)
-		 LEFT JOIN chart c2 ON (p.income_accno_id = c2.id)
-		 LEFT JOIN chart c3 ON (p.expense_accno_id = c3.id)
-		 LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
-	         WHERE $where|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-    #set expense_accno=inventory_accno if they are different => bilanz
-    $vendor_accno =
-      ($ref->{expense_accno} != $ref->{inventory_accno})
-      ? $ref->{inventory_accno}
-      : $ref->{expense_accno};
-    $vendor_accno =
-      ($ref->{inventory_accno})
-      ? $ref->{inventory_accno}
-      : $ref->{expense_accno};
+  my $query =
+    qq|SELECT
+         p.id, p.partnumber, p.description, p.lastcost AS sellprice, p.listprice,
+         p.unit, p.assembly, p.bin, p.onhand, p.formel,
+         p.notes AS partnotes, p.notes AS longdescription, p.not_discountable,
+         p.inventory_accno_id, p.price_factor_id,
+
+         pfac.factor AS price_factor,
+
+         c1.accno                         AS inventory_accno,
+         c1.new_chart_id                  AS inventory_new_chart,
+         date($transdate) - c1.valid_from AS inventory_valid,
+
+         c2.accno                         AS income_accno,
+         c2.new_chart_id                  AS income_new_chart,
+         date($transdate) - c2.valid_from AS income_valid,
+
+         c3.accno                         AS expense_accno,
+         c3.new_chart_id                  AS expense_new_chart,
+         date($transdate) - c3.valid_from AS expense_valid,
+
+         pg.partsgroup
+
+       FROM parts p
+       LEFT JOIN chart c1 ON
+         ((SELECT inventory_accno_id
+           FROM buchungsgruppen
+           WHERE id = p.buchungsgruppen_id) = c1.id)
+       LEFT JOIN chart c2 ON
+         ((SELECT income_accno_id_${taxzone_id}
+           FROM buchungsgruppen
+           WHERE id = p.buchungsgruppen_id) = c2.id)
+       LEFT JOIN chart c3 ON
+         ((SELECT expense_accno_id_${taxzone_id}
+           FROM buchungsgruppen
+           WHERE id = p.buchungsgruppen_id) = c3.id)
+       LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
+       LEFT JOIN price_factors pfac ON (pfac.id = p.price_factor_id)
+       WHERE $where|;
+  my $sth = prepare_execute_query($form, $dbh, $query, @values);
+
+  my @translation_queries = ( [ qq|SELECT tr.translation, tr.longdescription
+                                   FROM translation tr
+                                   WHERE tr.language_id = ? AND tr.parts_id = ?| ],
+                              [ qq|SELECT tr.translation, tr.longdescription
+                                   FROM translation tr
+                                   WHERE tr.language_id IN
+                                     (SELECT id
+                                      FROM language
+                                      WHERE article_code = (SELECT article_code FROM language WHERE id = ?))
+                                     AND tr.parts_id = ?
+                                   LIMIT 1| ] );
+  map { push @{ $_ }, prepare_query($form, $dbh, $_->[0]) } @translation_queries;
+
+  $form->{item_list} = [];
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+
+    # In der Buchungsgruppe ist immer ein Bestandskonto verknuepft, auch wenn
+    # es sich um eine Dienstleistung handelt. Bei Dienstleistungen muss das
+    # Buchungskonto also aus dem Ergebnis rausgenommen werden.
+    if (!$ref->{inventory_accno_id}) {
+      map({ delete($ref->{"inventory_${_}"}); } qw(accno new_chart valid));
+    }
+    delete($ref->{inventory_accno_id});
 
     # get tax rates and description
-    $accno_id =
-      ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
-    $query = qq|SELECT c.accno, c.description, t.rate, t.taxnumber
-	      FROM chart c, tax t
-	      WHERE c.id=t.chart_id AND t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
-	      ORDER BY c.accno|;
-    $stw = $dbh->prepare($query);
-    $stw->execute || $form->dberror($query);
+    my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+    $query =
+      qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
+         FROM tax t
+         LEFT JOIN chart c on (c.id = t.chart_id)
+         WHERE t.id IN
+           (SELECT tk.tax_id
+            FROM taxkeys tk
+            WHERE tk.chart_id =
+              (SELECT id
+               FROM chart
+               WHERE accno = ?)
+              AND (startdate <= $transdate)
+            ORDER BY startdate DESC
+            LIMIT 1)
+         ORDER BY c.accno|;
+    my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
 
     $ref->{taxaccounts} = "";
-    while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
+    my $i = 0;
+    while (my $ptr = $stw->fetchrow_hashref("NAME_lc")) {
 
       #    if ($customertax{$ref->{accno}}) {
+      if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
+        $i++;
+        $ptr->{accno} = $i;
+      }
+
       $ref->{taxaccounts} .= "$ptr->{accno} ";
-      if (!($form->{taxaccounts} =~ /$ptr->{accno}/)) {
-        $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
-        $form->{"$ptr->{accno}_description"} = $ptr->{description};
-        $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
-        $form->{taxaccounts} .= "$ptr->{accno} ";
+
+      if (!($form->{taxaccounts} =~ /\Q$ptr->{accno}\E/)) {
+        $form->{"$ptr->{accno}_rate"}         = $ptr->{rate};
+        $form->{"$ptr->{accno}_description"}  = $ptr->{taxdescription};
+        $form->{"$ptr->{accno}_taxnumber"}    = $ptr->{taxnumber};
+        $form->{taxaccounts}                 .= "$ptr->{accno} ";
       }
 
+      if ($form->{language_id}) {
+        for my $spec (@translation_queries) {
+          do_statement($form, $spec->[1], $spec->[0], conv_i($form->{language_id}), conv_i($ref->{id}));
+          my ($translation, $longdescription) = $spec->[1]->fetchrow_array;
+          next unless $translation;
+          $ref->{description} = $translation;
+          $ref->{longdescription} = $longdescription;
+          last;
+        }
+      }
     }
 
-    $stw->finish;
+    $stw->finish();
     chop $ref->{taxaccounts};
 
+    $ref->{onhand} *= 1;
+
     push @{ $form->{item_list} }, $ref;
 
   }
 
-  $sth->finish;
-  $dbh->disconnect;
+  $sth->finish();
+  $_->[1]->finish for @translation_queries;
+
+  foreach my $item (@{ $form->{item_list} }) {
+    my $custom_variables = CVar->get_custom_variables(module   => 'IC',
+                                                      trans_id => $item->{id},
+                                                      dbh      => $dbh,
+                                                     );
+
+    map { $item->{"ic_cvar_" . $_->{name} } = $_->{value} } @{ $custom_variables };
+  }
+
+  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
 }
@@ -1122,38 +1306,57 @@ sub retrieve_item {
 sub vendor_details {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, @wanted_vars) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  # get contact id, set it if nessessary
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
+  my @values;
 
-  $contact = "";
+  # get contact id, set it if nessessary
+  $form->{cp_id} *= 1;
+  my $contact = "";
   if ($form->{cp_id}) {
-    $contact = "and cp.cp_id = $form->{cp_id}";
+    $contact = "AND cp.cp_id = ?";
+    push @values, $form->{cp_id};
   }
 
-  $taxincluded = $form->{taxincluded};
-
   # get rest for the vendor
   # fax and phone and email as vendor*
   my $query =
-    qq|SELECT ct.*, cp.*, ct.notes as vendornotes, phone as vendorphone, fax as vendorfax, email as vendoremail
-                 FROM vendor ct
-                 LEFT JOIN contacts cp on ct.id = cp.cp_cv_id
-		 WHERE ct.id = $form->{vendor_id}  $contact order by cp.cp_id limit 1|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $ref = $sth->fetchrow_hashref(NAME_lc);
+    qq|SELECT ct.*, cp.*, ct.notes as vendornotes, phone as vendorphone, fax as vendorfax, email as vendoremail,
+         ct.curr AS currency
+       FROM vendor ct
+       LEFT JOIN contacts cp ON (ct.id = cp.cp_cv_id)
+       WHERE (ct.id = ?) $contact
+       ORDER BY cp.cp_id
+       LIMIT 1|;
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{vendor_id}, @values);
+
+  # remove id and taxincluded before copy back
+  delete @$ref{qw(id taxincluded)};
+
+  @wanted_vars = grep({ $_ } @wanted_vars);
+  if (scalar(@wanted_vars) > 0) {
+    my %h_wanted_vars;
+    map({ $h_wanted_vars{$_} = 1; } @wanted_vars);
+    map({ delete($ref->{$_}) unless ($h_wanted_vars{$_}); } keys(%{$ref}));
+  }
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
+  # remove any trailing whitespace
+  $form->{currency} =~ s/\s*$// if ($form->{currency});
 
-  $form->{taxincluded} = $taxincluded;
+  my $custom_variables = CVar->get_custom_variables('dbh'      => $dbh,
+                                                    'module'   => 'CT',
+                                                    'trans_id' => $form->{vendor_id});
+  map { $form->{"vc_cvar_$_->{name}"} = $_->{value} } @{ $custom_variables };
 
-  $sth->finish;
-  $dbh->disconnect;
+  $form->{cp_greeting} = GenericTranslations->get('dbh'              => $dbh,
+                                                  'translation_type' => 'greetings::' . ($form->{cp_gender} eq 'f' ? 'female' : 'male'),
+                                                  'allow_fallback'   => 1);
+
+  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
 }
@@ -1166,14 +1369,14 @@ sub item_links {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT c.accno, c.description, c.link
-	         FROM chart c
-	         WHERE c.link LIKE '%IC%'
-		 ORDER BY c.accno|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query =
+    qq|SELECT accno, description, link
+       FROM chart
+       WHERE link LIKE '%IC%'
+       ORDER BY accno|;
+  my $sth = prepare_execute_query($query, $dbh, $query);
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     foreach my $key (split(/:/, $ref->{link})) {
       if ($key =~ /IC/) {
         push @{ $form->{IC_links}{$key} },
@@ -1183,41 +1386,145 @@ sub item_links {
     }
   }
 
-  $sth->finish;
+  $sth->finish();
+  $dbh->disconnect();
+
   $main::lxdebug->leave_sub();
 }
 
-sub webdav_folder {
+sub _delete_payments {
   $main::lxdebug->enter_sub();
 
-  my ($myconfig, $form) = @_;
+  my ($self, $form, $dbh) = @_;
+
+  my @delete_acc_trans_ids;
 
-SWITCH: {
-    $path = "webdav/rechnungen/" . $form->{invnumber}, last SWITCH
-      if ($form->{vc} eq "customer");
-    $path = "webdav/einkaufsrechnungen/" . $form->{invnumber}, last SWITCH
-      if ($form->{vc} eq "vendor");
+  # Delete old payment entries from acc_trans.
+  my $query =
+    qq|SELECT acc_trans_id
+       FROM acc_trans
+       WHERE (trans_id = ?) AND fx_transaction
+
+       UNION
+
+       SELECT at.acc_trans_id
+       FROM acc_trans at
+       LEFT JOIN chart c ON (at.chart_id = c.id)
+       WHERE (trans_id = ?) AND (c.link LIKE '%AP_paid%')|;
+  push @delete_acc_trans_ids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}), conv_i($form->{id}));
+
+  $query =
+    qq|SELECT at.acc_trans_id
+       FROM acc_trans at
+       LEFT JOIN chart c ON (at.chart_id = c.id)
+       WHERE (trans_id = ?)
+         AND ((c.link = 'AP') OR (c.link LIKE '%:AP') OR (c.link LIKE 'AP:%'))
+       ORDER BY at.acc_trans_id
+       OFFSET 1|;
+  push @delete_acc_trans_ids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}));
+
+  if (@delete_acc_trans_ids) {
+    $query = qq|DELETE FROM acc_trans WHERE acc_trans_id IN (| . join(", ", @delete_acc_trans_ids) . qq|)|;
+    do_query($form, $dbh, $query);
   }
 
-  if (!-d $path) {
-    mkdir($path, 0770) or die "can't make directory $!\n";
-  } else {
-    if ($form->{id}) {
-      @files = <$path/*>;
-      foreach $file (@files) {
-
-        $file =~ /\/([^\/]*)$/;
-        $fname = $1;
-        $ENV{'SCRIPT_NAME'} =~ /\/([^\/]*)\//;
-        $lxerp = $1;
-        $link  = "http://" . $ENV{'SERVER_NAME'} . "/" . $lxerp . "/" . $file;
-        $form->{WEBDAV}{$fname} = $link;
-      }
-    }
+  $main::lxdebug->leave_sub();
+}
+
+sub post_payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $locale) = @_;
+
+  # connect to database, turn off autocommit
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my (%payments, $old_form, $row, $item, $query, %keep_vars);
+
+  $old_form = save_form();
+
+  # Delete all entries in acc_trans from prior payments.
+  if (SL::DB::Default->get->payments_changeable != 0) {
+    $self->_delete_payments($form, $dbh);
+  }
+
+  # Save the new payments the user made before cleaning up $form.
+  map { $payments{$_} = $form->{$_} } grep m/^datepaid_\d+$|^gldate_\d+$|^acc_trans_id_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^AP_paid_\d+$|^paidaccounts$/, keys %{ $form };
+
+  # Clean up $form so that old content won't tamper the results.
+  %keep_vars = map { $_, 1 } qw(login password id);
+  map { delete $form->{$_} unless $keep_vars{$_} } keys %{ $form };
+
+  # Retrieve the invoice from the database.
+  $self->retrieve_invoice($myconfig, $form);
+
+  # Set up the content of $form in the way that IR::post_invoice() expects.
+  $form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate});
+
+  for $row (1 .. scalar @{ $form->{invoice_details} }) {
+    $item = $form->{invoice_details}->[$row - 1];
+
+    map { $item->{$_} = $form->format_amount($myconfig, $item->{$_}) } qw(qty sellprice);
+
+    map { $form->{"${_}_${row}"} = $item->{$_} } keys %{ $item };
   }
 
+  $form->{rowcount} = scalar @{ $form->{invoice_details} };
+
+  delete @{$form}{qw(invoice_details paidaccounts storno paid)};
+
+  # Restore the payment options from the user input.
+  map { $form->{$_} = $payments{$_} } keys %payments;
+
+  # Get the AP accno (which is normally done by Form::create_links()).
+  $query =
+    qq|SELECT c.accno
+       FROM acc_trans at
+       LEFT JOIN chart c ON (at.chart_id = c.id)
+       WHERE (trans_id = ?)
+         AND ((c.link = 'AP') OR (c.link LIKE '%:AP') OR (c.link LIKE 'AP:%'))
+       ORDER BY at.acc_trans_id
+       LIMIT 1|;
+
+  ($form->{AP}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));
+
+  # Post the new payments.
+  $self->post_invoice($myconfig, $form, $dbh, 1);
+
+  restore_form($old_form);
+
+  my $rc = $dbh->commit();
+  $dbh->disconnect();
+
   $main::lxdebug->leave_sub();
+
+  return $rc;
 }
 
-1;
+sub get_duedate {
+  $::lxdebug->enter_sub;
+
+  my ($self, %params) = @_;
+
+  if (!$params{vendor_id} || !$params{invdate}) {
+    $::lxdebug->leave_sub;
+    return $params{default};
+  }
 
+  my $dbh      = $::form->get_standard_dbh;
+  my $query    = qq|SELECT ?::date + pt.terms_netto
+                    FROM vendor v
+                    LEFT JOIN payment_terms pt ON (pt.id = v.payment_id)
+                    WHERE v.id = ?|;
+
+  my ($duedate) = selectfirst_array_query($::form, $dbh, $query, $params{invdate}, $params{vendor_id});
+
+  $duedate ||= $params{default};
+
+  $::lxdebug->leave_sub;
+
+  return $duedate;
+}
+
+
+1;