Auftrags-Controller: Verkäufer bei Kundenwechsel ändern

[mfinanz.git] / SL / AP.pm

diff --git a/SL/AP.pm b/SL/AP.pm
index 5dfe2362d737edb4fdc22816df3cf182a0940e16..f03fb63e892b461085088eceb0363dab873c0e7d 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.

 #======================================================================
 #
 # Accounts Payables database backend routines
 #======================================================================
 #
 # Accounts Payables database backend routines


@@ -34,105 +35,55 @@
 
 package AP;
 
 
 package AP;
 

+use SL::DATEV qw(:CONSTANTS);
+use SL::DBUtils;
+use SL::IO;
+use SL::MoreCommon;
+use SL::DB::Default;
+use SL::DB::Draft;
+use SL::Util qw(trim);
+use SL::DB;
+use Data::Dumper;
+
+use strict;
+

 sub post_transaction {
 sub post_transaction {

+  my ($self, $myconfig, $form, $provided_dbh, $payments_only) = @_;

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $form) = @_;
+  my $rc = SL::DB->client->with_transaction(\&_post_transaction, $self, $myconfig, $form, $provided_dbh, $payments_only);

 
 

-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  $::lxdebug->leave_sub;
+  return $rc;
+}
+
+sub _post_transaction {
+  my ($self, $myconfig, $form, $provided_dbh, $payments_only) = @_;
+  my $dbh = $provided_dbh || SL::DB->client->dbh;

 
   my ($null, $taxrate, $amount);
   my $exchangerate = 0;
 
 
   my ($null, $taxrate, $amount);
   my $exchangerate = 0;
 

-  ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
+  $form->{taxincluded} = 0 unless $form->{taxincluded};

 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
   } else {
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
   } else {

-    $exchangerate =
-      $form->check_exchangerate($myconfig, $form->{currency},
-                                $form->{transdate}, 'sell');
-
-    $form->{exchangerate} =
-      ($exchangerate)
-      ? $exchangerate
-      : $form->parse_amount($myconfig, $form->{exchangerate});
+    $exchangerate         = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'sell');
+    $form->{exchangerate} = $exchangerate || $form->parse_amount($myconfig, $form->{exchangerate});

   }
 
   }
 

