X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=5b82ff10850eb2a0857ebff4dc19ff3ccd576162;hb=28b3276ca12390954e40f29ce91fe732f6183bfa;hp=875e948f4f8f6f57f4c995484dd3b6c4153dd111;hpb=6f81bc1b48784bd89617b99420ae95eefea2ac5b;p=kivitendo-erp.git

diff --git a/SL/AR.pm b/SL/AR.pm
index 875e948f4..5b82ff108 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -35,225 +35,179 @@
 package AR;
 
 use Data::Dumper;
+use SL::DATEV qw(:CONSTANTS);
 use SL::DBUtils;
+use SL::IO;
+use SL::MoreCommon;
+use SL::DB::Default;
+
+use strict;
 
 sub post_transaction {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, $provided_dbh, $payments_only) = @_;
 
-  my ($null, $taxrate, $amount, $tax, $diff);
+  my ($query, $sth, $null, $taxrate, $amount, $tax);
   my $exchangerate = 0;
   my $i;
 
   my @values;
 
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
+  delete $form->{currency} unless $form->{defaultcurrency};
+
+  # set exchangerate
+  $form->{exchangerate} = ($form->{currency} eq $form->{defaultcurrency}) ? 1 :
+      ( $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy') ||
+        $form->parse_amount($myconfig, $form->{exchangerate}) );
+
+  # get the charts selected
+  map { ($form->{AR_amounts}{"amount_$_"}) = split /--/, $form->{"AR_amount_$_"} } 1 .. $form->{rowcount};
 
-  if ($form->{currency} eq $form->{defaultcurrency}) {
-    $form->{exchangerate} = 1;
-  } else {
-    $exchangerate =
-      $form->check_exchangerate($myconfig, $form->{currency},
-                                $form->{transdate}, 'buy');
-  }
-  for $i (1 .. $form->{rowcount}) {
-    $form->{AR_amounts}{"amount_$i"} =
-      (split(/--/, $form->{"AR_amount_$i"}))[0];
-  }
   $form->{AR_amounts}{receivables} = $form->{ARselected};
   $form->{AR}{receivables}         = $form->{ARselected};
 
-  $form->{exchangerate} =
-    ($exchangerate)
-    ? $exchangerate
-    : $form->parse_amount($myconfig, $form->{exchangerate});
-
+  # parsing
   for $i (1 .. $form->{rowcount}) {
-
-    $form->{"amount_$i"} =
-      $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"})
-                            * $form->{exchangerate},
-                          2);
-
-    $form->{netamount} += $form->{"amount_$i"};
-
-    # parse tax_$i for later
-    $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"});
+    $form->{"amount_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"}) * $form->{exchangerate}, 2);
+    $form->{amount}     += $form->{"amount_$i"};
+    $form->{"tax_$i"}    = $form->parse_amount($myconfig, $form->{"tax_$i"});
   }
 
   # this is for ar
-
-  $form->{amount} = $form->{netamount};
-
   $form->{tax}       = 0;
   $form->{netamount} = 0;
   $form->{total_tax} = 0;
 
   # taxincluded doesn't make sense if there is no amount
+  $form->{taxincluded} = 0 unless $form->{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 | .
-      qq|FROM tax t LEFT JOIN chart c on (c.id = t.chart_id) | .
-      qq|WHERE t.id = ? | .
-      qq|ORDER BY c.accno|;
+    ($form->{"tax_id_$i"}) = split /--/, $form->{"taxchart_$i"};
 
-    ($form->{AR_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) =
-      selectrow_query($form, $dbh, $query, $form->{"tax_id_$i"});
-    $form->{AR_amounts}{"tax_$i"}{taxkey}    = $form->{"taxkey_$i"};
-    $form->{AR_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$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 = ? ORDER BY c.accno|;
+    ($form->{AR_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) = selectrow_query($form, $dbh, $query, $form->{"tax_id_$i"});
 
     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"};
+      $tax = $form->{"korrektur_$i"}
+        ? $form->{"tax_$i"}
+        : $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1)); # should be same as taxrate * amount / (taxrate + 1)
+      $form->{"amount_$i"} = $form->round_amount($form->{"amount_$i"} - $tax, 2);
+      $form->{"tax_$i"}    = $form->round_amount($tax, 2);
     } else {
-      if (!$form->{"korrektur_$i"}) {
-        $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
-      }
-      $form->{"tax_$i"} =
-        $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
-      $form->{netamount} += $form->{"amount_$i"};
+      $form->{"tax_$i"}    = $form->{"amount_$i"} * $form->{"taxrate_$i"} unless $form->{"korrektur_$i"};
+      $form->{"tax_$i"}    = $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
     }
-    
-    $form->{total_tax} += $form->{"tax_$i"};
+    $form->{netamount}  += $form->{"amount_$i"};
+    $form->{total_tax}  += $form->{"tax_$i"};
   }
 
   # adjust paidaccounts if there is no date in the last row
