X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/548f4467739c9fea1addee0e0717a89e7be75429..d9c9bc227fbf8518ff8d63428d181d479ed848d8:/SL/IS.pm

diff --git a/SL/IS.pm b/SL/IS.pm
index 86f4d97fc..8947fe9bc 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -34,10 +34,13 @@
 
 package IS;
 
+use List::Util qw(max);
+
 use SL::AM;
 use SL::Common;
 use SL::DBUtils;
 use SL::MoreCommon;
+use Data::Dumper;
 
 sub invoice_details {
   $main::lxdebug->enter_sub();
@@ -153,23 +156,22 @@ sub invoice_details {
         $position = int($position);
         $position++;
       }
-      push(@{ $form->{runningnumber} }, $position);
-      push(@{ $form->{number} },        qq|$form->{"partnumber_$i"}|);
-      push(@{ $form->{serialnumber} },  qq|$form->{"serialnumber_$i"}|);
-      push(@{ $form->{bin} },           qq|$form->{"bin_$i"}|);
-      push(@{ $form->{"partnotes"} },   qq|$form->{"partnotes_$i"}|);
-      push(@{ $form->{description} },   qq|$form->{"description_$i"}|);
-      push(@{ $form->{longdescription} },   qq|$form->{"longdescription_$i"}|);
-      push(@{ $form->{qty} },
-           $form->format_amount($myconfig, $form->{"qty_$i"}));
-      push(@{ $form->{unit} },            qq|$form->{"unit_$i"}|);
-      push(@{ $form->{deliverydate_oe} }, qq|$form->{"deliverydate_$i"}|);
-
-      push(@{ $form->{sellprice} },    $form->{"sellprice_$i"});
-      push(@{ $form->{ordnumber_oe} }, qq|$form->{"ordnumber_$i"}|);
-      push(@{ $form->{transdate_oe} }, qq|$form->{"transdate_$i"}|);
-      push(@{ $form->{invnumber} }, qq|$form->{"invnumber"}|);
-      push(@{ $form->{invdate} }, qq|$form->{"invdate"}|);
+
+      push @{ $form->{runningnumber} },   $position;
+      push @{ $form->{number} },          $form->{"partnumber_$i"};
+      push @{ $form->{serialnumber} },    $form->{"serialnumber_$i"};
+      push @{ $form->{bin} },             $form->{"bin_$i"};
+      push @{ $form->{"partnotes"} },     $form->{"partnotes_$i"};
+      push @{ $form->{description} },     $form->{"description_$i"};
+      push @{ $form->{longdescription} }, $form->{"longdescription_$i"};
+      push @{ $form->{qty} },             $form->format_amount($myconfig, $form->{"qty_$i"});
+      push @{ $form->{unit} },            $form->{"unit_$i"};
+      push @{ $form->{deliverydate_oe} }, $form->{"deliverydate_$i"};
+      push @{ $form->{sellprice} },       $form->{"sellprice_$i"};
+      push @{ $form->{ordnumber_oe} },    $form->{"ordnumber_$i"};
+      push @{ $form->{transdate_oe} },    $form->{"transdate_$i"};
+      push @{ $form->{invnumber} },       $form->{"invnumber"};
+      push @{ $form->{invdate} },         $form->{"invdate"};
 
       if ($form->{lizenzen}) {
         if ($form->{"licensenumber_$i"}) {
@@ -187,75 +189,50 @@ sub invoice_details {
       # listprice
       push(@{ $form->{listprice} }, $form->{"listprice_$i"});
 
-      my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
-      my ($dec) = ($sellprice =~ /\.(\d+)/);
-      $dec = length $dec;
-      my $decimalplaces = ($dec > 2) ? $dec : 2;
-
-      my $i_discount =
-        $form->round_amount(
-                            $sellprice * $form->parse_amount($myconfig,
-                                                 $form->{"discount_$i"}) / 100,
-                            $decimalplaces);
-
-      my $discount =
-        $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
+      my $sellprice     = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+      my ($dec)         = ($sellprice =~ /\.(\d+)/);
+      my $decimalplaces = max 2, length($dec);
 
-      # keep a netprice as well, (sellprice - discount)
-      $form->{"netprice_$i"} = $sellprice - $i_discount;
+      my $discount             = $form->round_amount($form->{"qty_$i"} * $sellprice * $form->{"discount_$i"} / 100, $decimalplaces);
+      my $linetotal            = $form->round_amount($form->{"qty_$i"} * $sellprice * (100 - $form->{"discount_$i"}) / 100, 2);
+      my $nodiscount_linetotal = $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
+      $form->{"netprice_$i"}   = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, 2);
 
-      push(@{ $form->{netprice} },
-           ($form->{"netprice_$i"} != 0)
-           ? $form->format_amount(
-                                 $myconfig, $form->{"netprice_$i"},
-                                 $decimalplaces
-             )
-           : " ");
+      push @{ $form->{netprice} }, ($form->{"netprice_$i"} != 0) ? $form->format_amount($myconfig, $form->{"netprice_$i"}, $decimalplaces) : '';
 
-      my $linetotal =
-        $form->round_amount($form->{"qty_$i"} * $form->{"netprice_$i"}, 2);
+      $linetotal = ($linetotal != 0) ? $linetotal : '';
 
-      my $nodiscount_linetotal =
-        $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
+      push @{ $form->{discount} },   ($discount  != 0) ? $form->format_amount($myconfig, $discount * -1, $decimalplaces) : '';
+      push @{ $form->{p_discount} }, $form->{"discount_$i"};
 
-      $discount =
-        ($discount != 0)
-        ? $form->format_amount($myconfig, $discount * -1, $decimalplaces)
-        : " ";
-      $linetotal = ($linetotal != 0) ? $linetotal : " ";
+      $form->{total}            += $linetotal;
+      $form->{nodiscount_total} += $nodiscount_linetotal;
+      $form->{discount_total}   += $discount;
 
-      push(@{ $form->{discount} },   $discount);
-      push(@{ $form->{p_discount} }, $form->{"discount_$i"});
-      if (($form->{"discount_$i"} ne "") && ($form->{"discount_$i"} != 0)) {
-        $form->{discount_p} = $form->{"discount_$i"};
+      if ($subtotal_header) {
+        $discount_subtotal   += $linetotal;
+        $nodiscount_subtotal += $nodiscount_linetotal;
       }
-      $form->{total} += $linetotal;
-      $discount_subtotal += $linetotal;
-      $form->{nodiscount_total} += $nodiscount_linetotal;
-      $nodiscount_subtotal += $nodiscount_linetotal;
-      $form->{discount_total} += $form->parse_amount($myconfig, $discount);
 
       if ($form->{"subtotal_$i"} && $subtotal_header && ($subtotal_header != $i)) {
-        $discount_subtotal = $form->format_amount($myconfig, $discount_subtotal, 2);
-        push(@{ $form->{discount_sub} },  $discount_subtotal);
-        $nodiscount_subtotal = $form->format_amount($myconfig, $nodiscount_subtotal, 2);
-        push(@{ $form->{nodiscount_sub} }, $nodiscount_subtotal);
-        $discount_subtotal = 0;
+        push @{ $form->{discount_sub} },   $form->format_amount($myconfig, $discount_subtotal,   2);
+        push @{ $form->{nodiscount_sub} }, $form->format_amount($myconfig, $nodiscount_subtotal, 2);
+
+        $discount_subtotal   = 0;
         $nodiscount_subtotal = 0;
-        $subtotal_header = 0;
+        $subtotal_header     = 0;
+
       } else {
-        push(@{ $form->{discount_sub} }, "");
-        push(@{ $form->{nodiscount_sub} }, "");
+        push @{ $form->{discount_sub} },   "";
+        push @{ $form->{nodiscount_sub} }, "";
       }
 
-      if ($linetotal == $netto_linetotal) {
+      if (!$form->{"discount_$i"}) {
         $nodiscount += $linetotal;
       }
 
-      push(@{ $form->{linetotal} },
-           $form->format_amount($myconfig, $linetotal, 2));
-      push(@{ $form->{nodiscount_linetotal} },
-           $form->format_amount($myconfig, $nodiscount_linetotal, 2));
+      push @{ $form->{linetotal} }, $form->format_amount($myconfig, $linetotal, 2);
+      push @{ $form->{nodiscount_linetotal} }, $form->format_amount($myconfig, $nodiscount_linetotal, 2);
 
       push(@{ $form->{projectnumber} }, $projectnumbers{$form->{"project_id_$i"}});
 
@@ -375,19 +352,18 @@ sub invoice_details {
   else {
     $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
   }
-  $yesdiscount = $form->{nodiscount_total} - $nodiscount;
+
   $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
-  $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
-  $form->{nodiscount} = $form->format_amount($myconfig, $nodiscount, 2);
-  $form->{yesdiscount} = $form->format_amount($myconfig, $yesdiscount, 2);
+  $form->{discount_total}      = $form->format_amount($myconfig, $form->{discount_total}, 2);
+  $form->{nodiscount}          = $form->format_amount($myconfig, $nodiscount, 2);
+  $form->{yesdiscount}         = $form->format_amount($myconfig, $form->{nodiscount_total} - $nodiscount, 2);
 
-  $form->{invtotal} =
-    ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
-  $form->{total} =
-    $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
+  $form->{invtotal} = ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
+  $form->{total}    = $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
 
   $form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);
-  $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
+  $form->{paid}     = $form->format_amount($myconfig, $form->{paid}, 2);
+
   $form->set_payment_options($myconfig, $form->{invdate});
 
   $form->{username} = $myconfig->{name};
@@ -492,6 +468,8 @@ sub post_invoice {
   if (!$form->{employee_id}) {
     $form->get_employee($dbh);
   }
+  
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
 
   ($null, $form->{department_id}) = split(/--/, $form->{department});
 
@@ -549,6 +527,10 @@ sub post_invoice {
     my $basefactor;
     my $basqty;
 
+    $form->{"marge_percent_$i"} = $form->parse_amount($myconfig, $form->{"marge_percent_$i"}) * 1;
+    $form->{"marge_absolut_$i"} = $form->parse_amount($myconfig, $form->{"marge_absolut_$i"}) * 1;
+    $form->{"lastcost_$i"} = $form->{"lastcost_$i"} * 1;
+
     if ($form->{storno}) {
       $form->{"qty_$i"} *= -1;
     }
@@ -574,13 +556,12 @@ sub post_invoice {
       }
       $baseqty = $form->{"qty_$i"} * $basefactor;
 
-      # undo discount formatting
-      $form->{"discount_$i"} =
-        $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
-
       my ($allocated, $taxrate) = (0, 0);
       my $taxamount;
 
+      # add tax rates
+      map { $taxrate += $form->{"${_}_rate"} } split(/ /, $form->{"taxaccounts_$i"});
+
       # keep entered selling price
       my $fxsellprice =
         $form->parse_amount($myconfig, $form->{"sellprice_$i"});
@@ -589,19 +570,14 @@ sub post_invoice {
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
 
-      # deduct discount
-      my $discount =
-        $form->round_amount($fxsellprice * $form->{"discount_$i"},
-                            $decimalplaces);
-      $form->{"sellprice_$i"} = $fxsellprice - $discount;
+      # undo discount formatting
+      $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
 
-      # add tax rates
-      map({ $taxrate += $form->{"${_}_rate"} } split(/ /,
-        $form->{"taxaccounts_$i"}));
+      # deduct discount
+      $form->{"sellprice_$i"} = $fxsellprice * (1 - $form->{"discount_$i"});
 
       # round linetotal to 2 decimal places
-      $linetotal =
-        $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+      $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
 
       if ($form->{taxincluded}) {
         $taxamount = $linetotal * ($taxrate / (1 + $taxrate));
@@ -679,15 +655,15 @@ sub post_invoice {
       # get pricegroup_id and save it
       ($null, my $pricegroup_id) = split(/--/, $form->{"sellprice_pg_$i"});
       $pricegroup_id *= 1;
-      my $subtotal = $form->{"subtotal_$i"} * 1;
 
       # save detail record in invoice table
       $query =
         qq|INSERT INTO invoice (trans_id, parts_id, description, longdescription, qty,
                                 sellprice, fxsellprice, discount, allocated, assemblyitem,
                                 unit, deliverydate, project_id, serialnumber, pricegroup_id,
-                                ordnumber, transdate, cusordnumber, base_qty, subtotal)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+                                ordnumber, transdate, cusordnumber, base_qty, subtotal,
+                                marge_percent, marge_total, lastcost)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
 
       @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}),
                  $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"},
@@ -696,7 +672,9 @@ sub post_invoice {
                  $form->{"unit_$i"}, conv_date($form->{"deliverydate_$i"}), conv_i($form->{"project_id_$i"}),
                  $form->{"serialnumber_$i"}, conv_i($pricegroup_id),
                  $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
-                 $form->{"cusordnumber_$i"}, $baseqty, $subtotal);
+                 $form->{"cusordnumber_$i"}, $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
+                 $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
+                 $form->{"lastcost_$i"});
       do_query($form, $dbh, $query, @values);
 
       if ($form->{lizenzen} && $form->{"licensenumber_$i"}) {
@@ -893,6 +871,9 @@ sub post_invoice {
                                    $form->{"exchangerate_$i"}, 0);
       }
     }
+
+  } else {                      # if (!$form->{storno})
+    $form->{marge_total} *= -1;
   }
 
   if ($payments_only) {
@@ -929,77 +910,32 @@ sub post_invoice {
 
   $amount = $netamount + $tax;
 
-  # fill in subject if there is none
-  $form->{subject} = qq|$form->{label} $form->{invnumber}|
-    unless $form->{subject};
-
-  # if there is a message stuff it into the intnotes
-  my $cc  = "Cc: $form->{cc}\\r\n"   if $form->{cc};
-  my $bcc = "Bcc: $form->{bcc}\\r\n" if $form->{bcc};
-  my $now = scalar localtime;
-  $form->{intnotes} .= qq|\r
-\r| if $form->{intnotes};
-
-  $form->{intnotes} .= qq|[email]\r
-Date: $now
-To: $form->{email}\r
-$cc${bcc}Subject: $form->{subject}\r
-\r
-Message: $form->{message}\r| if $form->{message};
-
   # save AR record
   $query = qq|UPDATE ar set
-                invnumber = ?,
-                ordnumber = ?,
-                quonumber = ?,
-                cusordnumber = ?,
-                transdate = ?,
-                orddate = ?,
-                quodate = ?,
-                customer_id = ?,
-                amount = ?,
-                netamount = ?,
-                paid = ?,
-                datepaid = ?,
-                duedate = ?,
-                deliverydate = ?,
-                invoice = '1',
-                shippingpoint = ?,
-                shipvia = ?,
-                terms = ?,
-                notes = ?,
-                intnotes = ?,
-                taxincluded = ?,
-                curr = ?,
-                department_id = ?,
-                payment_id = ?,
-                type = ?,
-                language_id = ?,
-                taxzone_id = ?,
-                shipto_id = ?,
-                delivery_customer_id = ?,
-                delivery_vendor_id = ?,
-                employee_id = ?,
-                salesman_id = ?,
-                storno = ?,
-                globalproject_id = ?,
-                cp_id = ?,
-                transaction_description = ?
+                invnumber   = ?, ordnumber     = ?, quonumber     = ?, cusordnumber  = ?,
+                transdate   = ?, orddate       = ?, quodate       = ?, customer_id   = ?,
+                amount      = ?, netamount     = ?, paid          = ?, datepaid      = ?,
+                duedate     = ?, deliverydate  = ?, invoice       = ?, shippingpoint = ?,
+                shipvia     = ?, terms         = ?, notes         = ?, intnotes      = ?,
+                curr        = ?, department_id = ?, payment_id    = ?, taxincluded   = ?,
+                type        = ?, language_id   = ?, taxzone_id    = ?, shipto_id     = ?,
+                employee_id = ?, salesman_id   = ?, storno_id     = ?, storno        = ?,
+                cp_id       = ?, marge_total   = ?, marge_percent = ?, 
+                globalproject_id               = ?, delivery_customer_id             = ?,
+                transaction_description        = ?, delivery_vendor_id               = ?
               WHERE id = ?|;
-  @values = ($form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
-             conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}),
-             conv_i($form->{"customer_id"}), $amount, $netamount, $form->{"paid"},
-             conv_date($form->{"datepaid"}), conv_date($form->{"duedate"}), conv_date($form->{"deliverydate"}),
-             $form->{"shippingpoint"}, $form->{"shipvia"}, conv_i($form->{"terms"}),
-             $form->{"notes"}, $form->{"intnotes"}, $form->{"taxincluded"} ? 't' : 'f',
-             $form->{"currency"}, conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}),
-             $form->{"type"}, conv_i($form->{"language_id"}), conv_i($form->{"taxzone_id"}),
-             conv_i($form->{"shipto_id"}),
-             conv_i($form->{"delivery_customer_id"}), conv_i($form->{"delivery_vendor_id"}),
-             conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),
-             $form->{"storno"} ? 't' : 'f', conv_i($form->{"globalproject_id"}),
-             conv_i($form->{"cp_id"}), $form->{transaction_description},
-             conv_i($form->{"id"}));
+  @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
+             conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}), 
+                       $amount,                        $netamount,                       $form->{"paid"},     conv_date($form->{"datepaid"}), 
+             conv_date($form->{"duedate"}),  conv_date($form->{"deliverydate"}),    '1',                                $form->{"shippingpoint"},
+                       $form->{"shipvia"},      conv_i($form->{"terms"}),                $form->{"notes"},              $form->{"intnotes"},
+                       $form->{"currency"},     conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}),        $form->{"taxincluded"} ? 't' : 'f',
+                       $form->{"type"},         conv_i($form->{"language_id"}),   conv_i($form->{"taxzone_id"}), conv_i($form->{"shipto_id"}),
+                conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),   conv_i($form->{storno_id}),           $form->{"storno"} ? 't' : 'f', 
+                conv_i($form->{"cp_id"}),            1 * $form->{marge_total} ,      1 * $form->{marge_percent},
+                conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}), 
+                       $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
+                conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
   
   if($form->{"formname"} eq "credit_note") {
@@ -1050,34 +986,31 @@ sub _delete_payments {
 
   my ($self, $form, $dbh) = @_;
 
-  my (@delete_oids, $delete_next, $sth, $ref);
+  my @delete_oids;
 
   # Delete old payment entries from acc_trans.
   my $query =
-    qq|SELECT at.oid, at.*, c.link
-       FROM acc_trans at
-       LEFT JOIN chart c ON (at.chart_id = c.id)
-       WHERE (trans_id = ?)
-       ORDER BY at.oid|;
-
-  $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
-
-  while ($ref = $sth->fetchrow_hashref()) {
-    if ($delete_next) {
-      push @delete_oids, $ref->{oid};
-      undef $delete_next;
-      next;
-    }
+    qq|SELECT oid
+       FROM acc_trans
+       WHERE (trans_id = ?) AND fx_transaction
 
-    $ref->{LINKS} = { map { $_, 1 } split m/:/, $ref->{link} };
+       UNION
 
-    if ($ref->{fx_transaction} || ($ref->{LINKS}->{AR} && ($ref->{amount} >= 0))) {
-      push @delete_oids, $ref->{oid};
-      $delete_next = $ref->{LINKS}->{AR};
-    }
-  }
+       SELECT at.oid
+       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_oids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}), conv_i($form->{id}));
 