-  for $i (1 .. $form->{rowcount}) {
-    $form->{AP_amounts}{"amount_$i"} =
-      (split(/--/, $form->{"AP_amount_$i"}))[0];
-  }
-  ($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
-  ($form->{AP}{payables})         = split(/--/, $form->{APselected});
-
-  # reverse and parse amounts
-  for my $i (1 .. $form->{rowcount}) {
-    $form->{"amount_$i"} =
-      $form->round_amount(
-                         $form->parse_amount($myconfig, $form->{"amount_$i"}) *
-                           $form->{exchangerate} * -1,
-                         2);
-    $amount += ($form->{"amount_$i"} * -1);
-
-    # parse tax_$i for later
-    $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"}) * -1;
-  }
+  # get the charts selected
+  $form->{AP_amounts}{"amount_$_"} = $form->{"AP_amount_chart_id_$_"} for (1 .. $form->{rowcount});

 
 

-  # this is for ap
-  $form->{amount} = $amount;
-
-  # taxincluded doesn't make sense if there is no amount
-  $form->{taxincluded} = 0 if ($form->{amount} == 0);
-
-  for $i (1 .. $form->{rowcount}) {
-   ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
-
-    $query = qq|SELECT c.accno, t.taxkey, t.rate
-            FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
-            WHERE t.id=$form->{"tax_id_$i"}
-            ORDER BY c.accno|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    ($form->{AP_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) =
-      $sth->fetchrow_array;
-    $form->{AP_amounts}{"tax_$i"}{taxkey}    = $form->{"taxkey_$i"};
-    $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
-
-    $sth->finish;
-    if ($form->{taxincluded} *= 1) {
-      if (!$form->{"korrektur_$i"}) {
-        $tax =
-          $form->{"amount_$i"} -
-          ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
-      } else {
-        $tax = $form->{"tax_$i"};
-      }
-      $amount = $form->{"amount_$i"} - $tax;
-      $form->{"amount_$i"} = $form->round_amount($amount, 2);
-      $diff += $amount - $form->{"amount_$i"};
-      $form->{"tax_$i"} = $form->round_amount($tax, 2);
-      $form->{netamount} += $form->{"amount_$i"};
-    } else {
-      if (!$form->{"korrektur_$i"}) {
-        $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
-      } else {
-        $tax = $form->{"tax_$i"};
-      }
-      $form->{"tax_$i"} =
-        $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
-      $form->{netamount} += $form->{"amount_$i"};
-    }
-    $form->{total_tax} += $form->{"tax_$i"} * -1;
-  }
+  # calculate the totals while calculating and reformatting the $amount_$i and $tax_$i
+  ($form->{netamount},$form->{total_tax},$form->{invtotal}) = $form->calculate_arap('buy',$form->{taxincluded}, $form->{exchangerate});

 
   # adjust paidaccounts if there is no date in the last row
   $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
 
   $form->{invpaid} = 0;
 
   # adjust paidaccounts if there is no date in the last row
   $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
 
   $form->{invpaid} = 0;

-  $form->{netamount} *= -1;

 
   # add payments
   for my $i (1 .. $form->{paidaccounts}) {
 
   # add payments
   for my $i (1 .. $form->{paidaccounts}) {


@@ -148,119 +99,111 @@ sub post_transaction {
   $form->{invpaid} =
     $form->round_amount($form->{invpaid} * $form->{exchangerate}, 2);
 
   $form->{invpaid} =
     $form->round_amount($form->{invpaid} * $form->{exchangerate}, 2);
 

-  # store invoice total, this goes into ap table
-  $form->{invtotal} = $form->{netamount} + $form->{total_tax};
+  # # store invoice total, this goes into ap table
+  # $form->{invtotal} = $form->{netamount} + $form->{total_tax};

 
   # amount for total AP
   $form->{payables} = $form->{invtotal};
 
 
   # amount for total AP
   $form->{payables} = $form->{invtotal};
 

-  my ($query, $sth);
-
-  # if we have an id delete old records
-  if ($form->{id}) {
-
-    # delete detail records
-    $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
-
-    $dbh->do($query) || $form->dberror($query);
-
-  } else {
-    my $uid = rand() . time;
-
-    $uid .= $form->{login};
-
-    $uid = substr($uid, 2, 75);
-
-    $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);
-
-    $query = qq|SELECT a.id FROM ap a
-                WHERE a.invnumber = '$uid'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
-
-  }
-
-  $form->{invnumber} = $form->{id} unless $form->{invnumber};
-
-  # escape '
-  map { $form->{$_} =~ s/\'/\'\'/g } qw(invnumber ordnumber notes);
-
-  $form->{datepaid} = $form->{transdate} unless ($form->{datepaid});
-  my $datepaid = ($form->{invpaid} != 0) ? qq|'$form->{datepaid}'| : 'NULL';
-
-  $query = qq|UPDATE ap SET
-             invnumber = '$form->{invnumber}',
-             transdate = '$form->{transdate}',
-             ordnumber = '$form->{ordnumber}',
-             vendor_id = $form->{vendor_id},
-             taxincluded = '$form->{taxincluded}',
-             amount = $form->{invtotal},
-             duedate = '$form->{duedate}',
-             paid = $form->{invpaid},
-             datepaid = $datepaid,
-             netamount = $form->{netamount},
-             curr = '$form->{currency}',
-             notes = '$form->{notes}',
-             department_id = $form->{department_id}
-             WHERE id = $form->{id}
-            |;
-  $dbh->do($query) || $form->dberror($query);
-

   # update exchangerate
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
     $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0,
                                $form->{exchangerate});
   }
 
   # update exchangerate
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
     $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0,
                                $form->{exchangerate});
   }
 

-  # add individual transactions
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"amount_$i"} != 0) {
-      $project_id = 'NULL';
-      if ("amount_$i" =~ /amount_/) {
-        if ($form->{"project_id_$i"} && $form->{"projectnumber_$i"}) {
-          $project_id = $form->{"project_id_$i"};
-        }
-      }
-      if ("amount_$i" =~ /amount/) {
-        $taxkey = $form->{AP_amounts}{"amount_$i"}{taxkey};
-      }
+  my ($query, $sth, @values);

 
 

-      # insert detail records in acc_trans
-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                                         project_id, taxkey)
-                  VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                         WHERE c.accno = '$form->{AP_amounts}{"amount_$i"}'),
-                    $form->{"amount_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
-      $dbh->do($query) || $form->dberror($query);
+  if (!$payments_only) {
+    # if we have an id delete old records
+    if ($form->{id}) {

 
 

-      if ($form->{"tax_$i"} != 0) {
+      # delete detail records
+      $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
+      do_query($form, $dbh, $query, $form->{id});
+
+    } else {
+
+      ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
+
+      $query =
+        qq|INSERT INTO ap (id, invnumber, employee_id,currency_id, taxzone_id) | .
+        qq|VALUES (?, ?, (SELECT e.id FROM employee e WHERE e.login = ?),
+                      (SELECT id FROM currencies WHERE name = ?), (SELECT taxzone_id FROM vendor WHERE id = ?) )|;
+      do_query($form, $dbh, $query, $form->{id}, $form->{invnumber}, $::myconfig{login}, $form->{currency}, $form->{vendor_id});
+
+    }
+
+    $query = qq|UPDATE ap SET invnumber = ?,
+                transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
+                amount = ?, duedate = ?, paid = ?, netamount = ?,
+                currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
+                globalproject_id = ?, direct_debit = ?
+               WHERE id = ?|;
+    @values = ($form->{invnumber}, conv_date($form->{transdate}),
+                  $form->{ordnumber}, conv_i($form->{vendor_id}),
+                  $form->{taxincluded} ? 't' : 'f', $form->{invtotal},
+                  conv_date($form->{duedate}), $form->{invpaid},
+                  $form->{netamount},
+                  $form->{currency}, $form->{notes},
+                  conv_i($form->{department_id}), $form->{storno},
+                  $form->{storno_id}, conv_i($form->{globalproject_id}),
+                  $form->{direct_debit} ? 't' : 'f',
+                  $form->{id});
+    do_query($form, $dbh, $query, @values);
+
+    $form->new_lastmtime('ap');
+
+    # add individual transactions
+    for my $i (1 .. $form->{rowcount}) {
+      if ($form->{"amount_$i"} != 0) {
+        my $project_id;
+        $project_id = conv_i($form->{"project_id_$i"});

 
         # insert detail records in acc_trans
         $query =
 
         # insert detail records in acc_trans
         $query =

-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                                          project_id, taxkey)
-                    VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                          WHERE c.accno = '$form->{AP_amounts}{"tax_$i"}'),
-                    $form->{"tax_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
-        $dbh->do($query) || $form->dberror($query);
-      }
+          qq|INSERT INTO acc_trans | .
+          qq|  (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link)| .
+          qq|VALUES (?, ?,   ?, ?, ?, ?, ?, (SELECT c.link FROM chart c WHERE c.id = ?))|;
+        @values = ($form->{id}, $form->{"AP_amount_chart_id_$i"},
+                   $form->{"amount_$i"}, conv_date($form->{transdate}),
+                   $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
+                   $form->{"AP_amount_chart_id_$i"});
+        do_query($form, $dbh, $query, @values);
+
+        if ($form->{"tax_$i"} != 0) {
+          # insert detail records in acc_trans
+          $query =
+            qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | .
+            qq|  project_id, taxkey, tax_id, chart_link) | .
+            qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
+            qq|  ?, ?, ?, ?, ?,| .
+            qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
+          @values = ($form->{id}, $form->{AP_amounts}{"tax_$i"},
+                     $form->{"tax_$i"}, conv_date($form->{transdate}),
+                     $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
+                     $form->{AP_amounts}{"tax_$i"});
+          do_query($form, $dbh, $query, @values);
+        }

 
 

+      }

     }
     }