-  $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
-  $form->{paid} = 0;
-
-  # add payments
-  for $i (1 .. $form->{paidaccounts}) {
-    $form->{"paid_$i"} =
-      $form->round_amount($form->parse_amount($myconfig, $form->{"paid_$i"}),
-                          2);
-
-    $form->{paid} += $form->{"paid_$i"};
-    $form->{datepaid} = $form->{"datepaid_$i"};
+  # this does not apply to stornos, where the paid field is set manually
+  unless ($form->{storno}) {
+    $form->{paidaccounts}-- unless $form->{"datepaid_$form->{paidaccounts}"};
+    $form->{paid} = 0;
+
+    # add payments
+    for $i (1 .. $form->{paidaccounts}) {
+      $form->{"paid_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"paid_$i"}), 2);
+      $form->{paid}     += $form->{"paid_$i"};
+      $form->{datepaid}  = $form->{"datepaid_$i"};
+    }
 
+    $form->{amount} = $form->{netamount} + $form->{total_tax};
   }
-
-  $form->{amount} = $form->{netamount} + $form->{total_tax};
-  $form->{paid}   =
-    $form->round_amount($form->{paid} * $form->{exchangerate}, 2);
-
-  my ($query, $sth, $null);
+  $form->{paid}   = $form->round_amount($form->{paid} * ($form->{exchangerate} || 1), 2);
 
   ($null, $form->{employee_id}) = split /--/, $form->{employee};
-  unless ($form->{employee_id}) {
-    $form->get_employee($dbh);
-  }
-
-  # if we have an id delete old records
-  if ($form->{id}) {
-    # delete detail records
-    $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
-    do_query($form, $dbh, $query, $form->{id});
 
-  } else {
-    $query = qq|SELECT nextval('glid')|;
-    ($form->{id}) = selectrow_query($form, $dbh, $query);
+  $form->get_employee($dbh) unless $form->{employee_id};
 
-    $query = qq|INSERT INTO ar (id, invnumber, employee_id) VALUES (?, 'dummy', ?)|;
-    do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
+  # if we have an id delete old records else make one
+  if (!$payments_only) {
+    if ($form->{id}) {
+      # delete detail records
+      $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
+      do_query($form, $dbh, $query, $form->{id});
 
-    if (!$form->{invnumber}) {
-      $form->{invnumber} = $form->update_defaults($myconfig, "invnumber", $dbh);
+    } else {
+      $query = qq|SELECT nextval('glid')|;
+      ($form->{id}) = selectrow_query($form, $dbh, $query);
+      $query = qq|INSERT INTO ar (id, invnumber, employee_id) VALUES (?, 'dummy', ?)|;
+      do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
+      $form->{invnumber} = $form->update_defaults($myconfig, "invnumber", $dbh) unless $form->{invnumber};
     }
   }
 
   # update department
   ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
-
-  # record last payment date in ar table
-  $form->{datepaid} = $form->{transdate} unless $form->{datepaid};
-  my $datepaid = ($form->{paid} != 0) ? $form->{datepaid} : undef;
-
-  $query =
-    qq|UPDATE ar set | .
-    qq|  invnumber = ?, ordnumber = ?, transdate = ?, customer_id = ?, | .
-    qq|  taxincluded = ?, amount = ?, duedate = ?, paid = ?, datepaid = ?, | .
-    qq|  netamount = ?, curr = ?, notes = ?, department_id = ?, | .
-    qq|  employee_id = ? | .
-    qq|WHERE id = ?|;
-  my @values = ($form->{invnumber}, $form->{ordnumber},
-                conv_date($form->{transdate}), conv_i($form->{customer_id}),
-                $form->{taxincluded} ? 't' : 'f', $form->{amount},
-                conv_date($form->{duedate}), $form->{paid},
-                conv_date($datepaid), $form->{netamount},
-                $form->{currency}, $form->{notes},
-                conv_i($form->{department_id}),
-                conv_i($form->{employee_id}),
-                conv_i($form->{id}));
-  do_query($form, $dbh, $query, @values);
 
   # amount for AR account
   $form->{receivables} = $form->round_amount($form->{amount}, 2) * -1;
 
   # update exchangerate
-  if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate},
-                               $form->{exchangerate}, 0);
-  }
+  $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0)
+    if ($form->{currency} ne $form->{defaultcurrency}) && !$form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy');
+
+  if (!$payments_only) {
+    $query =
+      qq|UPDATE ar set
+           invnumber = ?, ordnumber = ?, transdate = ?, customer_id = ?,
+           taxincluded = ?, amount = ?, duedate = ?, paid = ?,
+           netamount = ?, curr = ?, notes = ?, department_id = ?,
+           employee_id = ?, storno = ?, storno_id = ?, globalproject_id = ?,
+           direct_debit = ?
+         WHERE id = ?|;
+    my @values = ($form->{invnumber}, $form->{ordnumber}, conv_date($form->{transdate}), conv_i($form->{customer_id}), $form->{taxincluded} ? 't' : 'f', $form->{amount},
+                  conv_date($form->{duedate}), $form->{paid}, $form->{netamount}, $form->{currency}, $form->{notes}, conv_i($form->{department_id}),
+                  conv_i($form->{employee_id}), $form->{storno} ? 't' : 'f', $form->{storno_id},
+                  conv_i($form->{globalproject_id}), $form->{direct_debit} ? 't' : 'f', conv_i($form->{id}));
+    do_query($form, $dbh, $query, @values);
+
+    # add individual transactions for AR, amount and taxes
+    for $i (1 .. $form->{rowcount}) {
+      if ($form->{"amount_$i"} != 0) {
+        my $project_id = conv_i($form->{"project_id_$i"});
 
-  # add individual transactions for AR, amount and taxes
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"amount_$i"} != 0) {
-      my $project_id = conv_i($form->{"project_id_$i"});
-      $taxkey = $form->{AR_amounts}{"amount_$i"}{taxkey};
-
-      # insert detail records in acc_trans
-      $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | .
-        qq|  project_id, taxkey) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|;
-      @values = (conv_i($form->{id}), conv_i($form->{AR_amounts}{"amount_$i"}),
-                 conv_i($form->{"amount_$i"}), conv_date($form->{transdate}),
-                 $project_id, conv_i($taxkey));
-      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) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-          qq|  ?, ?, ?, ?)|;
-        @values = (conv_i($form->{id}), conv_i($form->{AR_amounts}{"tax_$i"}),
-                   conv_i($form->{"tax_$i"}), conv_date($form->{transdate}),
-                   $project_id, conv_i($taxkey));
+        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey)
+                     VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|;
+        @values = (conv_i($form->{id}), $form->{AR_amounts}{"amount_$i"}, conv_i($form->{"amount_$i"}), conv_date($form->{transdate}), $project_id,
+                   conv_i($form->{"taxkey_$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, project_id, taxkey)
+                       VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|;
+          @values = (conv_i($form->{id}), $form->{AR_amounts}{"tax_$i"}, conv_i($form->{"tax_$i"}), conv_date($form->{transdate}), $project_id,
+                     conv_i($form->{"taxkey_$i"}));
+          do_query($form, $dbh, $query, @values);
+        }
       }
     }