-  $sth->finish();
+  $query =
+    qq|SELECT at.oid
+       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.oid
+       OFFSET 1|;
+  push @delete_oids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}));
 
   if (@delete_oids) {
     $query = qq|DELETE FROM acc_trans WHERE oid IN (| . join(", ", @delete_oids) . qq|)|;
@@ -1097,18 +1030,11 @@ sub post_payment {
 
   my (%payments, $old_form, $row, $item, $query, %keep_vars);
 
-  my @prior;
-  push @prior, selectall_hashref_query($form, $dbh, qq|SELECT id, paid, datepaid FROM ar WHERE id = ?|, $form->{id});
-  push @prior, selectall_hashref_query($form, $dbh, qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid|, $form->{id});
-
   $old_form = save_form();
 
   # Delete all entries in acc_trans from prior payments.
   $self->_delete_payments($form, $dbh);
 
-  my @after_dp;
-  push @after_dp, selectall_hashref_query($form, $dbh, qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid|, $form->{id});
-
   # Save the new payments the user made before cleaning up $form.
   map { $payments{$_} = $form->{$_} } grep m/^datepaid_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^AR_paid_\d+$|^paidaccounts$/, keys %{ $form };
 
@@ -1119,7 +1045,7 @@ sub post_payment {
   # Retrieve the invoice from the database.
   $self->retrieve_invoice($myconfig, $form);
 
-  # Set up the content of $form in the way that IR::post_invoice() expects.
+  # Set up the content of $form in the way that IS::post_invoice() expects.
   $form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate});
 
   for $row (1 .. scalar @{ $form->{invoice_details} }) {
@@ -1137,7 +1063,7 @@ sub post_payment {
   # Restore the payment options from the user input.
   map { $form->{$_} = $payments{$_} } keys %payments;
 
-  # Get the AP accno (which is normally done by Form::create_links()).
+  # Get the AR accno (which is normally done by Form::create_links()).
   $query =
     qq|SELECT c.accno
        FROM acc_trans at
@@ -1154,20 +1080,7 @@ sub post_payment {
 
   restore_form($old_form);
 
-  my @after;
-  push @after, selectall_hashref_query($form, $dbh, qq|SELECT id, paid, datepaid FROM ar WHERE id = ?|, $form->{id});
-  push @after, selectall_hashref_query($form, $dbh, qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid|, $form->{id});
-
-  foreach my $rows (@prior, @after_dp, @after) {
-    map { delete @{$_}{qw(itime mtime)} } @{ $rows };
-  }
-
-  map { $main::lxdebug->dump_sql_result(0, 'davor ', $_) } @prior;
-  map { $main::lxdebug->dump_sql_result(0, 'nachDP', $_) } @after_dp;
-  map { $main::lxdebug->dump_sql_result(0, 'danach', $_) } @after;
-
-  my $rc = 1;
-#   my $rc = $dbh->commit();
+  my $rc = $dbh->commit();
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
@@ -1230,19 +1143,9 @@ sub cogs {
   my $taxzone_id = $form->{"taxzone_id"} * 1;
   my $query =
     qq|SELECT i.id, i.trans_id, i.base_qty, i.allocated, i.sellprice,
-
-         c1.accno AS inventory_accno,
-         c1.new_chart_id AS inventory_new_chart,
-         date($transdate) - c1.valid_from AS inventory_valid,
-
-         c2.accno AS income_accno,
-         c2.new_chart_id AS income_new_chart,
-         date($transdate)  - c2.valid_from AS income_valid,
-
-         c3.accno AS expense_accno,
-         c3.new_chart_id AS expense_new_chart,
-         date($transdate) - c3.valid_from AS expense_valid
-
+         c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from AS inventory_valid,
+         c2.accno AS    income_accno, c2.new_chart_id AS    income_new_chart, date($transdate) - c2.valid_from AS    income_valid,
+         c3.accno AS   expense_accno, c3.new_chart_id AS   expense_new_chart, date($transdate) - c3.valid_from AS   expense_valid
        FROM invoice i, parts p
        LEFT JOIN chart c1 ON ((SELECT inventory_accno_id FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id)
        LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
@@ -1433,6 +1336,7 @@ sub retrieve_invoice {
            a.employee_id, a.salesman_id, a.payment_id,
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
            a.transaction_description,
+           a.marge_total, a.marge_percent,
            e.name AS employee
          FROM ar a
          LEFT JOIN employee e ON (e.id = a.employee_id)
@@ -1441,8 +1345,7 @@ sub retrieve_invoice {
     map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
 
-    $form->{exchangerate} =
-      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
+    $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
 
     # get shipto
     $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module = 'AR')|;
@@ -1452,30 +1355,25 @@ sub retrieve_invoice {
 
     foreach my $vc (qw(customer vendor)) {
       next if !$form->{"delivery_${vc}_id"};
-      ($form->{"delivery_${vc}_string"})
-        = selectrow_query($form, $dbh, qq|SELECT name FROM customer WHERE id = ?|, $id);
+      ($form->{"delivery_${vc}_string"}) = selectrow_query($form, $dbh, qq|SELECT name FROM customer WHERE id = ?|, $id);
     }
 
     # get printed, emailed
-    $query =
-      qq|SELECT printed, emailed, spoolfile, formname
-         FROM status
-         WHERE trans_id = ?|;
+    $query = qq|SELECT printed, emailed, spoolfile, formname FROM status WHERE trans_id = ?|;
     $sth = prepare_execute_query($form, $dbh, $query, $id);
 
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
       $form->{printed} .= "$ref->{formname} " if $ref->{printed};
       $form->{emailed} .= "$ref->{formname} " if $ref->{emailed};
-      $form->{queued} .= "$ref->{formname} $ref->{spoolfile} "
-        if $ref->{spoolfile};
+      $form->{queued} .= "$ref->{formname} $ref->{spoolfile} " if $ref->{spoolfile};
     }
     $sth->finish;
     map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
 
-    my $transdate =
-      $form->{deliverydate} ? $dbh->quote($form->{deliverydate}) :
-      $form->{invdate}      ? $dbh->quote($form->{invdate}) :
-                              "current_date";
+    my $transdate = $form->{deliverydate} ? $dbh->quote($form->{deliverydate})
+                  : $form->{invdate}      ? $dbh->quote($form->{invdate})
+                  :                         "current_date";
+     
 
     my $taxzone_id = $form->{taxzone_id} *= 1;
     $taxzone_id = 0 if (0 > $taxzone_id) || (3 < $taxzone_id);
@@ -1483,29 +1381,14 @@ sub retrieve_invoice {
     # retrieve individual items
     $query =
       qq|SELECT
-           c1.accno AS inventory_accno,
-           c1.new_chart_id AS inventory_new_chart,
-           date($transdate) - c1.valid_from AS inventory_valid,
+           c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from AS inventory_valid,
+           c2.accno AS income_accno,    c2.new_chart_id AS income_new_chart,    date($transdate) - c2.valid_from as income_valid,
+           c3.accno AS expense_accno,   c3.new_chart_id AS expense_new_chart,   date($transdate) - c3.valid_from AS expense_valid,
 
-           c2.accno AS income_accno,
-           c2.new_chart_id AS income_new_chart,
-           date($transdate) - c2.valid_from as income_valid,
-
-           c3.accno AS expense_accno,
-           c3.new_chart_id AS expense_new_chart,
-           date($transdate) - c3.valid_from AS expense_valid,
-
-           i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice,
-           i.discount, i.parts_id AS id, i.unit, i.deliverydate,
-           i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id,
-           i.ordnumber, i.transdate, i.cusordnumber, i.subtotal,
-
-           p.partnumber, p.assembly, p.bin, p.notes AS partnotes,
-           p.inventory_accno_id AS part_inventory_accno_id, p.formel,
-
-           pr.projectnumber,
-           pg.partsgroup,
-           prg.pricegroup
+           i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.discount, i.parts_id AS id, i.unit, i.deliverydate,
+           i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id, i.ordnumber, i.transdate, i.cusordnumber, i.subtotal, i.lastcost,
+           p.partnumber, p.assembly, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, p.formel,
+           pr.projectnumber, pg.partsgroup, prg.pricegroup
 
          FROM invoice i
          LEFT JOIN parts p ON (i.parts_id = p.id)
@@ -1513,65 +1396,41 @@ sub retrieve_invoice {
          LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
          LEFT JOIN pricegroup prg ON (i.pricegroup_id = prg.id)
 
-         LEFT JOIN chart c1 ON
-           ((SELECT inventory_accno_id
-             FROM buchungsgruppen
-             WHERE id = p.buchungsgruppen_id) = c1.id)
-         LEFT JOIN chart c2 ON
-           ((SELECT income_accno_id_${taxzone_id}
-             FROM buchungsgruppen
-             WHERE id=p.buchungsgruppen_id) = c2.id)
-         LEFT JOIN chart c3 ON
-           ((SELECT expense_accno_id_${taxzone_id}
-             FROM buchungsgruppen
-             WHERE id = p.buchungsgruppen_id) = c3.id)
-
-         WHERE (i.trans_id = ?)
-           AND NOT (i.assemblyitem = '1')
-         ORDER BY i.id|;
+         LEFT JOIN chart c1 ON ((SELECT inventory_accno_id             FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id)
+         LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id}  FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
+         LEFT JOIN chart c3 ON ((SELECT expense_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c3.id)
+
+         WHERE (i.trans_id = ?) AND NOT (i.assemblyitem = '1') ORDER BY i.id|;
 
     $sth = prepare_execute_query($form, $dbh, $query, $id);
 
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-      if (!$ref->{"part_inventory_accno_id"}) {
-        map({ delete($ref->{$_}); } qw(inventory_accno inventory_new_chart inventory_valid));
-      }
+      map({ delete($ref->{$_}); } qw(inventory_accno inventory_new_chart inventory_valid)) if !$ref->{"part_inventory_accno_id"};
       delete($ref->{"part_inventory_accno_id"});
 
       foreach my $type (qw(inventory income expense)) {
         while ($ref->{"${type}_new_chart"} && ($ref->{"${type}_valid"} >=0)) {
-          my $query =
-            qq|SELECT accno, new_chart_id, date($transdate) - valid_from
-               FROM chart
-               WHERE id = ?|;
-          ($ref->{"${type}_accno"},
-           $ref->{"${type}_new_chart"},
-           $ref->{"${type}_valid"})
-            = selectrow_query($form, $dbh, $query, $ref->{"${type}_new_chart"});
+          my $query = qq|SELECT accno, new_chart_id, date($transdate) - valid_from FROM chart WHERE id = ?|;
+          @$ref{ map $type.$_, qw(_accno _new_chart _valid) } = selectrow_query($form, $dbh, $query, $ref->{"${type}_new_chart"});
         }
       }
 
       # get tax rates and description
-      my $accno_id =
-        ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+      my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
       $query =
-        qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
-           FROM tax t
+        qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber FROM tax t
            LEFT JOIN chart c ON (c.id = t.chart_id)
            WHERE t.id IN
-             (SELECT tk.tax_id
-              FROM taxkeys tk
-              WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
+             (SELECT tk.tax_id FROM taxkeys tk
+              WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?) 
                 AND startdate <= date($transdate)
-              ORDER BY startdate DESC
-              LIMIT 1)
+              ORDER BY startdate DESC LIMIT 1)
            ORDER BY c.accno|;
       my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
       $ref->{taxaccounts} = "";
       my $i=0;
       while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
 
-        #    if ($customertax{$ref->{accno}}) {
         if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
           $i++;
           $ptr->{accno} = $i;
@@ -1588,12 +1447,8 @@ sub retrieve_invoice {
       }
 
       if ($form->{lizenzen}) {
-        $query =
-          qq|SELECT l.licensenumber, l.id AS licenseid
-             FROM license l, licenseinvoice li
-             WHERE l.id = li.license_id AND li.trans_id = ?|;
-        my ($licensenumber, $licenseid)
-          = selectrow_query($form, $dbh, $query, conv_i($ref->{invoice_pos}));
+        $query = qq|SELECT l.licensenumber, l.id AS licenseid FROM license l, licenseinvoice li WHERE l.id = li.license_id AND li.trans_id = ?|;
+        my ($licensenumber, $licenseid) = selectrow_query($form, $dbh, $query, conv_i($ref->{invoice_pos}));
         $ref->{lizenzen} = "<option value=\"$licenseid\">$licensenumber</option>";
       }
 
@@ -1815,7 +1670,7 @@ sub retrieve_item {
   my $query =
     qq|SELECT
          p.id, p.partnumber, p.description, p.sellprice,
-         p.listprice, p.inventory_accno_id,
+         p.listprice, p.inventory_accno_id, p.lastcost,
 
          c1.accno AS inventory_accno,
          c1.new_chart_id AS inventory_new_chart,
@@ -2182,9 +2037,9 @@ sub has_storno {
 sub is_storno {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $table) = @_;
+  my ($self, $myconfig, $form, $table, $id) = @_;
 
-  $main::lxdebug->leave_sub() and return 0 unless ($form->{id});
+  $main::lxdebug->leave_sub() and return 0 unless ($id);
 
   # make sure there's no funny stuff in $table
   # ToDO: die when this happens and throw an error
@@ -2193,7 +2048,7 @@ sub is_storno {
   my $dbh = $form->dbconnect($myconfig);
 
   my $query = qq|SELECT storno FROM $table WHERE id = ?|;
-  my ($result) = selectrow_query($form, $dbh, $query, $form->{id});
+  my ($result) = selectrow_query($form, $dbh, $query, $id);
 
   $dbh->disconnect();