-  }

 
 

-  # add payables
-  $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                                      project_id)
-              VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                    WHERE c.accno = '$form->{AP_amounts}{payables}'),
-              $form->{payables}, '$form->{transdate}', $project_id)|;
-  $dbh->do($query) || $form->dberror($query);
+    # add payables
+    $query =
+      qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id, chart_link) | .
+      qq|VALUES (?, ?, ?, ?, | .
+      qq|        (SELECT taxkey_id FROM chart WHERE id = ?),| .
+      qq|        (SELECT tax_id| .
+      qq|         FROM taxkeys| .
+      qq|         WHERE chart_id = ?| .
+      qq|         AND startdate <= ?| .
+      qq|         ORDER BY startdate DESC LIMIT 1),| .
+      qq|        (SELECT c.link FROM chart c WHERE c.id = ?))|;
+    @values = ($form->{id}, $form->{AP_chart_id}, $form->{payables},
+               conv_date($form->{transdate}), $form->{AP_chart_id}, $form->{AP_chart_id}, conv_date($form->{transdate}),
+               $form->{AP_chart_id});
+    do_query($form, $dbh, $query, @values);
+  }

 
   # if there is no amount but a payment record a payable
   if ($form->{amount} == 0 && $form->{invtotal} == 0) {
 
   # if there is no amount but a payment record a payable
   if ($form->{amount} == 0 && $form->{invtotal} == 0) {


@@ -269,26 +212,26 @@ sub post_transaction {
 
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
 
   # add paid transactions
   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) {
     if ($form->{"paid_$i"} != 0) {

+      my $project_id = conv_i($form->{"paid_project_id_$i"});

 
       $exchangerate = 0;
       if ($form->{currency} eq $form->{defaultcurrency}) {
         $form->{"exchangerate_$i"} = 1;
       } else {
 
       $exchangerate = 0;
       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"});
+        $exchangerate              = $form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+        $form->{"exchangerate_$i"} = $exchangerate || $form->parse_amount($myconfig, $form->{"exchangerate_$i"});

       }
       $form->{"AP_paid_$i"} =~ s/\"//g;
 
       # get paid account
 
       }
       $form->{"AP_paid_$i"} =~ s/\"//g;
 
       # get paid account
 

-      ($form->{AP}{"paid_$i"}) = split(/--/, $form->{"AP_paid_$i"});
+      ($form->{"AP_paid_account_$i"}) = split(/--/, $form->{"AP_paid_$i"});

       $form->{"datepaid_$i"} = $form->{transdate}
         unless ($form->{"datepaid_$i"});
 
       $form->{"datepaid_$i"} = $form->{transdate}
         unless ($form->{"datepaid_$i"});
 


@@ -301,59 +244,105 @@ sub post_transaction {
         $form->round_amount($form->{"paid_$i"} * $form->{exchangerate} * -1,
                             2);
       if ($form->{payables}) {
         $form->round_amount($form->{"paid_$i"} * $form->{exchangerate} * -1,
                             2);
       if ($form->{payables}) {

-        $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}{payables}'),
-                   $amount, '$form->{"datepaid_$i"}')|;
-        $dbh->do($query) || $form->dberror($query);
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link) | .
+          qq|VALUES (?, ?, ?, ?, ?, | .
+          qq|        (SELECT taxkey_id FROM chart WHERE id = ?),| .
+          qq|        (SELECT tax_id| .
+          qq|         FROM taxkeys| .
+          qq|         WHERE chart_id = ?| .
+          qq|         AND startdate <= ?| .
+          qq|         ORDER BY startdate DESC LIMIT 1),| .
+          qq|        (SELECT c.link FROM chart c WHERE c.id = ?))|;
+        @values = ($form->{id}, $form->{AP_chart_id}, $amount,
+                   conv_date($form->{"datepaid_$i"}), $project_id,
+                   $form->{AP_chart_id}, $form->{AP_chart_id}, conv_date($form->{"datepaid_$i"}),
+                   $form->{AP_chart_id});
+        do_query($form, $dbh, $query, @values);

       }
       $form->{payables} = $amount;
 
       }
       $form->{payables} = $amount;
 

-      $form->{"memo_$i"} =~ s/\'/\'\'/g;
-

       # add payment
       # add payment

-      $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 = '$form->{AP}{"paid_$i"}'),
-                 $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
-                 '$form->{"source_$i"}', '$form->{"memo_$i"}')|;
-      $dbh->do($query) || $form->dberror($query);
+      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, project_id, taxkey, tax_id, chart_link) | .
+        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, | .
+        qq|        (SELECT taxkey_id FROM chart WHERE accno = ?), | .
+        qq|        (SELECT tax_id| .
+        qq|         FROM taxkeys| .
+        qq|         WHERE chart_id= (SELECT id | .
+        qq|                          FROM chart| .
+        qq|                          WHERE accno = ?)| .
+        qq|         AND startdate <= ?| .
+        qq|         ORDER BY startdate DESC LIMIT 1),| .
+        qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
+      @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
+                 conv_date($form->{"datepaid_$i"}), $gldate, $form->{"source_$i"},
+                 $form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"},
+                 $form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}),
+                 $form->{"AP_paid_account_$i"});
+      do_query($form, $dbh, $query, @values);

 
       # add exchange rate difference
       $amount =
 
       # add exchange rate difference
       $amount =