-  }
 
-  # add recievables
-  $query =
-    qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) | .
-    qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, | .
-    qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-  @values = (conv_i($form->{id}), $form->{AR_amounts}{receivables},
-             conv_i($form->{receivables}), conv_date($form->{transdate}),
-             $form->{AR_amounts}{receivables});
-  do_query($form, $dbh, $query, @values);
+    # add recievables
+    $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey)
+                 VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+    @values = (conv_i($form->{id}), $form->{AR_amounts}{receivables}, conv_i($form->{receivables}), conv_date($form->{transdate}), $form->{AR_amounts}{receivables});
+    do_query($form, $dbh, $query, @values);
+
+  } else {
+    # Record paid amount.
+    $query = qq|UPDATE ar SET paid = ?, datepaid = ? WHERE id = ?|;
+    do_query($form, $dbh, $query,  $form->{paid}, $form->{paid} ? conv_date($form->{datepaid}) : undef, conv_i($form->{id}));
+  }
 
   # 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) {
       my $project_id = conv_i($form->{"paid_project_id_$i"});
 
@@ -262,107 +216,132 @@ sub post_transaction {
       $form->{"datepaid_$i"} = $form->{transdate}
         unless ($form->{"datepaid_$i"});
 
-      $exchangerate = 0;
-      if ($form->{currency} eq $form->{defaultcurrency}) {
-        $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"});
-      }
+      $form->{"exchangerate_$i"} = ($form->{currency} eq $form->{defaultcurrency}) ? 1 :
+        ( $form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy') ||
+          $form->parse_amount($myconfig, $form->{"exchangerate_$i"}) );
 
       # if there is no amount and invtotal is zero there is no exchangerate
-      if ($form->{amount} == 0 && $form->{netamount} == 0) {
-        $form->{exchangerate} = $form->{"exchangerate_$i"};
-      }
+      $form->{exchangerate} = $form->{"exchangerate_$i"}
+        if ($form->{amount} == 0 && $form->{netamount} == 0);
 
       # receivables amount
-      $amount =
-        $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
+      $amount = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
 
-      if ($form->{receivables} != 0) {
+      if ($amount != 0) {
         # add receivable
-        $query =
-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | .
-          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
-          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-        @values = (conv_i($form->{id}), $form->{AR}{receivables},
-                   $amount, conv_date($form->{"datepaid_$i"}), $project_id,
-                   $form->{AR}{receivables});
+        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey)
+                     VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+        @values = (conv_i($form->{id}), $form->{AR}{receivables}, $amount, conv_date($form->{"datepaid_$i"}), $project_id, $form->{AR}{receivables});
         do_query($form, $dbh, $query, @values);
       }
-      $form->{receivables} = $amount;
 
       if ($form->{"paid_$i"} != 0) {
-        my $project_id = conv_i($form->{"paid_project_id_$i"});
         # add payment
+        my $project_id = conv_i($form->{"paid_project_id_$i"});
+        my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
         $amount = $form->{"paid_$i"} * -1;
-        $query  =
-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | .
-          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | .
-          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-        @values = (conv_i($form->{id}), $form->{AR}{"paid_$i"}, $amount,
-                   conv_date($form->{"datepaid_$i"}), $form->{"source_$i"},
-                   $form->{"memo_$i"}, $project_id, $form->{AR}{"paid_$i"});
+        $query  = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey)
+                     VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+        @values = (conv_i($form->{id}), $form->{AR}{"paid_$i"}, $amount, conv_date($form->{"datepaid_$i"}), $gldate, $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $form->{AR}{"paid_$i"});
         do_query($form, $dbh, $query, @values);
 
         # exchangerate difference for payment
-        $amount =
-          $form->round_amount(
-                    $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) * -1,
-                    2);
+        $amount = $form->round_amount( $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) * -1, 2);
 
         if ($amount != 0) {
-          $query =
-            qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | .
-            qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
-            qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-          @values = (conv_i($form->{id}), $form->{AR}{"paid_$i"},
-                     $amount, conv_date($form->{"datepaid_$i"}), $project_id,
-                     $form->{AR}{"paid_$i"});
+          $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey)
+                       VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+          @values = (conv_i($form->{id}), $form->{AR}{"paid_$i"}, $amount, conv_date($form->{"datepaid_$i"}), $project_id, $form->{AR}{"paid_$i"});
           do_query($form, $dbh, $query, @values);
         }
 
         # exchangerate gain/loss