-        $form->round_amount(
-                         $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1),
-                         2);
+        $form->round_amount($form->{"paid_$i"} *
+                            ($form->{"exchangerate_$i"} - 1), 2);

       if ($amount != 0) {
       if ($amount != 0) {

-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, fx_transaction, cleared)
-                   VALUES ($form->{id},
-                          (SELECT c.id FROM chart c
-                           WHERE c.accno = '$form->{AP}{"paid_$i"}'),
-                   $amount, '$form->{"datepaid_$i"}', '1', '0')|;
-
-        $dbh->do($query) || $form->dberror($query);
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id, chart_link) | .
+          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?), | .
+          qq|        (SELECT tax_id| .
+          qq|         FROM taxkeys| .
+          qq|         WHERE chart_id= (SELECT id | .
+          qq|                          FROM chart| .
+          qq|                          WHERE accno = ?)| .
+          qq|         AND startdate <= ?| .
+          qq|         ORDER BY startdate DESC LIMIT 1),| .
+          qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
+        @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $amount,
+                   conv_date($form->{"datepaid_$i"}), $project_id,
+                   $form->{"AP_paid_account_$i"},
+                   $form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}),
+                   $form->{"AP_paid_account_$i"});
+        do_query($form, $dbh, $query, @values);

       }
 
       # exchangerate gain/loss
       $amount =
       }
 
       # exchangerate gain/loss
       $amount =

-        $form->round_amount(
-                        $form->{"paid_$i"} *
-                          ($form->{exchangerate} - $form->{"exchangerate_$i"}),
-                        2);
+        $form->round_amount($form->{"paid_$i"} *
+                            ($form->{exchangerate} -
+                             $form->{"exchangerate_$i"}), 2);

 
       if ($amount != 0) {
 
       if ($amount != 0) {

-        $accno = ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno};
-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, fx_transaction, cleared)
-                   VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                         WHERE c.accno = '$accno'),
-                   $amount, '$form->{"datepaid_$i"}', '1', '0')|;
-        $dbh->do($query) || $form->dberror($query);
+        # fetch fxgain and fxloss chart info from defaults if charts aren't already filled in form
+        if ( !$form->{fxgain_accno} && $::instance_conf->get_fxgain_accno_id ) {
+          $form->{fxgain_accno} = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxgain_accno_id)->accno;
+        };
+        if ( !$form->{fxloss_accno} && $::instance_conf->get_fxloss_accno_id ) {
+          $form->{fxloss_accno} = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxloss_accno_id)->accno;
+        };
+        die "fxloss_accno missing" if $amount < 0 and not $form->{fxloss_accno};
+        die "fxgain_accno missing" if $amount > 0 and not $form->{fxgain_accno};
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id, chart_link) | .
+          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+          qq|        (SELECT tax_id| .
+          qq|         FROM taxkeys| .
+          qq|         WHERE chart_id= (SELECT id | .
+          qq|                          FROM chart| .
+          qq|                          WHERE accno = ?)| .
+          qq|         AND startdate <= ?| .
+          qq|         ORDER BY startdate DESC LIMIT 1),| .
+          qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
+        @values = ($form->{id},
+                   ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
+                   $amount, conv_date($form->{"datepaid_$i"}), $project_id,
+                   ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
+                   ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno}, conv_date($form->{"datepaid_$i"}),
+                   ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno});
+        do_query($form, $dbh, $query, @values);

       }
 
       # update exchange rate record
       }
 
       # update exchange rate record


@@ -365,35 +354,48 @@ sub post_transaction {
     }
   }
 
     }
   }
 

-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  if ($payments_only) {
+    $query = qq|UPDATE ap SET paid = ?, datepaid = ? WHERE id = ?|;
+    do_query($form, $dbh, $query,  $form->{invpaid}, $form->{invpaid} ? conv_date($form->{datepaid}) : undef, conv_i($form->{id}));
+    $form->new_lastmtime('ap');
+  }

 
 

-  $main::lxdebug->leave_sub();
+  IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);

 
 

-  return $rc;
-}
+  if ($form->{draft_id}) {
+    SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]);
+  }

 
 

-sub delete_transaction {
-  $main::lxdebug->enter_sub();
+  # safety check datev export
+  if ($::instance_conf->get_datev_check_on_ap_transaction) {
+    my $datev = SL::DATEV->new(
+      dbh        => $dbh,
+      trans_id   => $form->{id},
+    );
+    $datev->generate_datev_data;

 
 

-  my ($self, $myconfig, $form, $spool) = @_;
+    if ($datev->errors) {
+      die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+    }
+  }

 
 

-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  return 1;
+}

 
 

-  my $query = qq|DELETE FROM ap WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+sub delete_transaction {
+  $main::lxdebug->enter_sub();

 
 

-  $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  my ($self, $myconfig, $form) = @_;

 
 

-  # commit and redirect
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  SL::DB->client->with_transaction(sub {
+    my $query = qq|DELETE FROM ap WHERE id = ?|;
+    do_query($form, SL::DB->client->dbh, $query, $form->{id});
+    1;
+  }) or do { die SL::DB->client->error };

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 

-  return $rc;
+  return 1;

 }
 
 sub ap_transactions {
 }
 
 sub ap_transactions {


@@ -402,46 +404,84 @@ sub ap_transactions {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT a.id, a.invnumber, a.transdate, a.duedate,
-                 a.amount, a.paid, a.ordnumber, v.name, a.invoice,
-                a.netamount, a.datepaid, a.notes, e.name AS employee
-                FROM ap a
-             JOIN vendor v ON (a.vendor_id = v.id)
-             LEFT JOIN employee e ON (a.employee_id = e.id)|;
-
-  my $where = "1 = 1";
+  my $dbh = $form->get_standard_dbh($myconfig);

 
 

-  if ($form->{vendor_id}) {
-    $where .= " AND a.vendor_id = $form->{vendor_id}";
-  } else {
-    if ($form->{vendor}) {
-      my $vendor = $form->like(lc $form->{vendor});
-      $where .= " AND lower(v.name) LIKE '$vendor'";
-    }
+  my $query =
+    qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | .
+    qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
+    qq|  a.globalproject_id, a.storno, a.storno_id, a.direct_debit, | .
+    qq|  pr.projectnumber AS globalprojectnumber, | .
+    qq|  e.name AS employee, | .
+    qq|  v.vendornumber, v.country, v.ustid, | .
+    qq|  tz.description AS taxzone, | .
+    qq|  pt.description AS payment_terms, | .
+    qq{  ( SELECT ch.accno || ' -- ' || ch.description
+           FROM acc_trans at
+           LEFT JOIN chart ch ON ch.id = at.chart_id
+           WHERE ch.link ~ 'AP[[:>:]]'
+            AND at.trans_id = a.id
+            LIMIT 1
+          ) AS charts } .
+    qq|FROM ap a | .
+    qq|JOIN vendor v ON (a.vendor_id = v.id) | .
+    qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
+    qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
+    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) | .
+    qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| .
+    qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)|;
+
+  my $where = '';
+
+  unless ( $::auth->assert('show_ap_transactions', 1) ) {
+    $where .= " AND NOT invoice = 'f' ";  # remove ap transactions from Sales -> Reports -> Invoices
+  };
+
+  my @values;
+
+  if ($form->{vendor}) {
+    $where .= " AND v.name ILIKE ?";
+    push(@values, like($form->{vendor}));
+  }
+  if ($form->{"cp_name"}) {
+    $where .= " AND (cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
+    push(@values, (like($form->{"cp_name"}))x2);

   }
   }

-  if ($form->{department}) {
-    my ($null, $department_id) = split /--/, $form->{department};
-    $where .= " AND a.department_id = $department_id";
+  if ($form->{department_id}) {
+    $where .= " AND a.department_id = ?";
+    push(@values, $form->{department_id});

   }
   if ($form->{invnumber}) {
   }
   if ($form->{invnumber}) {

-    my $invnumber = $form->like(lc $form->{invnumber});
-    $where .= " AND lower(a.invnumber) LIKE '$invnumber'";
+    $where .= " AND a.invnumber ILIKE ?";
+    push(@values, like($form->{invnumber}));

   }
   if ($form->{ordnumber}) {
   }
   if ($form->{ordnumber}) {

-    my $ordnumber = $form->like(lc $form->{ordnumber});
-    $where .= " AND lower(a.ordnumber) LIKE '$ordnumber'";
+    $where .= " AND a.ordnumber ILIKE ?";
+    push(@values, like($form->{ordnumber}));

   }
   if ($form->{notes}) {
   }
   if ($form->{notes}) {

-    my $notes = $form->like(lc $form->{notes});
-    $where .= " AND lower(a.notes) LIKE '$notes'";
+    $where .= " AND lower(a.notes) LIKE ?";
+    push(@values, like($form->{notes}));
+  }
+  if ($form->{project_id}) {
+    $where .=
+      qq| AND ((a.globalproject_id = ?) OR EXISTS | .
+      qq|  (SELECT * FROM invoice i | .
+      qq|   WHERE i.project_id = ? AND i.trans_id = a.id) | .
+      qq| OR EXISTS | .
+      qq|  (SELECT * FROM acc_trans at | .
+      qq|   WHERE at.project_id = ? AND at.trans_id = a.id)| .
+      qq|  )|;
+    push(@values, $form->{project_id}, $form->{project_id}, $form->{project_id});

   }
 
   }
 