-        $amount =
-          $form->round_amount(
-                   $form->{"paid_$i"} *
-                     ($form->{exchangerate} - $form->{"exchangerate_$i"}) * -1,
-                   2);
+        $amount = $form->round_amount( $form->{"paid_$i"} * ($form->{exchangerate} - $form->{"exchangerate_$i"}) * -1, 2);
 
         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, project_id, taxkey) | .
-            qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
-            qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-          @values = (conv_i($form->{id}), $accno, $amount,
-                     conv_date($form->{"datepaid_$i"}), $project_id, $accno);
+          my $accno = ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno};
+          $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey)
+                       VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+          @values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{"datepaid_$i"}), $project_id, $accno);
           do_query($form, $dbh, $query, @values);
         }
       }
 
       # update exchangerate record
-      if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-        $form->update_exchangerate($dbh, $form->{currency},
-                                   $form->{"datepaid_$i"},
-                                   $form->{"exchangerate_$i"}, 0);
-      }
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, $form->{"exchangerate_$i"}, 0)
+        if ($form->{currency} ne $form->{defaultcurrency}) && !$form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
     }
   }
 
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  IO->set_datepaid(table => 'ar', id => $form->{id}, dbh => $dbh);
 
-  $main::lxdebug->leave_sub();
+  # safety check datev export
+  if ($::instance_conf->get_datev_check_on_ar_transaction) {
+    my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
+    $transdate  ||= DateTime->today;
 
-  return $rc;
+    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 = 1;
+  if (!$provided_dbh) {
+    $rc = $dbh->commit();
+    $dbh->disconnect();
+  }
+
+  $main::lxdebug->leave_sub() and return $rc;
+}
+
+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 '%AR_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 = 'AR') OR (c.link LIKE '%:AR') OR (c.link LIKE 'AR:%'))
+       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 {
@@ -373,157 +352,56 @@ sub post_payment {
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  $form->{datepaid} = $form->{transdate};
+  my (%payments, $old_form, $row, $item, $query, %keep_vars);
 
-  # total payments, don't move we need it here
-  for my $i (1 .. $form->{paidaccounts}) {
-    if ($form->{type} eq "credit_note") {
-      $form->{"paid_$i"} = $form->parse_amount($myconfig, $form->{"paid_$i"}) * -1;
-    } else {
-      $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->{transdate},
-                              "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+$|^AR_paid_\d+$|^paidaccounts$';
+  map { $payments{$_} = $form->{$_} } grep m/$payments_re/, keys %{ $form };
 
-  my $accno_ar = $form->{ARselected};
+  # 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 };
 
-  # record payments and offsetting AR
-  for my $i (1 .. $form->{paidaccounts}) {
+  # Retrieve the invoice from the database.
+  $form->create_links('AR', $myconfig, 'customer', $dbh);
 
-    if ($form->{"paid_$i"} != 0) {
-      my $project_id = conv_i($form->{"paid_project_id_$i"});
+  # Restore the payment options from the user input.
+  map { $form->{$_} = $payments{$_} } keys %payments;
 
-      my ($accno) = split /--/, $form->{"AR_paid_$i"};
-      $form->{"datepaid_$i"} = $form->{transdate}
-        unless ($form->{"datepaid_$i"});
-      $form->{datepaid} = $form->{"datepaid_$i"};
-
-      $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"});
-      }
+  # Set up the content of $form in the way that AR::post_transaction() expects.
 
-      # record AR
-      $amount =
-        $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
-                            2);
-
-
-      $query =
-        qq|DELETE FROM acc_trans | .
-        qq|WHERE trans_id = ? AND amount = ? AND transdate = ? AND | .
-        qq|  chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?)|;
-      @values = (conv_i($form->{id}), $amount,
-                 conv_date($form->{"datepaid_$i"}), $accno_ar);
-      do_query($form, $dbh, $query, @values);
-
-      $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | .
-        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
-        qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-      @values = (conv_i($form->{id}), $accno_ar, conv_i($amount),
-                 conv_date($form->{"datepaid_$i"}), $project_id, $accno_ar);
-      do_query($form, $dbh, $query, @values);
-
-      # record payment
-      $form->{"paid_$i"} *= -1;
-
-      $query =
-        qq|DELETE FROM acc_trans | .
-        qq|WHERE trans_id = ? AND | .
-        qq|  chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) AND | .
-        qq|  amount = ? AND transdate = ? AND source = ? AND memo = ?|;
-      @values = (conv_i($form->{id}), $accno, conv_i($form->{"paid_$i"}),
-                 conv_date($form->{"datepaid_$i"}),
-                 $form->{"source_$i"}, $form->{"memo_$i"});
-      do_query($form, $dbh, $query, @values);
-
-      $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | .
-        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | .
-        qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-      @values = (conv_i($form->{id}), $accno, conv_i($form->{"paid_$i"}),
-                 conv_date($form->{"datepaid_$i"}),
-                 $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $accno);
-      do_query($form, $dbh, $query, @values);
-
-      # 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;
-      }
+  $self->setup_form($form, 1);
 
-      $diff = 0;
+  $form->{exchangerate}    = $form->format_amount($myconfig, $form->{exchangerate});
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
+  delete $form->{currency} unless $form->{defaultcurrency};
 
-      # update exchange rate
-      if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-        $form->update_exchangerate($dbh, $form->{currency},
-                                   $form->{"datepaid_$i"},
-                                   $form->{"exchangerate_$i"}, 0);
-      }
-    }
-  }
+  # Get the AR 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 = 'AR') OR (c.link LIKE '%:AR') OR (c.link LIKE 'AR:%'))
+       ORDER BY at.acc_trans_id
+       LIMIT 1|;
 