-  $where .= " AND a.transdate >= '$form->{transdatefrom}'"
-    if $form->{transdatefrom};
-  $where .= " AND a.transdate <= '$form->{transdateto}'"
-    if $form->{transdateto};
+  if ($form->{transdatefrom}) {
+    $where .= " AND a.transdate >= ?";
+    push(@values, trim($form->{transdatefrom}));
+  }
+  if ($form->{transdateto}) {
+    $where .= " AND a.transdate <= ?";
+    push(@values, trim($form->{transdateto}));
+  }

   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
       $where .= " AND a.amount <> a.paid" if ($form->{open});
   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
       $where .= " AND a.amount <> a.paid" if ($form->{open});


@@ -449,23 +489,52 @@ sub ap_transactions {
     }
   }
 
     }
   }
 

-  my @a = (transdate, invnumber, name);
-  push @a, "employee" if $self->{l_employee};
-  my $sortorder = join ', ', $form->sort_columns(@a);
-  $sortorder = $form->{sort} if $form->{sort};
+  if ($form->{parts_partnumber}) {
+    $where .= <<SQL;
+ AND EXISTS (
+        SELECT invoice.trans_id
+        FROM invoice
+        LEFT JOIN parts ON (invoice.parts_id = parts.id)
+        WHERE (invoice.trans_id = a.id)
+          AND (parts.partnumber ILIKE ?)
+        LIMIT 1
+      )
+SQL
+    push @values, like($form->{parts_partnumber});
+  }

 
 

-  $query .= "WHERE $where
-             ORDER by $sortorder";
+  if ($form->{parts_description}) {
+    $where .= <<SQL;
+ AND EXISTS (
+        SELECT invoice.trans_id
+        FROM invoice
+        WHERE (invoice.trans_id = a.id)
+          AND (invoice.description ILIKE ?)
+        LIMIT 1
+      )
+SQL
+    push @values, like($form->{parts_description});
+  }
+
+  if ($where) {
+    substr($where, 0, 4, " WHERE ");
+    $query .= $where;
+  }

 
 

-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my @a = qw(transdate invnumber name);
+  push @a, "employee" if $form->{l_employee};
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortorder = join(', ', map { "$_ $sortdir" } @a);

 
 

-  while (my $ap = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{AP} }, $ap;
+  if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit))) {
+    $sortorder = $form->{sort} . " $sortdir";

   }
 
   }
 

-  $sth->finish;
-  $dbh->disconnect;
+  $query .= " ORDER BY $sortorder";
+
+  my @result = selectall_hashref_query($form, $dbh, $query, @values);
+
+  $form->{AP} = [ @result ];

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -476,7 +545,7 @@ sub get_transdate {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $query =
     "SELECT COALESCE(" .
 
   my $query =
     "SELECT COALESCE(" .


@@ -485,149 +554,284 @@ sub get_transdate {
     "  current_date)";
   ($form->{transdate}) = $dbh->selectrow_array($query);
 
     "  current_date)";
   ($form->{transdate}) = $dbh->selectrow_array($query);
 

-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub _delete_payments {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $form, $dbh) = @_;
+
+  my @delete_acc_trans_ids;
+
+  # 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);
+  }
+
+  $main::lxdebug->leave_sub();
+}

 
 sub post_payment {
 
 sub post_payment {

+  my ($self, $myconfig, $form, $locale) = @_;

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

+  my $rc = SL::DB->client->with_transaction(\&_post_payment, $self, $myconfig, $form, $locale);
+
+  $::lxdebug->leave_sub;
+  return $rc;
+}
+
+sub _post_payment {

   my ($self, $myconfig, $form, $locale) = @_;
 
   my ($self, $myconfig, $form, $locale) = @_;
 

-  # connect to database, turn off autocommit
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
 

-  $form->{datepaid} = $form->{invdate};
+  my (%payments, $old_form, $row, $item, $query, %keep_vars);

 
 

-  # total payments, don't move we need it here
-  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"});
+  $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);

   }
 
   }
 

-  $form->{exchangerate} =
-      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
-                              "buy");
+  # Save the new payments the user made before cleaning up $form.
+  my $payments_re = '^datepaid_\d+$|^gldate_\d+$|^acc_trans_id_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^paid_project_id_\d+$|^AP_paid_\d+$|^paidaccounts$';
+  map { $payments{$_} = $form->{$_} } grep m/$payments_re/, keys %{ $form };

 
 

-  # record payments and offsetting AP
-  for my $i (1 .. $form->{paidaccounts}) {
+  # 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 };

 
 

-    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"};
+  # Retrieve the invoice from the database.
+  $form->create_links('AP', $myconfig, 'vendor', $dbh);

 
 

-      $exchangerate = 0;
-      if (($form->{currency} eq $form->{defaultcurrency}) || ($form->{defaultcurrency} eq "")) {
-        $form->{"exchangerate_$i"} = 1;
-      } else {
-        $exchangerate =
-          $form->check_exchangerate($myconfig, $form->{currency},
-                                    $form->{"datepaid_$i"}, 'buy');
-
-        $form->{"exchangerate_$i"} =
-          ($exchangerate)
-          ? $exchangerate
-          : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
-      }
+  # Restore the payment options from the user input.
+  map { $form->{$_} = $payments{$_} } keys %payments;

 
 

-      # record AP
-      $amount =
-        $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
-                            2) * -1;
+  # Set up the content of $form in the way that AR::post_transaction() expects.

 
 

+  $self->setup_form($form, 1);

 
 

-      $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
-                                      WHERE c.accno = '$form->{AP}') AND amount=$amount AND transdate='$form->{"datepaid_$i"}'|;
-      $dbh->do($query) || $form->dberror($query);
+  $form->{exchangerate}    = $form->format_amount($myconfig, $form->{exchangerate});
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);

 
 

-      $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);
+  # Get the AP accno.
+  $query =
+    qq|SELECT c.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
+       LIMIT 1|;

 
 

+  ($form->{AP_chart_id}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));

 
 

+  # Post the new payments.
+  $self->post_transaction($myconfig, $form, $dbh, 1);

 
 

-      $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
-                                      WHERE c.accno = '$accno') AND amount=$form->{"paid_$i"} AND transdate='$form->{"datepaid_$i"}' AND source='$form->{"source_$i"}' AND memo='$form->{"memo_$i"}'|;
-      $dbh->do($query) || $form->dberror($query);
+  restore_form($old_form);

 
 

-      $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);
+  return 1;
+}

 
 

+sub setup_form {
+  $main::lxdebug->enter_sub();

 
 

-      # 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;
+  my ($self, $form, $for_post_payments) = @_;
+
+  my ($exchangerate, $i, $j, $k, $key, $akey, $ref, $index, $taxamount, $totalamount, $totaltax, $totalwithholding, $withholdingrate,
+      $tax, $diff);
+
+  # forex
+  $form->{forex} = $form->{exchangerate};
+  $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
+
+  foreach $key (keys %{ $form->{AP_links} }) {
+    foreach $ref (@{ $form->{AP_links}{$key} }) {
+      if ($key eq "AP_paid") {
+        $form->{"select$key"} .= "<option value=\"$ref->{accno}\">$ref->{accno}--$ref->{description}</option>\n";

       } else {
       } else {

-        $form->{fx}{ $form->{fxloss_accno} }{ $form->{"datepaid_$i"} } +=
-          $amount;
+        $form->{"select$key"} .= "<option value=\"$ref->{accno}--$ref->{tax_id}\">$ref->{accno}--$ref->{description}</option>\n";

       }
       }

+    }

 
 

-      $diff = 0;
+    $form->{$key} = $form->{"select$key"};

 
 

-      # update exchange rate
-      if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-        $form->update_exchangerate($dbh, $form->{currency},
-                                   $form->{"datepaid_$i"},
-                                   $form->{"exchangerate_$i"}, 0);
+    $j = 0;
+    $k = 0;
+
+    # if there is a value we have an old entry
+    next unless $form->{acc_trans}{$key};
+
+    # do not use old entries for payments. They come from the form
+    # even if they are not changeable (then they are in hiddens)
+    next if $for_post_payments && $key eq "AP_paid";
+
+    for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
+
+      if ($key eq "AP_paid") {
+        $j++;
+        $form->{"AP_paid_$j"}         = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+        $form->{"acc_trans_id_$j"}    = $form->{acc_trans}{$key}->[$i - 1]->{acc_trans_id};
+        $form->{"paid_$j"}            = $form->{acc_trans}{$key}->[$i - 1]->{amount};
+        $form->{"datepaid_$j"}        = $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+        $form->{"gldate_$j"}          = $form->{acc_trans}{$key}->[$i - 1]->{gldate};
+        $form->{"source_$j"}          = $form->{acc_trans}{$key}->[$i - 1]->{source};
+        $form->{"memo_$j"}            = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+
+        $form->{"exchangerate_$i"}    = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
+        $form->{"forex_$j"}           = $form->{"exchangerate_$i"};
+        $form->{"AP_paid_$j"}         = $form->{acc_trans}{$key}->[$i-1]->{accno};
+        $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
+        $form->{paidaccounts}++;
+
+      } else {
+        $akey = $key;
+        $akey =~ s/AP_//;
+
+        if (($key eq "AP_tax") || ($key eq "AR_tax")) {
+          $form->{"${key}_$form->{acc_trans}{$key}->[$i-1]->{accno}"}  = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+          $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} = $form->round_amount($form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate, 2);
+
+          if ($form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"} > 0) {
+            $totaltax += $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
+          } else {
+            $totalwithholding += $form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
+            $withholdingrate  += $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
+          }
+
+          $index                 = $form->{acc_trans}{$key}->[$i - 1]->{index};
+          $form->{"tax_$index"}  = $form->round_amount($form->{acc_trans}{$key}->[$i - 1]->{amount} * -1 / $exchangerate, 2);
+          $totaltax             += $form->{"tax_$index"};
+
+        } else {
+          $k++;
+          $form->{"${akey}_$k"} = $form->round_amount($form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate, 2);
+
+          if ($akey eq 'amount') {
+            $form->{rowcount}++;
+            $form->{"${akey}_$i"} *= -1;
+            $totalamount          += $form->{"${akey}_$i"};
+            $form->{taxrate}       = $form->{acc_trans}{$key}->[$i - 1]->{rate};
+
+            $form->{"projectnumber_$k"}    = "$form->{acc_trans}{$key}->[$i-1]->{projectnumber}";
+            $form->{"oldprojectnumber_$k"} = $form->{"projectnumber_$k"};
+            $form->{"project_id_$k"}       = "$form->{acc_trans}{$key}->[$i-1]->{project_id}";
+            $form->{"${key}_chart_id_$k"}  = $form->{acc_trans}{$key}->[$i-1]->{chart_id};
+            $form->{"taxchart_$k"} = $form->{acc_trans}{$key}->[$i-1]->{id}    . "--" . $form->{acc_trans}{$key}->[$i-1]->{rate};
+          }
+        }

       }
     }
   }
 
       }
     }
   }
 