-  # 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 | .
-          qq|WHERE trans_id = ? AND | .
-          qq|  chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) AND | .
-          qq|  amount = ? AND transdate = ? AND cleared = 'f' AND fx_transaction = 't'|;
-        @values = (conv_i($form->{id}), $accno,
-                   conv_i($form->{fx}{$accno}{$transdate}),
-                   conv_date($transdate));
-        do_query($form, $dbh, $query, @values);
+  ($form->{ARselected}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));
 
-        $query =
-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, project_id, taxkey) | .
-          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 'f', 't', ?, | .
-          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
-        @values = (conv_i($form->{id}), $accno,
-                   $form->{fx}{$accno}{$transdate},
-                   conv_date($transdate), $project_id,
-                   $form->{fx}{$accno}{$transdate});
-        do_query($form, $dbh, $query, @values);
-      }
-    }
-  }
-  my $datepaid = ($form->{paid}) ? $form->{datepaid} : "NULL";
+  # Post the new payments.
+  $self->post_transaction($myconfig, $form, $dbh, 1);
 
-  # save AR record
-  my $query =
-    qq|UPDATE ar set paid = ?, datepaid = ? WHERE id = ?|;
-  @values = (conv_i($form->{paid}), conv_date($datepaid), conv_i($form->{id}));
-  do_query($form, $dbh, $query, @values);
+  restore_form($old_form);
 
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  my $rc = $dbh->commit();
+  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
 