-  # 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|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
-                                        WHERE c.accno = '$accno') AND amount=$form->{fx}{$accno}{$transdate} AND transdate='$transdate' AND cleared='0' AND fx_transaction='1'|;
-        $dbh->do($query) || $form->dberror($query);
-        $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->{paidaccounts} = 1            if not defined $form->{paidaccounts};
+
+  if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
+    # add tax to amounts and invtotal
+    for $i (1 .. $form->{rowcount}) {
+      $taxamount            = ($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
+      $tax                  = $form->round_amount($taxamount, 2);
+      $diff                += ($taxamount - $tax);
+      $form->{"amount_$i"} += $form->{"tax_$i"};

     }
     }

+
+    $form->{amount_1} += $form->round_amount($diff, 2);

   }
   }

-  my $datepaid = ($form->{paid})    ? qq|'$form->{datepaid}'| : "NULL";

 
 

-  # save AP record
-  my $query = qq|UPDATE ap set
-              paid = $form->{paid},
-             datepaid = $datepaid
-              WHERE id=$form->{id}|;
+  $taxamount        = $form->round_amount($taxamount, 2);
+  $form->{invtotal} = $totalamount + $totaltax;

 
 

-  $dbh->do($query) || $form->dberror($query);
+  $main::lxdebug->leave_sub();
+}

 
 

-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+sub storno {
+  my ($self, $form, $myconfig, $id) = @_;
+  $main::lxdebug->enter_sub();

 
 

-  $main::lxdebug->leave_sub();
+  my $rc = SL::DB->client->with_transaction(\&_storno, $self, $form, $myconfig, $id);

 
 

+  $::lxdebug->leave_sub;

   return $rc;
 }
 
   return $rc;
 }
 

-1;
+sub _storno {
+  my ($self, $form, $myconfig, $id) = @_;
+
+  my ($query, $new_id, $storno_row, $acc_trans_rows);
+  my $dbh = SL::DB->client->dbh;
+
+  $query = qq|SELECT nextval('glid')|;
+  ($new_id) = selectrow_query($form, $dbh, $query);
+
+  $query = qq|SELECT * FROM ap WHERE id = ?|;
+  $storno_row = selectfirst_hashref_query($form, $dbh, $query, $id);
+
+  $storno_row->{id}         = $new_id;
+  $storno_row->{storno_id}  = $id;
+  $storno_row->{storno}     = 't';
+  $storno_row->{invnumber}  = 'Storno-' . $storno_row->{invnumber};
+  $storno_row->{amount}    *= -1;
+  $storno_row->{netamount} *= -1;
+  $storno_row->{paid}       = $storno_row->{amount};
+
+  delete @$storno_row{qw(itime mtime)};
+
+  $query = sprintf 'INSERT INTO ap (%s) VALUES (%s)', join(', ', keys %$storno_row), join(', ', map '?', values %$storno_row);
+  do_query($form, $dbh, $query, (values %$storno_row));
+
+  $query = qq|UPDATE ap SET paid = amount + paid, storno = 't' WHERE id = ?|;
+  do_query($form, $dbh, $query, $id);
+
+  $form->new_lastmtime('ap') if $id == $form->{id};

 
 

+  # now copy acc_trans entries
+  $query = qq|SELECT a.*, c.link FROM acc_trans a LEFT JOIN chart c ON a.chart_id = c.id WHERE a.trans_id = ? ORDER BY a.acc_trans_id|;
+  my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
+
+  # kill all entries containing payments, which are the last 2n rows, of which the last has link =~ /paid/
+  while ($rowref->[-1]{link} =~ /paid/) {
+    splice(@$rowref, -2);
+  }
+
+  for my $row (@$rowref) {
+    delete @$row{qw(itime mtime link acc_trans_id)};
+    $query = sprintf 'INSERT INTO acc_trans (%s) VALUES (%s)', join(', ', keys %$row), join(', ', map '?', values %$row);
+    $row->{trans_id}   = $new_id;
+    $row->{amount}    *= -1;
+    do_query($form, $dbh, $query, (values %$row));
+  }
+
+  map { IO->set_datepaid(table => 'ap', id => $_, dbh => $dbh) } ($id, $new_id);
+
+  return 1;
+}
+
+1;