@@ -538,12 +416,10 @@ sub delete_transaction {
   # connect to database, turn AutoCommit off
   my $dbh = $form->dbconnect_noauto($myconfig);
 
+  # acc_trans entries are deleted by database triggers.
   my $query = qq|DELETE FROM ar WHERE id = ?|;
   do_query($form, $dbh, $query, $form->{id});
 
-  $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
-  do_query($form, $dbh, $query, $form->{id});
-
   # commit
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -559,24 +435,46 @@ sub ar_transactions {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = $form->get_standard_dbh($myconfig);
 
   my @values;
 
   my $query =
-    qq|SELECT a.id, a.invnumber, a.ordnumber, a.transdate, | .
+    qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.transdate, | .
     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
-    qq|  a.shippingpoint, a.storno, a.globalproject_id, | .
+    qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
+    qq|  a.marge_total, a.marge_percent, | .
+    qq|  a.transaction_description, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
-    qq|  c.name, | .
-    qq|  e.name AS employee | .
+    qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
+    qq|  c.id as customer_id, | .
+    qq|  e.name AS employee, | .
+    qq|  e2.name AS salesman, | .
+    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 ~ 'AR[[:>:]]'
+            AND at.trans_id = a.id
+            LIMIT 1
+          ) AS charts } .
     qq|FROM ar a | .
     qq|JOIN customer c ON (a.customer_id = c.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 employee e2 ON (a.salesman_id = e2.id) | .
+    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
+    qq|LEFT JOIN tax_zones tz ON (tz.id = c.taxzone_id)| .
+    qq|LEFT JOIN payment_terms pt ON (pt.id = c.payment_id)| .
+    qq|LEFT JOIN business b ON (b.id = c.business_id)| .
+    qq|LEFT JOIN department d ON (d.id = a.department_id)|;
 
   my $where = "1 = 1";
+  if ($form->{customernumber}) {
+    $where .= " AND c.customernumber = ?";
+    push(@values, $form->{customernumber});
+  }
   if ($form->{customer_id}) {
     $where .= " AND a.customer_id = ?";
     push(@values, $form->{customer_id});
@@ -584,12 +482,22 @@ sub ar_transactions {
     $where .= " AND c.name ILIKE ?";
     push(@values, $form->like($form->{customer}));
   }
-  if ($form->{department}) {
-    my ($null, $department_id) = split /--/, $form->{department};
+  if ($form->{business_id}) {
+    my $business_id = $form->{business_id};
+    $where .= " AND c.business_id = ?";
+    push(@values, $business_id);
+  }
+  if ($form->{department_id}) {
+    my $department_id = $form->{department_id};
     $where .= " AND a.department_id = ?";
     push(@values, $department_id);
   }
-  foreach my $column (qw(invnumber ordnumber notes)) {
+  if ($form->{department}) {
+    my $department = "%" . $form->{department} . "%";
+    $where .= " AND d.description ILIKE ?";
+    push(@values, $department);
+  }
+  foreach my $column (qw(invnumber ordnumber notes transaction_description)) {
     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
       push(@values, $form->like($form->{$column}));
@@ -599,8 +507,12 @@ sub ar_transactions {
     $where .=
       qq|AND ((a.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
-      qq|   WHERE i.project_id = ? AND i.trans_id = a.id))|;
-    push(@values, $form->{"project_id"}, $form->{"project_id"});
+      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});
   }
 
   if ($form->{transdatefrom}) {
@@ -618,29 +530,35 @@ sub ar_transactions {
     }
   }
 
-  my @a = (transdate, invnumber, name);
+  if (!$main::auth->assert('sales_all_edit', 1)) {
+    # only show own invoices
+    $where .= " AND a.employee_id = (select id from employee where login= ?)";
+    push (@values, $form->{login});
+  } else {
+    if ($form->{employee_id}) {
+      $where .= " AND a.employee_id = ?";
+      push @values, conv_i($form->{employee_id});
+    }
+    if ($form->{salesman_id}) {
+      $where .= " AND a.salesman_id = ?";
+      push @values, conv_i($form->{salesman_id});
+    }
+  };
+
+  my @a = qw(transdate invnumber name);
   push @a, "employee" if $form->{l_employee};
-  my $sortorder = join(', ', @a);
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortorder = join(', ', map { "$_ $sortdir" } @a);
 
-  if (grep({ $_ eq $form->{sort} }
-           qw(id transdate duedate invnumber ordnumber name
-              datepaid employee shippingpoint shipvia))) {
-    $sortorder = $form->{sort};
+  if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description))) {
+    $sortorder = $form->{sort} . " $sortdir";
   }
 
-  $query .= " WHERE $where ORDER by $sortorder";
+  $query .= " WHERE $where ORDER BY $sortorder";
 
-  my $sth = $dbh->prepare($query);
-  $sth->execute(@values) ||
-    $form->dberror($query . " (" . join(", ", @values) . ")");
+  my @result = selectall_hashref_query($form, $dbh, $query, @values);
 
-  $form->{AR} = [];
-  while (my $ar = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{AR} }, $ar;
-  }
-
-  $sth->finish;
-  $dbh->disconnect;
+  $form->{AR} = [ @result ];
 
   $main::lxdebug->leave_sub();
 }
@@ -665,5 +583,173 @@ sub get_transdate {
   $main::lxdebug->leave_sub();
 }
 
+sub setup_form {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $form, $for_post_payments) = @_;
+
+  my ($exchangerate, $akey, $j, $k, $index, $taxamount, $totaltax, $taxrate, $diff, $totalwithholding, $withholdingrate,
+      $totalamount, $taxincluded, $tax);
+
+  # forex
+  $form->{forex} = $form->{exchangerate};
+  $exchangerate  = $form->{exchangerate} ? $form->{exchangerate} : 1;
+
+  foreach my $key (keys %{ $form->{AR_links} }) {
+    $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 "AR_paid";
+
+    for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
+      if ($key eq "AR_paid") {
+        $j++;
+        $form->{"AR_paid_$j"} = $form->{acc_trans}{$key}->[$i-1]->{accno};
+
+        $form->{"acc_trans_id_$j"}    = $form->{acc_trans}{$key}->[$i - 1]->{acc_trans_id};
+        # reverse paid
+        $form->{"paid_$j"}            = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
+        $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->{"forex_$j"}           = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
+        $form->{"exchangerate_$i"}    = $form->{"forex_$j"};
+        $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
+        $form->{paidaccounts}++;
+
+      } else {
+
+        $akey = $key;
+        $akey =~ s/AR_//;
+
+        if ($key eq "AR_tax" || $key eq "AP_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}"};
+            $taxrate  += $form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
+
+          } 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->{acc_trans}{$key}->[$i - 1]->{amount};
+          $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}++;
+            $totalamount += $form->{"${akey}_$i"};
+
+            $form->{"oldprojectnumber_$k"} = $form->{acc_trans}{$key}->[$i-1]->{projectnumber};
+            $form->{"projectnumber_$k"}    = $form->{acc_trans}{$key}->[$i-1]->{projectnumber};
+            $form->{taxrate}               = $form->{acc_trans}{$key}->[$i - 1]->{rate};
+            $form->{"project_id_$k"}       = $form->{acc_trans}{$key}->[$i-1]->{project_id};
+          }
+
+          $form->{"${key}_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+
+          if ($akey eq "AR") {
+            $form->{ARselected} = $form->{acc_trans}{$key}->[$i-1]->{accno};
+
+          } elsif ($akey eq "amount") {
+            $form->{"${key}_$k"}   = $form->{acc_trans}{$key}->[$i-1]->{accno} . "--" . $form->{acc_trans}{$key}->[$i-1]->{id};
+            $form->{"taxchart_$k"} = $form->{acc_trans}{$key}->[$i-1]->{id}    . "--" . $form->{acc_trans}{$key}->[$i-1]->{rate};
+          }
+        }
+      }
+    }
+  }
+
+  $form->{taxincluded}  = $taxincluded if ($form->{id});
+  $form->{paidaccounts} = 1            if not defined $form->{paidaccounts};
+
+  if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
+
+    # add tax to amounts and invtotal
+    for my $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);
+  }
+
+  $taxamount   = $form->round_amount($taxamount, 2);
+  $form->{tax} = $taxamount;
+
+  $form->{invtotal} = $totalamount + $totaltax;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub storno {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $form, $myconfig, $id) = @_;
+
+  my ($query, $new_id, $storno_row, $acc_trans_rows);
+  my $dbh = $form->get_standard_dbh($myconfig);
+
+  $query = qq|SELECT nextval('glid')|;
+  ($new_id) = selectrow_query($form, $dbh, $query);
+
+  $query = qq|SELECT * FROM ar 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 ar (%s) VALUES (%s)', join(', ', keys %$storno_row), join(', ', map '?', values %$storno_row);
+  do_query($form, $dbh, $query, (values %$storno_row));
+
+  $query = qq|UPDATE ar SET paid = amount + paid, storno = 't' WHERE id = ?|;
+  do_query($form, $dbh, $query, $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 => 'ar', id => $_, dbh => $dbh) } ($id, $new_id);
+
+  $dbh->commit;
+
+  $main::lxdebug->leave_sub();
+}
+
+
 1;