Alle Queries zur Vermeidung von SQL injections auf die Verwendung von Parametern...
[kivitendo-erp.git] / SL / IS.pm
index ea7b8a5..205cbcb 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
 
 package IS;
 
+use Data::Dumper;
+use SL::AM;
+use SL::Common;
+use SL::DBUtils;
 
 sub invoice_details {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $locale) = @_;
 
-  $form->{duedate} = $form->{invdate} unless ($form->{duedate});
+  $form->{duedate} ||= $form->{invdate};
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
+  my $sth;
 
-  my $query = qq|SELECT date '$form->{duedate}' - date '$form->{invdate}'
-                 AS terms
-                FROM defaults|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query = qq|SELECT date | . conv_dateq($form->{duedate}) . qq| - date | . conv_dateq($form->{invdate}) . qq| AS terms|;
+  ($form->{terms}) = selectrow_query($form, $dbh, $query);
 
-  ($form->{terms}) = $sth->fetchrow_array;
-  $sth->finish;
+  my (@project_ids, %projectnumbers);
+
+  push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});
+
+  # sort items by partsgroup
+  for $i (1 .. $form->{rowcount}) {
+    $partsgroup = "";
+    if ($form->{"partsgroup_$i"} && $form->{groupitems}) {
+      $partsgroup = $form->{"partsgroup_$i"};
+    }
+    push @partsgroup, [$i, $partsgroup];
+    push(@project_ids, $form->{"project_id_$i"}) if ($form->{"project_id_$i"});
+  }
+
+  if (@project_ids) {
+    $query = "SELECT id, projectnumber FROM project WHERE id IN (" .
+      join(", ", map({ "?" } @project_ids)) . ")";
+    $sth = $dbh->prepare($query);
+    $sth->execute(@project_ids) ||
+      $form->dberror($query . " (" . join(", ", @project_ids) . ")");
+    while (my $ref = $sth->fetchrow_hashref()) {
+      $projectnumbers{$ref->{id}} = $ref->{projectnumber};
+    }
+    $sth->finish();
+  }
+
+  $form->{"globalprojectnumber"} =
+    $projectnumbers{$form->{"globalproject_id"}};
 
   my $tax = 0;
   my $item;
   my $i;
   my @partsgroup = ();
   my $partsgroup;
-  my %oid = ( 'Pg' => 'oid',
-              'Oracle' => 'rowid' );
-  
+  my %oid = ('Pg'     => 'oid',
+             'Oracle' => 'rowid');
+
   # sort items by partsgroup
   for $i (1 .. $form->{rowcount}) {
     $partsgroup = "";
     if ($form->{"partsgroup_$i"} && $form->{groupitems}) {
-      $form->format_string("partsgroup_$i");
       $partsgroup = $form->{"partsgroup_$i"};
     }
-    push @partsgroup, [ $i, $partsgroup ];
+    push @partsgroup, [$i, $partsgroup];
   }
-  
+
   my $sameitem = "";
   my @taxaccounts;
   my %taxaccounts;
@@ -80,6 +107,23 @@ sub invoice_details {
   my $taxamount;
   my $taxbase;
   my $taxdiff;
+  my $nodiscount;
+  my $yesdiscount;
+  my $nodiscount_subtotal = 0;
+  my $discount_subtotal = 0;
+  my $position = 0;
+  my $subtotal_header = 0;
+  my $subposition = 0;
+
+  my @arrays =
+    qw(runningnumber number description longdescription qty ship unit bin
+       deliverydate_oe ordnumber_oe transdate_oe licensenumber validuntil
+       partnotes serialnumber reqdate sellprice listprice netprice
+       discount p_discount discount_sub nodiscount_sub
+       linetotal  nodiscount_linetotal tax_rate projectnumber);
+
+  my @tax_arrays =
+    qw(taxbase tax taxdescription taxrate taxnumber);
 
   foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
     $i = $item->[0];
@@ -88,44 +132,58 @@ sub invoice_details {
       push(@{ $form->{description} }, qq|$item->[1]|);
       $sameitem = $item->[1];
 
-      map { push(@{ $form->{$_} }, "") } qw(runningnumber number serialnumber bin partnotes qty unit deliverydate sellprice listprice netprice discount linetotal);
+      map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
     }
-    
+
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
-    
-    if ($form->{"qty_$i"} != 0) {
-
-      # add number, description and qty to $form->{number}, ....
-      push(@{ $form->{runningnumber} }, $i);
-      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->{qty} }, $form->format_amount($myconfig, $form->{"qty_$i"}));
-      push(@{ $form->{unit} }, qq|$form->{"unit_$i"}|);
-      push(@{ $form->{deliverydate} }, qq|$form->{"deliverydate_$i"}|);
-      
-      push(@{ $form->{sellprice} }, $form->{"sellprice_$i"});
-      
+
+    if ($form->{"id_$i"} != 0) {
+
+      # add number, description and qty to $form->{number},
+      if ($form->{"subtotal_$i"} && !$subtotal_header) {
+        $subtotal_header = $i;
+        $position = int($position);
+        $subposition = 0;
+        $position++;
+      } elsif ($subtotal_header) {
+        $subposition += 1;
+        $position = int($position);
+        $position = $position.".".$subposition;
+      } else {
+        $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"}|);
+
       if ($form->{lizenzen}) {
         if ($form->{"licensenumber_$i"}) {
-          $query = qq|SELECT l.licensenumber, l.validuntil FROM license l WHERE l.id = $form->{"licensenumber_$i"}|;
-          $sth = $dbh->prepare($query);
-          $sth->execute || $form->dberror($query);
-  
-          ($licensenumber, $validuntil) = $sth->fetchrow_array;
+          $query = qq|SELECT licensenumber, validuntil FROM license WHERE id = ?|;
+          ($licensenumber, $validuntil) = selectrow_query($form, $dbh, $query, conv_i($form->{"licensenumber_$i"}));
           push(@{ $form->{licensenumber} }, $licensenumber);
           push(@{ $form->{validuntil} }, $locale->date($myconfig, $validuntil, 0));
-          $licensenumber = "Lizenz: ".$licensenumber;
-          $sth->finish;
-          push(@{ $form->{licensenumber} }, $licensenumber);
+
         } else {
           push(@{ $form->{licensenumber} }, "");
-          push(@{ $form->{validuntil} }, "");
+          push(@{ $form->{validuntil} },    "");
         }
       }
-      
+
       # listprice
       push(@{ $form->{listprice} }, $form->{"listprice_$i"});
 
@@ -133,210 +191,294 @@ sub invoice_details {
       my ($dec) = ($sellprice =~ /\.(\d+)/);
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
-      
-      my $discount = $form->round_amount($sellprice * $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100, $decimalplaces);
-      
-      # keep a netprice as well, (sellprice - discount)
-      $form->{"netprice_$i"} = $sellprice - $discount;
-      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);
+      my $i_discount =
+        $form->round_amount(
+                            $sellprice * $form->parse_amount($myconfig,
+                                                 $form->{"discount_$i"}) / 100,
+                            $decimalplaces);
 
-      $discount = ($discount != 0) ? $form->format_amount($myconfig, $discount * -1, $decimalplaces) : " ";
+      my $discount =
+        $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
+
+      # keep a netprice as well, (sellprice - discount)
+      $form->{"netprice_$i"} = $sellprice - $i_discount;
+
+      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);
+
+      my $nodiscount_linetotal =
+        $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
+
+      $discount =
+        ($discount != 0)
+        ? $form->format_amount($myconfig, $discount * -1, $decimalplaces)
+        : " ";
       $linetotal = ($linetotal != 0) ? $linetotal : " ";
-      
-      push(@{ $form->{discount} }, $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"};
+      }
       $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;
+        $nodiscount_subtotal = 0;
+        $subtotal_header = 0;
+      } else {
+        push(@{ $form->{discount_sub} }, "");
+        push(@{ $form->{nodiscount_sub} }, "");
+      }
+
+      if ($linetotal == $netto_linetotal) {
+        $nodiscount += $linetotal;
+      }
+
+      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"}});
+
+      @taxaccounts = split(/ /, $form->{"taxaccounts_$i"});
+      $taxrate     = 0;
+      $taxdiff     = 0;
 
-      push(@{ $form->{linetotal} }, $form->format_amount($myconfig, $linetotal, 2));
-      
-      @taxaccounts = split / /, $form->{"taxaccounts_$i"};
-      $taxrate = 0;
-      $taxdiff = 0;
-      
       map { $taxrate += $form->{"${_}_rate"} } @taxaccounts;
 
       if ($form->{taxincluded}) {
-       # calculate tax
-       $taxamount = $linetotal * $taxrate / (1 + $taxrate);
-       $taxbase = $linetotal - $taxamount;
+
+        # calculate tax
+        $taxamount = $linetotal * $taxrate / (1 + $taxrate);
+        $taxbase = $linetotal - $taxamount;
       } else {
         $taxamount = $linetotal * $taxrate;
-       $taxbase = $linetotal;
+        $taxbase   = $linetotal;
       }
 
-      if ($form->round_amount($taxrate,7) == 0) {
-       if ($form->{taxincluded}) {
-         foreach $item (@taxaccounts) {
-           $taxamount = $form->round_amount($linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"})), 2);
-           
-           $taxaccounts{$item} += $taxamount;
-           $taxdiff += $taxamount;
-           
-           $taxbase{$item} += $taxbase;
-         }
-         $taxaccounts{$taxaccounts[0]} += $taxdiff;
-       } else {
-         foreach $item (@taxaccounts) {
-           $taxaccounts{$item} += $linetotal * $form->{"${item}_rate"};
-           $taxbase{$item} += $taxbase;
-         }
-       }
+      if ($form->round_amount($taxrate, 7) == 0) {
+        if ($form->{taxincluded}) {
+          foreach $item (@taxaccounts) {
+            $taxamount =
+              $form->round_amount($linetotal * $form->{"${item}_rate"} /
+                                    (1 + abs($form->{"${item}_rate"})),
+                                  2);
+
+            $taxaccounts{$item} += $taxamount;
+            $taxdiff            += $taxamount;
+
+            $taxbase{$item} += $taxbase;
+          }
+          $taxaccounts{ $taxaccounts[0] } += $taxdiff;
+        } else {
+          foreach $item (@taxaccounts) {
+            $taxaccounts{$item} += $linetotal * $form->{"${item}_rate"};
+            $taxbase{$item}     += $taxbase;
+          }
+        }
       } else {
-       foreach $item (@taxaccounts) {
-         $taxaccounts{$item} += $taxamount * $form->{"${item}_rate"} / $taxrate;
-         $taxbase{$item} += $taxbase;
-       }
+        foreach $item (@taxaccounts) {
+          $taxaccounts{$item} +=
+            $taxamount * $form->{"${item}_rate"} / $taxrate;
+          $taxbase{$item} += $taxbase;
+        }
       }
-      
-
+      $tax_rate = $taxrate * 100;
+      push(@{ $form->{tax_rate} }, qq|$tax_rate|);
       if ($form->{"assembly_$i"}) {
-       $sameitem = "";
-       
+        $sameitem = "";
+
         # get parts and push them onto the stack
-       my $sortorder = "";
-       if ($form->{groupitems}) {
-         $sortorder = qq|ORDER BY pg.partsgroup, a.$oid{$myconfig->{dbdriver}}|;
-       } else {
-         $sortorder = qq|ORDER BY a.$oid{$myconfig->{dbdriver}}|;
-       }
-       
-       $query = qq|SELECT p.partnumber, p.description, p.unit, a.qty,
-                   pg.partsgroup
-                   FROM assembly a
-                   JOIN parts p ON (a.parts_id = p.id)
-                   LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                   WHERE a.bom = '1'
-                   AND a.id = '$form->{"id_$i"}'
-                   $sortorder|;
-        $sth = $dbh->prepare($query);
-        $sth->execute || $form->dberror($query);
-
-       while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-         if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
-           map { push(@{ $form->{$_} }, "") } qw(runningnumber number serialnumber unit qty bin sellprice listprice netprice discount linetotal);
-           $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
-           push(@{ $form->{description} }, $sameitem);
-         }
-           
-         map { $form->{"a_$_"} = $ref->{$_} } qw(partnumber description);
-         $form->format_string("a_partnumber", "a_description");
-         
-         push(@{ $form->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq| -- $form->{"a_partnumber"}, $form->{"a_description"}|);
-          map { push(@{ $form->{$_} }, "") } qw(number unit qty runningnumber serialnumber bin sellprice listprice netprice discount linetotal);
-         
-       }
-       $sth->finish;
+        my $sortorder = "";
+        if ($form->{groupitems}) {
+          $sortorder =
+            qq|ORDER BY pg.partsgroup, a.$oid{$myconfig->{dbdriver}}|;
+        } else {
+          $sortorder = qq|ORDER BY a.$oid{$myconfig->{dbdriver}}|;
+        }
+
+        $query =
+          qq|SELECT p.partnumber, p.description, p.unit, a.qty, pg.partsgroup
+             FROM assembly a
+             JOIN parts p ON (a.parts_id = p.id)
+             LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+             WHERE (a.bom = '1') AND (a.id = ?) $sortorder|;
+        $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id_$i"}));
+
+        while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+          if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
+            map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+            $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
+            push(@{ $form->{description} }, $sameitem);
+          }
+
+          map { $form->{"a_$_"} = $ref->{$_} } qw(partnumber description);
+
+          push(@{ $form->{description} },
+               $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}
+                 )
+                 . qq| -- $form->{"a_partnumber"}, $form->{"a_description"}|);
+          map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+
+        }
+        $sth->finish;
       }
     }
   }
 
-
   foreach my $item (sort keys %taxaccounts) {
-    if ($form->round_amount($taxaccounts{$item}, 2) != 0) {
-      push(@{ $form->{taxbase} }, $form->format_amount($myconfig, $taxbase{$item}, 2));
+    push(@{ $form->{taxbase} },
+          $form->format_amount($myconfig, $taxbase{$item}, 2));
 
-      $tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
+    $tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
 
-      push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount));
-      push(@{ $form->{taxdescription} }, $form->{"${item}_description"});
-      push(@{ $form->{taxrate} }, $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
-      push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
-    }
+    push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
+    push(@{ $form->{taxdescription} }, $form->{"${item}_description"}  . q{ } . 100 * $form->{"${item}_rate"} . q{%});
+    push(@{ $form->{taxrate} },
+          $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
+    push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
   }
-    
 
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"}) {
       push(@{ $form->{payment} }, $form->{"paid_$i"});
-      my ($accno, $description) = split /--/, $form->{"AR_paid_$i"};
-      push(@{ $form->{paymentaccount} }, $description); 
-      push(@{ $form->{paymentdate} }, $form->{"datepaid_$i"});
-      push(@{ $form->{paymentsource} }, $form->{"source_$i"});
+      my ($accno, $description) = split(/--/, $form->{"AR_paid_$i"});
+      push(@{ $form->{paymentaccount} }, $description);
+      push(@{ $form->{paymentdate} },    $form->{"datepaid_$i"});
+      push(@{ $form->{paymentsource} },  $form->{"source_$i"});
 
       $form->{paid} += $form->parse_amount($myconfig, $form->{"paid_$i"});
     }
   }
-  
-  $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 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);
+  if($form->{taxincluded}) {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{total} - $tax, 2);
+  }
+  else {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+  }
+  $yesdiscount = $form->{nodiscount_total} - $nodiscount;
+  $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
+  $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
+  $form->{nodiscount} = $form->format_amount($myconfig, $nodiscount, 2);
+  $form->{yesdiscount} = $form->format_amount($myconfig, $yesdiscount, 2);
 
-  $form->{paid} = $form->format_amount($myconfig, $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->set_payment_options($myconfig, $form->{invdate});
 
-  # myconfig variables
-  map { $form->{$_} = $myconfig->{$_} } (qw(company address tel fax signature businessnumber));
   $form->{username} = $myconfig->{name};
 
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
 sub project_description {
   $main::lxdebug->enter_sub();
 
   my ($self, $dbh, $id) = @_;
 
-  my $query = qq|SELECT p.description
-                 FROM project p
-                WHERE p.id = $id|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($_) = $sth->fetchrow_array;
-
-  $sth->finish;
+  my $query = qq|SELECT description FROM project WHERE id = ?|;
+  my ($description) = selectrow_query($form, $dbh, $query, conv_i($id));
 
   $main::lxdebug->leave_sub();
 
   return $_;
 }
 
-
 sub customer_details {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-  
+  my ($self, $myconfig, $form, @wanted_vars) = @_;
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   # get contact id, set it if nessessary
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
-  
-  $contact = "";
+  $form->{cp_id} *= 1;
+
+  my @values;
+
+  my $where = "";
   if ($form->{cp_id}) {
-    $contact = "and cp.cp_id = $form->{cp_id}";
+    $where = qq| AND (cp.cp_id = ?) |;
+    push(@values, conv_i($form->{cp_id}));
   }
-    
-  $taxincluded = $form->{taxincluded};
-  
+
   # get rest for the customer
-  my $query = qq|SELECT ct.*, cp.*, ct.notes as customernotes
-                 FROM customer ct
-                 LEFT JOIN contacts cp on ct.id = cp.cp_cv_id
-                WHERE ct.id = $form->{customer_id} $contact order by cp.cp_id limit 1|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $query =
+    qq|SELECT ct.*, cp.*, ct.notes as customernotes,
+         ct.phone AS customerphone, ct.fax AS customerfax, ct.email AS customeremail
+       FROM customer ct
+       LEFT JOIN contacts cp on ct.id = cp.cp_cv_id
+       WHERE (ct.id = ?) $where
+       ORDER BY cp.cp_id
+       LIMIT 1|;
+  push(@values, conv_i($form->{customer_id}));
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
+
+  # remove id and taxincluded before copy back
+  delete @$ref{qw(id taxincluded)};
+
+  @wanted_vars = grep({ $_ } @wanted_vars);
+  if (scalar(@wanted_vars) > 0) {
+    my %h_wanted_vars;
+    map({ $h_wanted_vars{$_} = 1; } @wanted_vars);
+    map({ delete($ref->{$_}) unless ($h_wanted_vars{$_}); } keys(%{$ref}));
+  }
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  
-  $form->{taxincluded} = $taxincluded;
-  
-  $sth->finish;
+
+  if ($form->{delivery_customer_id}) {
+    $query =
+      qq|SELECT *, notes as customernotes
+         FROM customer
+         WHERE id = ?
+         LIMIT 1|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{delivery_customer_id}));
+
+    map { $form->{"dc_$_"} = $ref->{$_} } keys %$ref;
+  }
+
+  if ($form->{delivery_vendor_id}) {
+    $query =
+      qq|SELECT *, notes as customernotes
+         FROM customer
+         WHERE id = ?
+         LIMIT 1|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{delivery_vendor_id}));
+
+    map { $form->{"dv_$_"} = $ref->{$_} } keys %$ref;
+  }
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub post_invoice {
   $main::lxdebug->enter_sub();
 
@@ -345,274 +487,325 @@ sub post_invoice {
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my ($query, $sth, $null, $project_id, $deliverydate);
+  my ($query, $sth, $null, $project_id, $deliverydate, @values);
   my $exchangerate = 0;
 
-  ($null, $form->{employee_id}) = split /--/, $form->{employee};
+  ($null, $form->{employee_id}) = split(/--/, $form->{employee});
   unless ($form->{employee_id}) {
     $form->get_employee($dbh);
   }
-  
-  ($null, $form->{contact_id}) = split /--/, $form->{contact};
-  $form->{contact_id} *= 1;
-        
+
   ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
+
+  my $all_units = AM->retrieve_units($myconfig, $form);
+
   if ($form->{id}) {
 
     &reverse_invoice($dbh, $form);
 
   } else {
-    my $uid = rand().time;
+    $query = qq|SELECT nextval('glid')|;
+    ($form->{"id"}) = selectrow_query($form, $dbh, $query);
 
-    $uid .= $form->{login};
+    $query = qq|INSERT INTO ar (id, invnumber) VALUES (?, ?)|;
+    do_query($form, $dbh, $query, $form->{"id"}, $form->{"id"});
 
-    $uid = substr($uid,2,75);
-
-    $query = qq|INSERT INTO ar (invnumber, employee_id)
-                VALUES ('$uid', $form->{employee_id})|;
-    $dbh->do($query) || $form->dberror($query);
-
-    $query = qq|SELECT a.id FROM ar a
-                WHERE a.invnumber = '$uid'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
+    if (!$form->{invnumber}) {
+      $form->{invnumber} =
+        $form->update_defaults($myconfig, $form->{type} eq "credit_note" ?
+                               "cnnumber" : "invnumber", $dbh);
+    }
   }
 
-
-  map { $form->{$_} =~ s/\'/\'\'/g } (qw(invnumber shippingpoint shipvia notes intnotes message));
-
   my ($netamount, $invoicediff) = (0, 0);
   my ($amount, $linetotal, $lastincomeaccno);
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
   } else {
-    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy');
+    $exchangerate =
+      $form->check_exchangerate($myconfig, $form->{currency},
+                                $form->{transdate}, 'buy');
   }
 
-  $form->{exchangerate} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{exchangerate});
-  
+  $form->{exchangerate} =
+    ($exchangerate)
+    ? $exchangerate
+    : $form->parse_amount($myconfig, $form->{exchangerate});
+
   $form->{expense_inventory} = "";
-  
+
+  my %baseunits;
+
   foreach my $i (1 .. $form->{rowcount}) {
-    $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
-    
-    if ($form->{"qty_$i"} != 0) {
+    if ($form->{type} eq "credit_note") {
+      $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"}) * -1;
+      $form->{shipped} = 1;
+    } else {
+      $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
+    }
+    my $basefactor;
+    my $basqty;
+
+    if ($form->{storno}) {
+      $form->{"qty_$i"} *= -1;
+    }
+
+    if ($form->{"id_$i"}) {
+      my $item_unit;
+
+      if (defined($baseunits{$form->{"id_$i"}})) {
+        $item_unit = $baseunits{$form->{"id_$i"}};
+      } else {
+        # get item baseunit
+        $query = qq|SELECT unit FROM parts WHERE id = ?|;
+        ($item_unit) = selectrow_query($form, $dbh, $query, conv_i($form->{"id_$i"}));
+        $baseunits{$form->{"id_$i"}} = $item_unit;
+      }
+
+      if (defined($all_units->{$item_unit}->{factor})
+          && ($all_units->{$item_unit}->{factor} ne '')
+          && ($all_units->{$item_unit}->{factor} != 0)) {
+        $basefactor = $all_units->{$form->{"unit_$i"}}->{factor} / $all_units->{$item_unit}->{factor};
+      } else {
+        $basefactor = 1;
+      }
+      $baseqty = $form->{"qty_$i"} * $basefactor;
 
-      map { $form->{"${_}_$i"} =~ s/\'/\'\'/g } (qw(partnumber description unit));
-      
       # undo discount formatting
-      $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
+      $form->{"discount_$i"} =
+        $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
 
       my ($allocated, $taxrate) = (0, 0);
       my $taxamount;
-      
+
       # keep entered selling price
-      my $fxsellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
-      
+      my $fxsellprice =
+        $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+
       my ($dec) = ($fxsellprice =~ /\.(\d+)/);
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
-      
+
       # deduct discount
-      my $discount = $form->round_amount($fxsellprice * $form->{"discount_$i"}, $decimalplaces);
+      my $discount =
+        $form->round_amount($fxsellprice * $form->{"discount_$i"},
+                            $decimalplaces);
       $form->{"sellprice_$i"} = $fxsellprice - $discount;
-      
+
       # add tax rates
-      map { $taxrate += $form->{"${_}_rate"} } split / /, $form->{"taxaccounts_$i"};
+      map({ $taxrate += $form->{"${_}_rate"} } split(/ /,
+        $form->{"taxaccounts_$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));
-       $form->{"sellprice_$i"} = $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
+        $taxamount = $linetotal * ($taxrate / (1 + $taxrate));
+        $form->{"sellprice_$i"} =
+          $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
       } else {
-       $taxamount = $linetotal * $taxrate;
+        $taxamount = $linetotal * $taxrate;
       }
 
       $netamount += $linetotal;
-      
+
       if ($taxamount != 0) {
-       map { $form->{amount}{$form->{id}}{$_} += $taxamount * $form->{"${_}_rate"} / $taxrate } split / /, $form->{"taxaccounts_$i"};
+        map {
+          $form->{amount}{ $form->{id} }{$_} +=
+            $taxamount * $form->{"${_}_rate"} / $taxrate
+        } split(/ /, $form->{"taxaccounts_$i"});
       }
-    
-    
+
       # add amount to income, $form->{amount}{trans_id}{accno}
-      $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate};
-      
-      $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2) * $form->{exchangerate};
+      $amount =
+        $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate};
+
+      $linetotal =
+        $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2) *
+        $form->{exchangerate};
       $linetotal = $form->round_amount($linetotal, 2);
-      
+
       # this is the difference from the inventory
       $invoicediff += ($amount - $linetotal);
-                     
-      $form->{amount}{$form->{id}}{$form->{"income_accno_$i"}} += $linetotal;
-      
+
+      $form->{amount}{ $form->{id} }{ $form->{"income_accno_$i"} } +=
+        $linetotal;
+
       $lastincomeaccno = $form->{"income_accno_$i"};
-      
 
       # adjust and round sellprice
-      $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate}, $decimalplaces);
-      
+      $form->{"sellprice_$i"} =
+        $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate},
+                            $decimalplaces);
+
       if ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"}) {
+
         # adjust parts onhand quantity
 
         if ($form->{"assembly_$i"}) {
-         # do not update if assembly consists of all services
-         $query = qq|SELECT sum(p.inventory_accno_id)
-                     FROM parts p
-                     JOIN assembly a ON (a.parts_id = p.id)
-                     WHERE a.id = $form->{"id_$i"}|;
-         $sth = $dbh->prepare($query);
-         $sth->execute || $form->dberror($query);
-
-         if ($sth->fetchrow_array) {
-           $form->update_balance($dbh,
-                                 "parts",
-                                 "onhand",
-                                 qq|id = $form->{"id_$i"}|,
-                                 $form->{"qty_$i"} * -1) unless $form->{shipped};
-         }
-         $sth->finish;
-          
-         # record assembly item as allocated
-         &process_assembly($dbh, $form, $form->{"id_$i"}, $form->{"qty_$i"});
-       } else {
-         $form->update_balance($dbh,
-                               "parts",
-                               "onhand",
-                               qq|id = $form->{"id_$i"}|,
-                               $form->{"qty_$i"} * -1) unless $form->{shipped};
-         
-         $allocated = &cogs($dbh, $form, $form->{"id_$i"}, $form->{"qty_$i"});
-       }
-      }
 
-      $project_id = 'NULL';
-      if ($form->{"projectnumber_$i"}) {
-       $project_id = $form->{"projectnumber_$i"};
-      }
-      $deliverydate = ($form->{"deliverydate_$i"}) ? qq|'$form->{"deliverydate_$i"}'| : "NULL";
-
-      # save detail record in invoice table
-      $query = qq|INSERT INTO invoice (trans_id, parts_id, description, qty,
-                  sellprice, fxsellprice, discount, allocated, assemblyitem,
-                 unit, deliverydate, project_id, serialnumber)
-                 VALUES ($form->{id}, $form->{"id_$i"},
-                 '$form->{"description_$i"}', $form->{"qty_$i"},
-                 $form->{"sellprice_$i"}, $fxsellprice,
-                 $form->{"discount_$i"}, $allocated, 'f',
-                 '$form->{"unit_$i"}', $deliverydate, (SELECT id from project where projectnumber = '$project_id'),
-                 '$form->{"serialnumber_$i"}')|;
-      $dbh->do($query) || $form->dberror($query);
-      
-      if ($form->{lizenzen}) {
-        if ($form->{"licensenumber_$i"}) {
-          $query = qq|SELECT i.id FROM invoice i WHERE i.trans_id=$form->{id} ORDER BY i.oid DESC LIMIT 1|;
-          $sth = $dbh->prepare($query);
-          $sth->execute || $form->dberror($query);
-  
-          ($invoice_row_id) = $sth->fetchrow_array;
+          # do not update if assembly consists of all services
+          $query =
+            qq|SELECT sum(p.inventory_accno_id)
+               FROM parts p
+               JOIN assembly a ON (a.parts_id = p.id)
+               WHERE a.id = ?|;
+          $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id_$i"}));
+
+          if ($sth->fetchrow_array) {
+            $form->update_balance($dbh, "parts", "onhand", qq|id = ?|,
+                                  $baseqty * -1, $form->{"id_$i"})
+              unless $form->{shipped};
+          }
           $sth->finish;
-          
-          $query = qq|INSERT INTO licenseinvoice (trans_id, license_id) VALUES ($invoice_row_id, $form->{"licensenumber_$i"})|;
-          $dbh->do($query) || $form->dberror($query);
+
+          # record assembly item as allocated
+          &process_assembly($dbh, $form, $form->{"id_$i"}, $baseqty);
+        } else {
+          $form->update_balance($dbh, "parts", "onhand", qq|id = ?|,
+                                $baseqty * -1, $form->{"id_$i"})
+            unless $form->{shipped};
+
+          $allocated = &cogs($dbh, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i);
         }
       }
 
+      # 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+
+      @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}),
+                 $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"},
+                 $form->{"sellprice_$i"}, $fxsellprice,
+                 $form->{"discount_$i"}, $allocated, 'f',
+                 $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);
+      do_query($form, $dbh, $query, @values);
+
+      if ($form->{lizenzen} && $form->{"licensenumber_$i"}) {
+        $query =
+          qq|INSERT INTO licenseinvoice (trans_id, license_id)
+             VALUES ((SELECT id FROM invoice WHERE trans_id = ? ORDER BY oid DESC LIMIT 1), ?)|;
+        @values = (conv_i($form->{"id"}), conv_i($form->{"licensenumber_$i"}));
+        do_query($form, $dbh, $query, @values);
+      }
     }
   }
 
-
   $form->{datepaid} = $form->{invdate};
-  
+
   # 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"});
+    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"});
   }
-  
+
   my ($tax, $diff) = (0, 0);
-  
+
   $netamount = $form->round_amount($netamount, 2);
-  
+
   # figure out rounding errors for total amount vs netamount + taxes
   if ($form->{taxincluded}) {
-    
+
     $amount = $form->round_amount($netamount * $form->{exchangerate}, 2);
     $diff += $amount - $netamount * $form->{exchangerate};
     $netamount = $amount;
-    
-    foreach my $item (split / /, $form->{taxaccounts}) {
-      $amount = $form->{amount}{$form->{id}}{$item} * $form->{exchangerate};
-      $form->{amount}{$form->{id}}{$item} = $form->round_amount($amount, 2);
-      $tax += $form->{amount}{$form->{id}}{$item};
-      $netamount -= $form->{amount}{$form->{id}}{$item};
+
+    foreach my $item (split(/ /, $form->{taxaccounts})) {
+      $amount = $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate};
+      $form->{amount}{ $form->{id} }{$item} = $form->round_amount($amount, 2);
+      $tax += $form->{amount}{ $form->{id} }{$item};
+      $netamount -= $form->{amount}{ $form->{id} }{$item};
     }
 
     $invoicediff += $diff;
     ######## this only applies to tax included
     if ($lastincomeaccno) {
-      $form->{amount}{$form->{id}}{$lastincomeaccno} += $invoicediff;
+      $form->{amount}{ $form->{id} }{$lastincomeaccno} += $invoicediff;
     }
 
   } else {
-    $amount = $form->round_amount($netamount * $form->{exchangerate}, 2);
-    $diff = $amount - $netamount * $form->{exchangerate};
+    $amount    = $form->round_amount($netamount * $form->{exchangerate}, 2);
+    $diff      = $amount - $netamount * $form->{exchangerate};
     $netamount = $amount;
-    foreach my $item (split / /, $form->{taxaccounts}) {
-      $form->{amount}{$form->{id}}{$item} = $form->round_amount($form->{amount}{$form->{id}}{$item}, 2);
-      $amount = $form->round_amount($form->{amount}{$form->{id}}{$item} * $form->{exchangerate}, 2);
-      $diff += $amount - $form->{amount}{$form->{id}}{$item} * $form->{exchangerate};
-      $form->{amount}{$form->{id}}{$item} = $form->round_amount($amount, 2);
-      $tax += $form->{amount}{$form->{id}}{$item};
+    foreach my $item (split(/ /, $form->{taxaccounts})) {
+      $form->{amount}{ $form->{id} }{$item} =
+        $form->round_amount($form->{amount}{ $form->{id} }{$item}, 2);
+      $amount =
+        $form->round_amount(
+                 $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate},
+                 2);
+      $diff +=
+        $amount - $form->{amount}{ $form->{id} }{$item} *
+        $form->{exchangerate};
+      $form->{amount}{ $form->{id} }{$item} = $form->round_amount($amount, 2);
+      $tax += $form->{amount}{ $form->{id} }{$item};
     }
   }
 
-  
-  $form->{amount}{$form->{id}}{$form->{AR}} = $netamount + $tax;
-  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate} + $diff, 2);
-  
-  # reverse AR
-  $form->{amount}{$form->{id}}{$form->{AR}} *= -1;
+  $form->{amount}{ $form->{id} }{ $form->{AR} } = $netamount + $tax;
+  $form->{paid} =
+    $form->round_amount($form->{paid} * $form->{exchangerate} + $diff, 2);
 
+  # reverse AR
+  $form->{amount}{ $form->{id} }{ $form->{AR} } *= -1;
 
   # update exchangerate
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, $form->{exchangerate}, 0);
+    $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate},
+                               $form->{exchangerate}, 0);
   }
-    
-  foreach my $trans_id (keys %{$form->{amount}}) {
+
+  $project_id = conv_i($form->{"globalproject_id"});
+
+  foreach my $trans_id (keys %{ $form->{amount} }) {
     foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
-      next unless ($form->{expense_inventory}=~ /$accno/);
-      if (($form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2)) != 0) {
-       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, taxkey)
-                   VALUES ($trans_id, (SELECT c.id FROM chart c
-                                       WHERE c.accno = '$accno'),
-                   $form->{amount}{$trans_id}{$accno}, '$form->{invdate}',
-                    (SELECT taxkey_id  FROM chart WHERE accno = '$accno'))|;
-       $dbh->do($query) || $form->dberror($query);
+      next unless ($form->{expense_inventory} =~ /$accno/);
+      if (
+          ($form->{amount}{$trans_id}{$accno} =
+           $form->round_amount($form->{amount}{$trans_id}{$accno}, 2)
+          ) != 0
+        ) {
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id)
+             VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+                     (SELECT taxkey_id  FROM chart WHERE accno = ?), ?)|;
+        @values = (conv_i($trans_id), $accno, $form->{amount}{$trans_id}{$accno}, conv_date($form->{invdate}), $accno, conv_i($project_id));
+        do_query($form, $dbh, $query, @values);
         $form->{amount}{$trans_id}{$accno} = 0;
       }
     }
-    
+
     foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
-      if (($form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2)) != 0) {
-       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, taxkey)
-                   VALUES ($trans_id, (SELECT id FROM chart
-                                       WHERE accno = '$accno'),
-                   $form->{amount}{$trans_id}{$accno}, '$form->{invdate}',
-                    (SELECT taxkey_id  FROM chart WHERE accno = '$accno'))|;
-       $dbh->do($query) || $form->dberror($query);
+      if (
+          ($form->{amount}{$trans_id}{$accno} =
+           $form->round_amount($form->{amount}{$trans_id}{$accno}, 2)
+          ) != 0
+        ) {
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id)
+             VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+                     (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        @values = (conv_i($trans_id), $accno, $form->{amount}{$trans_id}{$accno}, conv_date($form->{invdate}), $accno, conv_i($project_id));
+        do_query($form, $dbh, $query, @values);
       }
     }
   }
@@ -620,109 +813,119 @@ sub post_invoice {
   # deduct payment differences from diff
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {
-      $amount = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
+      $amount =
+        $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
       $diff -= $amount - $form->{"paid_$i"} * $form->{exchangerate};
     }
   }
 
-
-  # force AR entry if 0
-#  $form->{amount}{$form->{id}}{$form->{AR}} = 1 if ($form->{amount}{$form->{id}}{$form->{AR}} == 0);
-  
   # record payments and offsetting AR
-  for my $i (1 .. $form->{paidaccounts}) {
-    
-    if ($form->{"paid_$i"} != 0) {
-      my ($accno) = split /--/, $form->{"AR_paid_$i"};
-      $form->{"datepaid_$i"} = $form->{invdate} unless ($form->{"datepaid_$i"});
+  if (!$form->{storno}) {
+    for my $i (1 .. $form->{paidaccounts}) {
+
+      next if ($form->{"paid_$i"} == 0);
+
+      my ($accno) = split(/--/, $form->{"AR_paid_$i"});
+      $form->{"datepaid_$i"} = $form->{invdate}
+      unless ($form->{"datepaid_$i"});
       $form->{datepaid} = $form->{"datepaid_$i"};
-      
+
       $exchangerate = 0;
-      
+
       if ($form->{currency} eq $form->{defaultcurrency}) {
-       $form->{"exchangerate_$i"} = 1;
+        $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"});
+        $exchangerate =
+          $form->check_exchangerate($myconfig, $form->{currency},
+                                    $form->{"datepaid_$i"}, 'buy');
+
+        $form->{"exchangerate_$i"} =
+          $exchangerate ? $exchangerate
+            : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
       }
-      
+
       # record AR
       $amount = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate} + $diff, 2);
 
-      if ($form->{amount}{$form->{id}}{$form->{AR}} != 0) {
-       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate)
-                   VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                       WHERE c.accno = '$form->{AR}'),
-                   $amount, '$form->{"datepaid_$i"}')|;
-       $dbh->do($query) || $form->dberror($query);
+      if ($form->{amount}{ $form->{id} }{ $form->{AR} } != 0) {
+        $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id)
+           VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+                   (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        @values = (conv_i($form->{"id"}), $form->{AR}, $amount, $form->{"datepaid_$i"}, $form->{AR}, $project_id);
+        do_query($form, $dbh, $query, @values);
       }
 
       # record payment
       $form->{"paid_$i"} *= -1;
 
-      $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);
+      $query =
+      qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, taxkey, project_id)
+         VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?,
+                 (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      @values = (conv_i($form->{"id"}), $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"},
+                 $form->{"source_$i"}, $form->{"memo_$i"}, $accno, $project_id);
+      do_query($form, $dbh, $query, @values);
 
-     
       # exchangerate difference
-      $form->{fx}{$accno}{$form->{"datepaid_$i"}} += $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) + $diff;
+      $form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=
+      $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) + $diff;
 
-      
       # gain/loss
-      $amount = $form->{"paid_$i"} * $form->{exchangerate} - $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+      $amount =
+      $form->{"paid_$i"} * $form->{exchangerate} - $form->{"paid_$i"} *
+      $form->{"exchangerate_$i"};
       if ($amount > 0) {
-       $form->{fx}{$form->{fxgain_accno}}{$form->{"datepaid_$i"}} += $amount;
+        $form->{fx}{ $form->{fxgain_accno} }{ $form->{"datepaid_$i"} } +=
+        $amount;
       } else {
-       $form->{fx}{$form->{fxloss_accno}}{$form->{"datepaid_$i"}} += $amount;
+        $form->{fx}{ $form->{fxloss_accno} }{ $form->{"datepaid_$i"} } +=
+        $amount;
       }
 
       $diff = 0;
 
       # update exchange rate
       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);
       }
     }
   }
 
-  
   # record exchange rate differences and gains/losses
-  foreach my $accno (keys %{$form->{fx}}) {
+  foreach my $accno (keys %{ $form->{fx} }) {
     foreach my $transdate (keys %{ $form->{fx}{$accno} }) {
-      if (($form->{fx}{$accno}{$transdate} = $form->round_amount($form->{fx}{$accno}{$transdate}, 2)) != 0) {
-
-       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, cleared, fx_transaction)
-                   VALUES ($form->{id},
-                          (SELECT c.id FROM chart c
-                           WHERE c.accno = '$accno'),
-                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1')|;
-       $dbh->do($query) || $form->dberror($query);
+      if (
+          ($form->{fx}{$accno}{$transdate} =
+           $form->round_amount($form->{fx}{$accno}{$transdate}, 2)
+          ) != 0
+        ) {
+
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, taxkey, project_id)
+             VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, '0', '1',
+             (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        @values = (conv_i($form->{"id"}), $accno, $form->{fx}{$accno}{$transdate}, conv_date($transdate), $accno, $project_id);
+        do_query($form, $dbh, $query, @values);
       }
     }
   }
 
   $amount = $netamount + $tax;
-  
+
   # set values which could be empty to 0
-  $form->{terms} *= 1;
-  $form->{taxincluded} *= 1;
-  my $datepaid = ($form->{paid}) ? qq|'$form->{datepaid}'| : "NULL";
-  my $duedate = ($form->{duedate}) ? qq|'$form->{duedate}'| : "NULL";
+  my $datepaid = conv_date($form->{paid});
+  my $duedate  = conv_date($form->{duedate});
+  $deliverydate = conv_date($form->{deliverydate});
 
   # fill in subject if there is none
-  $form->{subject} = qq|$form->{label} $form->{invnumber}| unless $form->{subject};
+  $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 $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
@@ -737,44 +940,81 @@ Message: $form->{message}\r| if $form->{message};
 
   # save AR record
   $query = qq|UPDATE ar set
-              invnumber = '$form->{invnumber}',
-             ordnumber = '$form->{ordnumber}',
-             quonumber = '$form->{quonumber}',
-             cusordnumber = '$form->{cusordnumber}',
-              transdate = '$form->{invdate}',
-              customer_id = $form->{customer_id},
-              amount = $amount,
-              netamount = $netamount,
-              paid = $form->{paid},
-             datepaid = $datepaid,
-             duedate = $duedate,
-             invoice = '1',
-             shippingpoint = '$form->{shippingpoint}',
-             shipvia = '$form->{shipvia}',
-             terms = $form->{terms},
-             notes = '$form->{notes}',
-             intnotes = '$form->{intnotes}',
-             taxincluded = '$form->{taxincluded}',
-             curr = '$form->{currency}',
-             department_id = $form->{department_id},
-             employee_id = $form->{employee_id},
-              cp_id = $form->{contact_id}
-              WHERE id = $form->{id}
-             |;
-  $dbh->do($query) || $form->dberror($query);
-  
-  $form->{pago_total} = $amount;
+                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 = ?
+              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"}),
+             conv_i($form->{"id"}));
+  do_query($form, $dbh, $query, @values);
+
+  if ($form->{storno}) {
+    $query =
+      qq!UPDATE ar SET
+           paid = paid + amount,
+           storno = 't',
+           intnotes = ? || intnotes
+         WHERE id = ?!;
+    do_query($form, $dbh, $query, "Rechnung storniert am $form->{invdate} ", conv_i($form->{"storno_id"}));
+    do_query($form, $dbh, qq|UPDATE ar SET paid = amount WHERE id = ?|, conv_i($form->{"id"}));
+  }
+
   # add shipto
   $form->{name} = $form->{customer};
   $form->{name} =~ s/--$form->{customer_id}//;
-  $form->add_shipto($dbh, $form->{id});
+
+  if (!$form->{shipto_id}) {
+    $form->add_shipto($dbh, $form->{id}, "AR");
+  }
 
   # save printed, emailed and queued
   $form->save_status($dbh);
-  
- if ($form->{webdav}) {
-       &webdav_folder($myconfig, $form);
- }  
+
+  Common::webdav_folder($form) if ($main::webdav);
 
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -784,53 +1024,158 @@ Message: $form->{message}\r| if $form->{message};
   return $rc;
 }
 
+sub post_payment {
+  $main::lxdebug->enter_sub() and my ($self, $myconfig, $form, $locale) = @_;
+
+  # connect to database, turn off autocommit
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  $form->{datepaid} = $form->{invdate};
+
+  # 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_$i"} *= -1                     if $form->{type} eq "credit_note";
+    $form->{"paid"}    += $form->{"paid_$i"};
+    $form->{"datepaid"} = $form->{"datepaid_$i"} if $form->{"datepaid_$i"};
+  }
+
+  $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
+
+  # record payments and offsetting AR
+  for my $i (1 .. $form->{paidaccounts}) {
+    if ($form->{"paid_$i"}) {
+
+      my ($accno) = split /--/, $form->{"AR_paid_$i"};
+      $form->{"datepaid_$i"} = $form->{invdate} 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"});
+      }
+
+      # record AR
+      $amount = $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"}, 2);
+
+      $query =
+        qq|DELETE FROM acc_trans
+           WHERE (trans_id = ?)
+             AND (chart_id = (SELECT id FROM chart WHERE accno = ?))
+             AND (amount = ?) AND (transdate = ?)|;
+      do_query($form, $dbh, $query, $form->{id}, $form->{AR}, $amount, conv_date($form->{"datepaid_$i"}));
+      $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 = ?))|;
+      do_query($form, $dbh, $query, $form->{id}, $form->{AR}, $amount, $form->{"datepaid_$i"}, conv_i($form->{"globalproject_id"}), $accno);
+
+      # record payment
+      $form->{"paid_$i"} *= -1;
+
+      $query =
+        qq|DELETE FROM acc_trans
+           WHERE (trans_id = ?)
+             AND (chart_id = (SELECT id FROM chart WHERE accno = ?))
+             AND (amount = ?) AND (transdate = ?) AND (source = ?) AND (memo = ?)|;
+      do_query($form, $dbh, $query, $form->{id}, $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"}, $form->{"source_$i"}, $form->{"memo_$i"});
+
+      $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey)
+           VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?,
+                   (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+      do_query($form, $dbh, $query, $form->{id}, $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"}, $form->{"source_$i"}, $form->{"memo_$i"},
+               conv_i($form->{"globalproject_id"}), $accno);
+
+      # gain/loss
+      $amount = $form->{"paid_$i"} * $form->{exchangerate} - $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+      $form->{fx}{ $form->{($amount > 0 ? 'fxgain_accno' : 'fxloss_accno')} }{ $form->{"datepaid_$i"} } += $amount;
+
+      $diff = 0;
+
+      # update exchange rate
+      if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
+        $form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, $form->{"exchangerate_$i"}, 0);
+      }
+
+    }
+  }
+
+  # 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)) { # '=' is no typo, it's an assignment
+        $query =
+          qq|DELETE FROM acc_trans
+             WHERE (trans_id = ?)
+               AND (chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?))
+               AND (amount = ?) AND (transdate = ?) AND (cleared = ?) AND (fx_transaction = ?)|;
+        do_query($form, $dbh, $query, $form->{id}, $accno, $form->{fx}{$accno}{$transdate}, $transdate, 0, 1);
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, project_id, taxkey)
+             VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?,
+                     (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+        do_query($form, $dbh, $query, $form->{id}, $accno, $form->{fx}{$accno}{$transdate}, $transdate, 0, 1, conv_i($form->{"globalproject_id"}), $accno);
+      }
+
+    }
+  }
+
+  # save AR record
+  delete $form->{datepaid} unless $form->{paid};
+
+  my $query = qq|UPDATE ar SET paid = ?, datepaid = ? WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{"paid"}, conv_date($form->{"datepaid"}), conv_i($form->{"id"}));
+
+  my $rc = $dbh->commit;
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub() and return $rc;
+}
 
 sub process_assembly {
   $main::lxdebug->enter_sub();
 
   my ($dbh, $form, $id, $totalqty) = @_;
 
-  my $query = qq|SELECT a.parts_id, a.qty, p.assembly,
-                 p.partnumber, p.description, p.unit,
-                 p.inventory_accno_id, p.income_accno_id,
-                p.expense_accno_id
-                 FROM assembly a
-                JOIN parts p ON (a.parts_id = p.id)
-                WHERE a.id = $id|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  
+  my $query =
+    qq|SELECT a.parts_id, a.qty, p.assembly, p.partnumber, p.description, p.unit,
+         p.inventory_accno_id, p.income_accno_id, p.expense_accno_id
+       FROM assembly a
+       JOIN parts p ON (a.parts_id = p.id)
+       WHERE (a.id = ?)|;
+  my $sth = prepare_execute_query($form, $dbh, $query, conv_i($id));
+
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
 
     my $allocated = 0;
-    
+
     $ref->{inventory_accno_id} *= 1;
-    $ref->{expense_accno_id} *= 1;
+    $ref->{expense_accno_id}   *= 1;
 
-    map { $ref->{$_} =~ s/\'/\'\'/g } (qw(partnumber description unit));
-    
     # multiply by number of assemblies
     $ref->{qty} *= $totalqty;
-    
+
     if ($ref->{assembly}) {
       &process_assembly($dbh, $form, $ref->{parts_id}, $ref->{qty});
       next;
     } else {
       if ($ref->{inventory_accno_id}) {
-       $allocated = &cogs($dbh, $form, $ref->{parts_id}, $ref->{qty});
+        $allocated = &cogs($dbh, $form, $ref->{parts_id}, $ref->{qty});
       }
     }
 
     # save detail record for individual assembly item in invoice table
-    $query = qq|INSERT INTO invoice (trans_id, description, parts_id, qty,
-                sellprice, fxsellprice, allocated, assemblyitem, unit)
-               VALUES
-               ($form->{id}, '$ref->{description}',
-               $ref->{parts_id}, $ref->{qty}, 0, 0, $allocated, 't',
-               '$ref->{unit}')|;
-    $dbh->do($query) || $form->dberror($query);
-        
+    $query =
+      qq|INSERT INTO invoice (trans_id, description, parts_id, qty, sellprice, fxsellprice, allocated, assemblyitem, unit)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+    @values = (conv_i($form->{id}), $ref->{description}, conv_i($ref->{parts_id}), $ref->{qty}, 0, 0, $allocated, 't', $ref->{unit});
+    do_query($form, $dbh, $query, @values);
+
   }
 
   $sth->finish;
@@ -838,56 +1183,66 @@ sub process_assembly {
   $main::lxdebug->leave_sub();
 }
 
-
 sub cogs {
   $main::lxdebug->enter_sub();
 
-  my ($dbh, $form, $id, $totalqty) = @_;
-
-  my $query = qq|SELECT i.id, i.trans_id, i.qty, i.allocated, i.sellprice,
-                   (SELECT c.accno FROM chart c
-                   WHERE p.inventory_accno_id = c.id) AS inventory_accno,
-                  (SELECT c.accno FROM chart c
-                   WHERE p.expense_accno_id = c.id) AS expense_accno
-                 FROM invoice i, parts p
-                 WHERE i.parts_id = p.id
-                 AND i.parts_id = $id
-                 AND (i.qty + i.allocated) < 0
-                 ORDER BY trans_id|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my ($dbh, $form, $id, $totalqty, $basefactor, $row) = @_;
+  $form->{taxzone_id} *=1;
+  my $transdate  = $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";
+  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
+
+       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)
+       LEFT JOIN chart c3 ON ((select expense_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c3.id)
+       WHERE (i.parts_id = p.id)
+         AND (i.parts_id = ?)
+         AND ((i.base_qty + i.allocated) < 0)
+       ORDER BY trans_id|;
+  my $sth = prepare_execute_query($form, $dbh, $query, conv_i($id));
 
   my $allocated = 0;
   my $qty;
-  
+
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    if (($qty = (($ref->{qty} * -1) - $ref->{allocated})) > $totalqty) {
+    if (($qty = (($ref->{base_qty} * -1) - $ref->{allocated})) > $totalqty) {
       $qty = $totalqty;
     }
-    
-    $form->update_balance($dbh,
-                         "invoice",
-                         "allocated",
-                         qq|id = $ref->{id}|,
-                         $qty);
+
+    $form->update_balance($dbh, "invoice", "allocated", qq|id = $ref->{id}|, $qty);
 
     # total expenses and inventory
     # sellprice is the cost of the item
-    $linetotal = $form->round_amount($ref->{sellprice} * $qty, 2);
-    
-    
-    if (!$eur) {
+    $linetotal = $form->round_amount(($ref->{sellprice} * $qty) / $basefactor, 2);
+
+    if (!$main::eur) {
+      $ref->{expense_accno} = ($form->{"expense_accno_$row"}) ? $form->{"expense_accno_$row"} : $ref->{expense_accno};
       # add to expense
-      $form->{amount}{$form->{id}}{$ref->{expense_accno}} += -$linetotal;
-      $form->{expense_inventory} .= " ".$ref->{expense_accno};
+      $form->{amount}{ $form->{id} }{ $ref->{expense_accno} } += -$linetotal;
+      $form->{expense_inventory} .= " " . $ref->{expense_accno};
+      $ref->{inventory_accno} = ($form->{"inventory_accno_$row"}) ? $form->{"inventory_accno_$row"} : $ref->{inventory_accno};
       # deduct inventory
-      $form->{amount}{$form->{id}}{$ref->{inventory_accno}} -= -$linetotal;
-      $form->{expense_inventory} .= " ".$ref->{inventory_accno};
+      $form->{amount}{ $form->{id} }{ $ref->{inventory_accno} } -= -$linetotal;
+      $form->{expense_inventory} .= " " . $ref->{inventory_accno};
     }
-    
+
     # add allocated
-    $allocated += -$qty;
-    
+    $allocated -= $qty;
+
     last if (($totalqty -= $qty) <= 0);
   }
 
@@ -898,21 +1253,18 @@ sub cogs {
   return $allocated;
 }
 
-
-
 sub reverse_invoice {
   $main::lxdebug->enter_sub();
 
   my ($dbh, $form) = @_;
 
   # reverse inventory items
-  my $query = qq|SELECT i.id, i.parts_id, i.qty, i.assemblyitem, p.assembly,
-                p.inventory_accno_id
-                 FROM invoice i
-                JOIN parts p ON (i.parts_id = p.id)
-                WHERE i.trans_id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query =
+    qq|SELECT i.id, i.parts_id, i.qty, i.assemblyitem, p.assembly, p.inventory_accno_id
+       FROM invoice i
+       JOIN parts p ON (i.parts_id = p.id)
+       WHERE i.trans_id = ?|;
+  my $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id"}));
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
 
@@ -920,72 +1272,56 @@ sub reverse_invoice {
 
       # if the invoice item is not an assemblyitem adjust parts onhand
       if (!$ref->{assemblyitem}) {
-       # adjust onhand in parts table
-       $form->update_balance($dbh,
-                             "parts",
-                             "onhand",
-                             qq|id = $ref->{parts_id}|,
-                             $ref->{qty});
+
+        # adjust onhand in parts table
+        $form->update_balance($dbh, "parts", "onhand", qq|id = $ref->{parts_id}|, $ref->{qty});
       }
 
       # loop if it is an assembly
       next if ($ref->{assembly});
-      
+
       # de-allocated purchases
-      $query = qq|SELECT i.id, i.trans_id, i.allocated
-                  FROM invoice i
-                 WHERE i.parts_id = $ref->{parts_id}
-                 AND i.allocated > 0
-                 ORDER BY i.trans_id DESC|;
-      my $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-
-      while (my $inhref = $sth->fetchrow_hashref(NAME_lc)) {
-       $qty = $ref->{qty};
-       if (($ref->{qty} - $inhref->{allocated}) > 0) {
-         $qty = $inhref->{allocated};
-       }
-       
-       # update invoice
-       $form->update_balance($dbh,
-                             "invoice",
-                             "allocated",
-                             qq|id = $inhref->{id}|,
-                             $qty * -1);
+      $query =
+        qq|SELECT i.id, i.trans_id, i.allocated
+           FROM invoice i
+           WHERE (i.parts_id = ?) AND (i.allocated > 0)
+           ORDER BY i.trans_id DESC|;
+      my $sth2 = prepare_execute_query($form, $dbh, $query, conv_i($ref->{"parts_id"}));
+
+      while (my $inhref = $sth2->fetchrow_hashref(NAME_lc)) {
+        $qty = $ref->{qty};
+        if (($ref->{qty} - $inhref->{allocated}) > 0) {
+          $qty = $inhref->{allocated};
+        }
+
+        # update invoice
+        $form->update_balance($dbh, "invoice", "allocated", qq|id = $inhref->{id}|, $qty * -1);
 
         last if (($ref->{qty} -= $qty) <= 0);
       }
-      $sth->finish;
+      $sth2->finish;
     }
   }
-  
+
   $sth->finish;
-  
+
   # delete acc_trans
-  $query = qq|DELETE FROM acc_trans
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-  # delete invoice entries
-  $query = qq|DELETE FROM invoice
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-  
+  @values = (conv_i($form->{id}));
+  do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE trans_id = ?|, @values);
+  do_query($form, $dbh, qq|DELETE FROM invoice WHERE trans_id = ?|, @values);
+
   if ($form->{lizenzen}) {
-    $query = qq|DELETE FROM licenseinvoice
-              WHERE trans_id in (SELECT id FROM invoice WHERE trans_id = $form->{id})|;
-    $dbh->do($query) || $form->dberror($query);
+    $query =
+      qq|DELETE FROM licenseinvoice
+         WHERE trans_id in (SELECT id FROM invoice WHERE trans_id = ?)|;
+    do_query($form, $dbh, $query, @values);
   }
 
-  $query = qq|DELETE FROM shipto
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, qq|DELETE FROM shipto WHERE (trans_id = ?) AND (module = 'AR')|, @values);
 
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub delete_invoice {
   $main::lxdebug->enter_sub();
 
@@ -995,212 +1331,249 @@ sub delete_invoice {
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   &reverse_invoice($dbh, $form);
-  
+
+  my @values = (conv_i($form->{id}));
+
   # delete AR record
-  my $query = qq|DELETE FROM ar
-                 WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, qq|DELETE FROM ar WHERE id = ?|, @values);
 
   # delete spool files
-  $query = qq|SELECT s.spoolfile FROM status s
-              WHERE s.trans_id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
-
-  my $spoolfile;
-  my @spoolfiles = ();
-  
-  while (($spoolfile) = $sth->fetchrow_array) {
-    push @spoolfiles, $spoolfile;
-  }
-  $sth->finish;  
+  my @spoolfiles = selectall_array_query($form, $dbh, qq|SELECT spoolfile FROM status WHERE trans_id = ?|, @values);
 
   # delete status entries
-  $query = qq|DELETE FROM status
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, qq|DELETE FROM status WHERE trans_id = ?|, @values);
 
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
   if ($rc) {
-    foreach $spoolfile (@spoolfiles) {
-      unlink "$spool/$spoolfile" if $spoolfile;
-    }
+    map { unlink "$spool/$_" if -f "$spool/$_"; } @{ $spoolfiles };
   }
-  
+
   $main::lxdebug->leave_sub();
 
   return $rc;
 }
 
-
-
 sub retrieve_invoice {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my $query;
-
-  if ($form->{id}) {
-    # get default accounts and last invoice number
-    $query = qq|SELECT (SELECT c.accno FROM chart c
-                        WHERE d.inventory_accno_id = c.id) AS inventory_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.income_accno_id = c.id) AS income_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.expense_accno_id = c.id) AS expense_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-                d.curr AS currencies
-               FROM defaults d|;
-  } else {
-    $query = qq|SELECT (SELECT c.accno FROM chart c
-                        WHERE d.inventory_accno_id = c.id) AS inventory_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.income_accno_id = c.id) AS income_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.expense_accno_id = c.id) AS expense_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
-                      (SELECT c.accno FROM chart c
-                       WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-                d.curr AS currencies, current_date AS invdate
-                FROM defaults d|;
-  }
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
-
+  my ($sth, $ref, $query);
+
+  my $query_transdate = ", current_date AS invdate" if !$form->{id};
+
+  $query =
+    qq|SELECT
+         (SELECT c.accno FROM chart c
+          WHERE d.inventory_accno_id = c.id) AS inventory_accno,
+         (SELECT c.accno FROM chart c
+          WHERE d.income_accno_id = c.id) AS income_accno,
+         (SELECT c.accno FROM chart c
+          WHERE d.expense_accno_id = c.id) AS expense_accno,
+         (SELECT c.accno FROM chart c
+          WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
+         (SELECT c.accno FROM chart c
+          WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
+         d.curr AS currencies
+         ${query_transdate}
+       FROM defaults d|;
+
+  $ref = selectfirst_hashref_query($form, $dbh, $query);
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   if ($form->{id}) {
+    my $id = conv_i($form->{id});
 
     # retrieve invoice
-    $query = qq|SELECT a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
-                a.transdate AS invdate, a.paid,
-                a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes,
-               a.duedate, a.taxincluded, a.curr AS currency,
-               a.employee_id, e.name AS employee
-               FROM ar a
-               LEFT JOIN employee e ON (e.id = a.employee_id)
-               WHERE a.id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
-
-    $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
+    $query =
+      qq|SELECT
+           a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
+           a.orddate, a.quodate, a.globalproject_id,
+           a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
+           a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
+           a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
+           a.employee_id, a.salesman_id, a.payment_id,
+           a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
+           e.name AS employee
+         FROM ar a
+         LEFT JOIN employee e ON (e.id = a.employee_id)
+         WHERE a.id = ?|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, $id);
+    map { $form->{$_} = $ref->{$_} } keys %{ $ref };
+
+
+    $form->{exchangerate} =
+      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
 
     # get shipto
-    $query = qq|SELECT s.* FROM shipto s
-                WHERE s.trans_id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
+    $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module = 'AR')|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, $id);
+    delete $ref->{id};
+    map { $form->{$_} = $ref->{$_} } keys %{ $ref };
+
+    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);
+    }
 
     # get printed, emailed
-    $query = qq|SELECT s.printed, s.emailed, s.spoolfile, s.formname
-                FROM status s
-                WHERE s.trans_id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $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 $taxzone_id = $form->{taxzone_id} *= 1;
+    $taxzone_id = 0 if (0 > $taxzone_id) || (3 < $taxzone_id);
 
     # retrieve individual items
-    $query = qq|SELECT (SELECT c.accno FROM chart c
-                       WHERE p.inventory_accno_id = c.id)
-                       AS inventory_accno,
-                      (SELECT c.accno FROM chart c
-                      WHERE p.income_accno_id = c.id)
-                      AS income_accno,
-                      (SELECT c.accno FROM chart c
-                      WHERE p.expense_accno_id = c.id)
-                      AS expense_accno,
-                i.description, i.qty, i.fxsellprice AS sellprice,
-               i.discount, i.parts_id AS id, i.unit, i.deliverydate,
-               i.project_id, pr.projectnumber, i.serialnumber,
-               p.partnumber, p.assembly, p.bin, p.notes AS partnotes, i.id AS invoice_pos,
-               pg.partsgroup
-               FROM invoice i
-               JOIN parts p ON (i.parts_id = p.id)
-               LEFT JOIN project pr ON (i.project_id = pr.id)
-               LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-               WHERE i.trans_id = $form->{id}
-               AND NOT i.assemblyitem = '1'
-               ORDER BY i.id|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $query =
+      qq|SELECT
+           c1.accno AS inventory_accno,
+           c1.new_chart_id AS inventory_new_chart,
+           date($transdate) - c1.valid_from AS inventory_valid,
+
+           c2.accno AS income_accno,
+           c2.new_chart_id AS income_new_chart,
+           date($transdate) - c2.valid_from as income_valid,
+
+           c3.accno AS expense_accno,
+           c3.new_chart_id AS expense_new_chart,
+           date($transdate) - c3.valid_from AS expense_valid,
+
+           i.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
+
+         FROM invoice i
+         LEFT JOIN parts p ON (i.parts_id = p.id)
+         LEFT JOIN project pr ON (i.project_id = pr.id)
+         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|;
+
+    $sth = prepare_execute_query($form, $dbh, $query, $id);
+
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-     
-     #set expense_accno=inventory_accno if they are different => bilanz     
-     $vendor_accno = ($ref->{expense_accno}!=$ref->{inventory_accno}) ? $ref->{inventory_accno} :$ref->{expense_accno};
-
-     
-     # get tax rates and description
-     $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
-     $query = qq|SELECT c.accno, c.description, t.rate, t.taxnumber
-                FROM chart c, tax t
-                WHERE c.id=t.chart_id AND t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
-                ORDER BY accno|;
-     $stw = $dbh->prepare($query);
-     $stw->execute || $form->dberror($query);
-     $ref->{taxaccounts} = "";
-     while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
-   #    if ($customertax{$ref->{accno}}) {
-         $ref->{taxaccounts} .= "$ptr->{accno} ";
-         if (!($form->{taxaccounts}=~/$ptr->{accno}/)) {
-           $form->{"$ptr->{accno}_rate"} = $ptr->{rate};
-           $form->{"$ptr->{accno}_description"} = $ptr->{description};
-           $form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
-           $form->{taxaccounts} .= "$ptr->{accno} ";
-         }
-
-     }
-     
-     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 = $ref->{invoice_pos}|;
-       $stg = $dbh->prepare($query);
-       $stg->execute || $form->dberror($query);
-       ($licensenumber, $licenseid) = $stg->fetchrow_array();
-       $ref->{lizenzen} ="<option value=\"$licenseid\">$licensenumber</option>";
-       $stg->finish();
-     }
-
-     chop $ref->{taxaccounts};
-     push @{ $form->{invoice_details} }, $ref;
-     $stw->finish;
+      if (!$ref->{"part_inventory_accno_id"}) {
+        map({ delete($ref->{$_}); } qw(inventory_accno inventory_new_chart inventory_valid));
+      }
+      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"});
+        }
+      }
+
+      # get tax rates and description
+      my $accno_id =
+        ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+      $query =
+        qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
+           FROM tax t
+           LEFT JOIN chart c ON (c.id = t.chart_id)
+           WHERE t.id IN
+             (SELECT tk.tax_id
+              FROM taxkeys tk
+              WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
+                AND startdate <= $transdate
+              ORDER BY startdate DESC
+              LIMIT 1)
+           ORDER BY c.accno|;
+      my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
+      $ref->{taxaccounts} = "";
+      my $i=0;
+      while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
+
+        #    if ($customertax{$ref->{accno}}) {
+        if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
+          $i++;
+          $ptr->{accno} = $i;
+        }
+        $ref->{taxaccounts} .= "$ptr->{accno} ";
+
+        if (!($form->{taxaccounts} =~ /$ptr->{accno}/)) {
+          $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
+          $form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
+          $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
+          $form->{taxaccounts} .= "$ptr->{accno} ";
+        }
+
+      }
+
+      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}));
+        $ref->{lizenzen} = "<option value=\"$licenseid\">$licensenumber</option>";
+      }
+
+      $ref->{qty} *= -1 if $form->{type} eq "credit_note";
+
+      chop $ref->{taxaccounts};
+      push @{ $form->{invoice_details} }, $ref;
+      $stw->finish;
     }
     $sth->finish;
-    
-    if ($form->{webdav}) {
-      &webdav_folder($myconfig, $form);
-    }
+
+    Common::webdav_folder($form) if ($main::webdav);
   }
-  
+
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
@@ -1209,7 +1582,6 @@ sub retrieve_invoice {
   return $rc;
 }
 
-
 sub get_customer {
   $main::lxdebug->enter_sub();
 
@@ -1221,48 +1593,85 @@ sub get_customer {
   my $dateformat = $myconfig->{dateformat};
   $dateformat .= "yy" if $myconfig->{dateformat} !~ /^y/;
 
-  my $duedate = ($form->{invdate}) ? "to_date('$form->{invdate}', '$dateformat')" : "current_date";
-                      
-  $form->{customer_id} *= 1;
+  my (@values, $duedate, $ref, $query);
+
+  if ($form->{invdate}) {
+    $duedate = "to_date(?, '$dateformat')";
+    push @values, $form->{invdate};
+  } else {
+    $duedate = "current_date";
+  }
+
+  my $cid = conv_i($form->{customer_id});
 
   # get customer
-  my $query = qq|SELECT c.name AS customer, c.discount, c.creditlimit, c.terms,
-                 c.email, c.cc, c.bcc, c.language,
-                c.street, c.zipcode, c.city, c.country,
-                $duedate + c.terms AS duedate, c.notes AS intnotes,
-                b.discount AS tradediscount, b.description AS business
-                 FROM customer c
-                LEFT JOIN business b ON (b.id = c.business_id)
-                WHERE c.id = $form->{customer_id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $ref = $sth->fetchrow_hashref(NAME_lc);
+  $query =
+    qq|SELECT
+         c.name AS customer, c.discount, c.creditlimit, c.terms,
+         c.email, c.cc, c.bcc, c.language_id, c.payment_id AS customer_payment_id,
+         c.street, c.zipcode, c.city, c.country,
+         c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id,
+         $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
+         b.discount AS tradediscount, b.description AS business
+       FROM customer c
+       LEFT JOIN business b ON (b.id = c.business_id)
+       LEFT JOIN payment_terms pt ON (c.payment_id = pt.id)
+       WHERE c.id = ?|;
+  push @values, $cid;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
 
+  $query =
+    qq|SELECT sum(amount - paid) AS dunning_amount
+       FROM ar
+       WHERE (paid < amount)
+         AND (customer_id = ?)
+         AND (dunning_config_id IS NOT NULL)|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $cid);
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
-  
-  $form->{creditremaining} = $form->{creditlimit};
-  $query = qq|SELECT SUM(a.amount - a.paid)
-             FROM ar a
-             WHERE a.customer_id = $form->{customer_id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
 
-  ($form->{creditremaining}) -= $sth->fetchrow_array;
+  $query =
+    qq|SELECT dnn.dunning_description AS max_dunning_level
+       FROM dunning_config dnn
+       WHERE id IN (SELECT dunning_config_id
+                    FROM ar
+                    WHERE (paid < amount) AND (customer_id = ?) AND (dunning_config_id IS NOT NULL))
+       ORDER BY dunning_level DESC LIMIT 1|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $cid);
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
 
-  $sth->finish;
-  
-  $query = qq|SELECT o.amount,
-                (SELECT e.buy FROM exchangerate e
-                WHERE e.curr = o.curr
-                AND e.transdate = o.transdate)
-             FROM oe o
-             WHERE o.customer_id = $form->{customer_id}
-             AND o.quotation = '0'
-             AND o.closed = '0'|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  #check whether payment_terms are better than old payment_terms
+  if (($form->{payment_id} ne "") && ($form->{customer_payment_id} ne "")) {
+    $query =
+      qq|SELECT
+          (SELECT ranking FROM payment_terms WHERE id = ?),
+          (SELECT ranking FROM payment_terms WHERE id = ?)|;
+    my ($old_ranking, $new_ranking)
+      = selectrow_query($form, $dbh, $query, conv_i($form->{payment_id}), conv_i($form->{customer_payment_id}));
+    if ($new_ranking > $old_ranking) {
+      $form->{payment_id} = $form->{customer_payment_id};
+    }
+  }
+
+  if ($form->{payment_id} eq "") {
+    $form->{payment_id} = $form->{customer_payment_id};
+  }
+
+  $form->{creditremaining} = $form->{creditlimit};
+  $query = qq|SELECT SUM(amount - paid) FROM ar WHERE customer_id = ?|;
+  my ($value) = selectrow_query($form, $dbh, $query, $cid);
+  $form->{creditremaining} -= $value;
+
+  $query =
+    qq|SELECT o.amount,
+         (SELECT e.buy FROM exchangerate e
+          WHERE e.curr = o.curr
+            AND e.transdate = o.transdate)
+       FROM oe o
+       WHERE o.customer_id = ?
+         AND o.quotation = '0'
+         AND o.closed = '0'|;
+  $sth = prepare_execute_query($form, $dbh, $query, $cid);
 
   while (my ($amount, $exch) = $sth->fetchrow_array) {
     $exch = 1 unless $exch;
@@ -1270,66 +1679,53 @@ sub get_customer {
   }
   $sth->finish;
 
-  
-  $form->get_contacts($dbh,$form->{customer_id});
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
-  
-
-  # get contact if selected
-  if ($form->{contact} ne "--" && $form->{contact} ne "") 
-  {
-    $form->get_contact($dbh,$form->{cp_id});
-  }    
-   
   # get shipto if we did not converted an order or invoice
   if (!$form->{shipto}) {
-    map { delete $form->{$_} } qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
-
-    $query = qq|SELECT s.* FROM shipto s
-                WHERE s.trans_id = $form->{customer_id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
+    map { delete $form->{$_} }
+      qw(shiptoname shiptodepartment_1 shiptodepartment_2
+         shiptostreet shiptozipcode shiptocity shiptocountry
+         shiptocontact shiptophone shiptofax shiptoemail);
+
+    $query = qq|SELECT * FROM shipto WHERE trans_id = ? AND module = 'CT'|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, $cid);
+    delete $ref->{id};
     map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
-  }
-
-  # get taxes we charge for this customer
-  $query = qq|SELECT c.accno
-              FROM chart c
-             JOIN customertax ct ON (ct.chart_id = c.id)
-             WHERE ct.customer_id = $form->{customer_id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $customertax = ();
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $customertax{$ref->{accno}} = 1;
   }
-  $sth->finish;
 
   # setup last accounts used for this customer
   if (!$form->{id} && $form->{type} !~ /_(order|quotation)/) {
-    $query = qq|SELECT c.accno, c.description, c.link, c.category
-                FROM chart c
-               JOIN acc_trans ac ON (ac.chart_id = c.id)
-               JOIN ar a ON (a.id = ac.trans_id)
-               WHERE a.customer_id = $form->{customer_id}
-               AND NOT (c.link LIKE '%_tax%' OR c.link LIKE '%_paid%')
-               AND a.id IN (SELECT max(a2.id) FROM ar a2
-                            WHERE a2.customer_id = $form->{customer_id})|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $query =
+      qq|SELECT c.id, c.accno, c.description, c.link, c.category
+         FROM chart c
+         JOIN acc_trans ac ON (ac.chart_id = c.id)
+         JOIN ar a ON (a.id = ac.trans_id)
+         WHERE a.customer_id = ?
+           AND NOT (c.link LIKE '%_tax%' OR c.link LIKE '%_paid%')
+           AND a.id IN (SELECT max(a2.id) FROM ar a2 WHERE a2.customer_id = ?)|;
+    $sth = prepare_execute_query($form, $dbh, $query, $cid, $cid);
 
     my $i = 0;
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
       if ($ref->{category} eq 'I') {
-       $i++;
-       $form->{"AR_amount_$i"} = "$ref->{accno}--$ref->{description}";
+        $i++;
+        $form->{"AR_amount_$i"} = "$ref->{accno}--$ref->{description}";
+
+        if ($form->{initial_transdate}) {
+          my $tax_query =
+            qq|SELECT tk.tax_id, t.rate
+               FROM taxkeys tk
+               LEFT JOIN tax t ON tk.tax_id = t.id
+               WHERE (tk.chart_id = ?) AND (startdate <= ?)
+               ORDER BY tk.startdate DESC
+               LIMIT 1|;
+          my ($tax_id, $rate) =
+            selectrow_query($form, $dbh, $tax_query, $ref->{id},
+                            $form->{initial_transdate});
+          $form->{"taxchart_$i"} = "${tax_id}--${rate}";
+        }
       }
       if ($ref->{category} eq 'A') {
-       $form->{ARselected} = $form->{AR_1} = "$ref->{accno}--$ref->{description}";
+        $form->{ARselected} = $form->{AR_1} = $ref->{accno};
       }
     }
     $sth->finish;
@@ -1337,144 +1733,416 @@ sub get_customer {
   }
 
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub retrieve_item {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
-  my $i = $form->{rowcount};
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
 
-  my $where = "NOT p.obsolete = '1'";
+  my $i = $form->{rowcount};
 
-  if ($form->{"partnumber_$i"}) {
-    my $partnumber = $form->like(lc $form->{"partnumber_$i"});
-    $where .= " AND lower(p.partnumber) LIKE '$partnumber'";
-  }
-  if ($form->{"description_$i"}) {
-    my $description = $form->like(lc $form->{"description_$i"});
-    $where .= " AND lower(p.description) LIKE '$description'";
-  }
+  my $where = qq|NOT p.obsolete = '1'|;
+  my @values;
 
-  if ($form->{"partsgroup_$i"}) {
-    my $partsgroup = $form->like(lc $form->{"partsgroup_$i"});
-    $where .= " AND lower(pg.partsgroup) LIKE '$partsgroup'";
+  foreach my $column (qw(p.partnumber p.description pgpartsgroup)) {
+    my ($table, $field) = split m/\./, $column;
+    next if !$form->{"${field}_${i}"};
+    $where .= qq| AND lower(${column}) ILIKE ?|;
+    push @values, '%' . $form->{"${field}_${i}"} . '%';
   }
 
   if ($form->{"description_$i"}) {
-    $where .= " ORDER BY p.description";
+    $where .= qq| ORDER BY p.description|;
   } else {
-    $where .= " ORDER BY p.partnumber";
+    $where .= qq| ORDER BY p.partnumber|;
   }
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $transdate;
+  if ($form->{type} eq "invoice") {
+    $transdate =
+      $form->{deliverydate} ? $dbh->quote($form->{deliverydate}) :
+      $form->{invdate}      ? $dbh->quote($form->{invdate}) :
+                              "current_date";
+  } else {
+    $transdate =
+      $form->{transdate}    ? $dbh->quote($form->{transdate}) :
+                              "current_date";
+  }
 
-  my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
-                        p.listprice,
-                        c1.accno AS inventory_accno,
-                       c2.accno AS income_accno,
-                       c3.accno AS expense_accno,
-                p.unit, p.assembly, p.bin, p.onhand, p.notes AS partnotes,
-                pg.partsgroup
-                 FROM parts p
-                LEFT JOIN chart c1 ON (p.inventory_accno_id = c1.id)
-                LEFT JOIN chart c2 ON (p.income_accno_id = c2.id)
-                LEFT JOIN chart c3 ON (p.expense_accno_id = c3.id)
-                LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
-                WHERE $where|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $taxzone_id = $form->{taxzone_id} * 1;
+  $taxzone_id = 0 if (0 > $taxzone_id) || (3 < $taxzone_id);
+
+  my $query =
+    qq|SELECT
+         p.id, p.partnumber, p.description, p.sellprice,
+         p.listprice, p.inventory_accno_id,
+
+         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,
+
+         p.unit, p.assembly, p.bin, p.onhand,
+         p.notes AS partnotes, p.notes AS longdescription,
+         p.not_discountable, p.formel, p.payment_id AS part_payment_id,
+
+         pg.partsgroup
+
+       FROM parts p
+       LEFT JOIN chart c1 ON
+         ((SELECT inventory_accno_id
+           FROM buchungsgruppen
+           WHERE id = p.buchungsgruppen_id) = c1.id)
+       LEFT JOIN chart c2 ON
+         ((SELECT income_accno_id_${taxzone_id}
+           FROM buchungsgruppen
+           WHERE id = p.buchungsgruppen_id) = c2.id)
+       LEFT JOIN chart c3 ON
+         ((SELECT expense_accno_id_${taxzone_id}
+           FROM buchungsgruppen
+           WHERE id = p.buchungsgruppen_id) = c3.id)
+       LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
+       WHERE $where|;
+  my $sth = prepare_execute_query($form, $dbh, $query, @values);
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-  
-  #set expense_accno=inventory_accno if they are different => bilanz     
-  $vendor_accno = ($ref->{expense_accno}!=$ref->{inventory_accno}) ? $ref->{inventory_accno} :$ref->{expense_accno};
-  
-  
-  # get tax rates and description
-  $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
-  $query = qq|SELECT c.accno, c.description, t.rate, t.taxnumber
-             FROM chart c, tax t
-             WHERE c.id=t.chart_id AND t.taxkey in (SELECT c2.taxkey_id from chart c2 where c2.accno = '$accno_id')
-             ORDER BY c.accno|;
-  $stw = $dbh->prepare($query);
-  $stw->execute || $form->dberror($query);
-
-  $ref->{taxaccounts} = "";
-  while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
-#    if ($customertax{$ref->{accno}}) {
+
+    # In der Buchungsgruppe ist immer ein Bestandskonto verknuepft, auch wenn
+    # es sich um eine Dienstleistung handelt. Bei Dienstleistungen muss das
+    # Buchungskonto also aus dem Ergebnis rausgenommen werden.
+    if (!$ref->{inventory_accno_id}) {
+      map({ delete($ref->{"inventory_${_}"}); } qw(accno new_chart valid));
+    }
+    delete($ref->{inventory_accno_id});
+
+    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"});
+      }
+    }
+
+    #check whether payment_terms are better than old payment_terms
+    if (($form->{payment_id} ne "") && ($form->{part_payment_id} ne "")) {
+      $query =
+        qq|SELECT
+            (SELECT ranking FROM payment_terms WHERE id = ?),
+            (SELECT ranking FROM payment_terms WHERE id = ?)|;
+      my ($old_ranking, $new_ranking)
+        = selectrow_query($form, $dbh, $query, conv_i($form->{payment_id}), conv_i($form->{part_payment_id}));
+      if ($new_ranking > $old_ranking) {
+        $form->{payment_id} = $form->{customer_payment_id};
+      }
+    }
+
+    if ($form->{payment_id} eq "") {
+      $form->{payment_id} = $form->{part_payment_id};
+    }
+
+    # get tax rates and description
+    $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+    $query =
+      qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
+         FROM tax t
+         LEFT JOIN chart c ON (c.id = t.chart_id)
+         WHERE t.id in
+           (SELECT tk.tax_id
+            FROM taxkeys tk
+            WHERE tk.chart_id = (SELECT id from chart WHERE accno = ?)
+              AND startdate <= ?
+            ORDER BY startdate DESC
+            LIMIT 1)
+         ORDER BY c.accno|;
+    @values = ($accno_id, $transdate);
+    $stw = $dbh->prepare($query);
+    $stw->execute(@values) || $form->dberror($query);
+
+    $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;
+      }
       $ref->{taxaccounts} .= "$ptr->{accno} ";
-      if (!($form->{taxaccounts}=~/$ptr->{accno}/)) {
-        $form->{"$ptr->{accno}_rate"} = $ptr->{rate};
-        $form->{"$ptr->{accno}_description"} = $ptr->{description};
-        $form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
+
+      if (!($form->{taxaccounts} =~ /$ptr->{accno}/)) {
+        $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
+        $form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
+        $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
         $form->{taxaccounts} .= "$ptr->{accno} ";
       }
 
- }
   }
 
     $stw->finish;
     chop $ref->{taxaccounts};
-  
+    if ($form->{language_id}) {
+      $query =
+        qq|SELECT tr.translation, tr.longdescription
+           FROM translation tr
+           WHERE tr.language_id = ? AND tr.parts_id = ?|;
+      @values = (conv_i($form->{language_id}), conv_i($ref->{id}));
+      my ($translation, $longdescription) = selectrow_query($form, $dbh, $query, @values);
+      if ($translation ne "") {
+        $ref->{description} = $translation;
+        $ref->{longdescription} = $longdescription;
+
+      } else {
+        $query =
+          qq|SELECT tr.translation, tr.longdescription
+             FROM translation tr
+             WHERE tr.language_id IN
+               (SELECT id
+                FROM language
+                WHERE article_code = (SELECT article_code FROM language WHERE id = ?))
+               AND tr.parts_id = ?
+             LIMIT 1|;
+        @values = (conv_i($form->{language_id}), conv_i($ref->{id}));
+        my ($translation, $longdescription) = selectrow_query($form, $dbh, $query, @values);
+        if ($translation ne "") {
+          $ref->{description} = $translation;
+          $ref->{longdescription} = $longdescription;
+        }
+      }
+    }
+
     push @{ $form->{item_list} }, $ref;
-    
+
     if ($form->{lizenzen}) {
-        if ($ref->{inventory_accno} > 0) {
-          $query = qq| SELECT l.* FROM license l WHERE l.parts_id = $ref->{id} AND NOT l.id IN (SELECT li.license_id FROM licenseinvoice li)|;
-          $stw = $dbh->prepare($query);
-          $stw->execute || $form->dberror($query);
-          while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
-                  push @{ $form->{LIZENZEN}{$ref->{id}} }, $ptr;
-          }
-          $stw->finish;
+      if ($ref->{inventory_accno} > 0) {
+        $query =
+          qq|SELECT l.*
+             FROM license l
+             WHERE l.parts_id = ? AND NOT l.id IN (SELECT li.license_id FROM licenseinvoice li)|;
+        my $stw = prepare_execute_query($form, $dbh, $query, conv_i($ref->{id}));
+        while (my $ptr = $stw->fetchrow_hashref(NAME_lc)) {
+          push @{ $form->{LIZENZEN}{ $ref->{id} } }, $ptr;
         }
+        $stw->finish;
+      }
     }
-       
-
   }
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-sub webdav_folder {
+##########################
+# get pricegroups from database
+# build up selected pricegroup
+# if an exchange rate - change price
+# for each part
+#
+sub get_pricegroups_for_parts {
+
   $main::lxdebug->enter_sub();
 
-  my ($myconfig, $form) = @_;
-  
+  my ($self, $myconfig, $form) = @_;
 
-  SWITCH: {
-       $path = "webdav/rechnungen/".$form->{invnumber}, last SWITCH if ($form->{vc} eq "customer");
-       $path = "webdav/einkaufsrechnungen/".$form->{invnumber}, last SWITCH if ($form->{vc} eq "vendor"); 
-  }
+  my $dbh = $form->dbconnect($myconfig);
 
+  $form->{"PRICES"} = {};
 
-  if (! -d $path) {
-       mkdir ($path, 0770) or die "can't make directory $!\n";
-  } else {
-       if ($form->{id}) {
-               @files = <$path/*>;
-               foreach $file (@files) {
-                       $file =~ /\/([^\/]*)$/;
-                       $fname = $1;
-                       $ENV{'SCRIPT_NAME'} =~ /\/([^\/]*)\//;
-                       $lxerp = $1;
-                       $link = "http://".$ENV{'SERVER_NAME'}."/".$lxerp."/".$file;
-                       $form->{WEBDAV}{$fname} = $link; 
-               }
-       }
+  my $i  = 1;
+  my $id = 0;
+  my $dimension_units = AM->retrieve_units($myconfig, $form, "dimension");
+  my $service_units = AM->retrieve_units($myconfig, $form, "service");
+  my $all_units = AM->retrieve_units($myconfig, $form);
+  while (($form->{"id_$i"}) or ($form->{"new_id_$i"})) {
+    $form->{"PRICES"}{$i} = [];
+
+    $id = $form->{"id_$i"};
+
+    if (!($form->{"id_$i"}) and $form->{"new_id_$i"}) {
+
+      $id = $form->{"new_id_$i"};
+    }
+
+    ($price, $selectedpricegroup_id) = split(/--/,
+      $form->{"sellprice_pg_$i"});
+
+    $pricegroup_old = $form->{"pricegroup_old_$i"};
+    $form->{"new_pricegroup_$i"} = $selectedpricegroup_id;
+    $form->{"old_pricegroup_$i"} = $pricegroup_old;
+
+    $price_new = $form->{"price_new_$i"};
+    $price_old = $form->{"price_old_$i"};
+
+    if (!$form->{"unit_old_$i"}) {
+      # Neue Ware aus der Datenbank. In diesem Fall ist unit_$i die
+      # Einheit, wie sie in den Stammdaten hinterlegt wurde.
+      # Es sollte also angenommen werden, dass diese ausgewaehlt war.
+      $form->{"unit_old_$i"} = $form->{"unit_$i"};
+    }
+
+    # Die zuletzt ausgewaehlte mit der aktuell ausgewaehlten Einheit
+    # vergleichen und bei Unterschied den Preis entsprechend umrechnen.
+    $form->{"selected_unit_$i"} = $form->{"unit_$i"} unless ($form->{"selected_unit_$i"});
+
+    my $check_units = $form->{"inventory_accno_$i"} ? $dimension_units : $service_units;
+    if (!$check_units->{$form->{"selected_unit_$i"}} ||
+        ($check_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne
+         $all_units->{$form->{"unit_old_$i"}}->{"base_unit"})) {
+      # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
+      # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
+      # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen.
+      $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"};
+    }
+
+    my $basefactor = 1;
+
+    if ($form->{"unit_old_$i"} ne $form->{"selected_unit_$i"}) {
+      if (defined($all_units->{$form->{"unit_old_$i"}}->{"factor"}) &&
+          $all_units->{$form->{"unit_old_$i"}}->{"factor"}) {
+        $basefactor = $all_units->{$form->{"selected_unit_$i"}}->{"factor"} /
+          $all_units->{$form->{"unit_old_$i"}}->{"factor"};
+      }
+    }
+
+    if (!$form->{"basefactor_$i"}) {
+      $form->{"basefactor_$i"} = 1;
+    }
+
+    $query =
+      qq|SELECT
+           pricegroup_id,
+           (SELECT p.sellprice FROM parts p WHERE p.id = ?) AS default_sellprice,
+           (SELECT pg.pricegroup FROM pricegroup pg WHERE id = pricegroup_id) AS pricegroup,
+           price,
+           '' AS selected
+          FROM prices
+          WHERE parts_id = ?
+
+          UNION
+
+          SELECT
+            0 as pricegroup_id,
+            (SELECT sellprice FROM parts WHERE id = ?) AS default_sellprice,
+            '' AS pricegroup,
+            (SELECT DISTINCT sellprice FROM parts where id = ?) AS price,
+            'selected' AS selected
+          FROM prices
+
+          ORDER BY pricegroup|;
+    @values = (conv_i($id), conv_i($id), conv_i($id), conv_i($id));
+    my $pkq = prepare_execute_query($form, $dbh, $query, @values);
+
+    while ($pkr = $pkq->fetchrow_hashref(NAME_lc)) {
+      $pkr->{id}       = $id;
+      $pkr->{selected} = '';
+
+      # if there is an exchange rate change price
+      if (($form->{exchangerate} * 1) != 0) {
+
+        $pkr->{price} /= $form->{exchangerate};
+      }
+
+      $pkr->{price} *= $form->{"basefactor_$i"};
+
+      $pkr->{price} *= $basefactor;
+
+      $pkr->{price} = $form->format_amount($myconfig, $pkr->{price}, 5);
+
+      if ($selectedpricegroup_id eq undef) {
+        if ($pkr->{pricegroup_id} eq $form->{customer_klass}) {
+
+          $pkr->{selected}  = ' selected';
+
+          # no customer pricesgroup set
+          if ($pkr->{price} == $pkr->{default_sellprice}) {
+
+            $pkr->{price} = $form->{"sellprice_$i"};
+
+          } else {
+
+            $form->{"sellprice_$i"} = $pkr->{price};
+          }
+
+        } elsif ($pkr->{price} == $pkr->{default_sellprice}) {
+          $pkr->{price}    = $form->{"sellprice_$i"};
+          $pkr->{selected} = ' selected';
+        }
+      }
+
+      if ($selectedpricegroup_id or $selectedpricegroup_id == 0) {
+        if ($selectedpricegroup_id ne $pricegroup_old) {
+          if ($pkr->{pricegroup_id} eq $selectedpricegroup_id) {
+            $pkr->{selected}  = ' selected';
+          }
+        } elsif (($price_new != $form->{"sellprice_$i"}) and ($price_new ne 0)) {
+          if ($pkr->{pricegroup_id} == 0) {
+            $pkr->{price}     = $form->{"sellprice_$i"};
+            $pkr->{selected}  = ' selected';
+          }
+        } elsif ($pkr->{pricegroup_id} eq $selectedpricegroup_id) {
+          $pkr->{selected}  = ' selected';
+          if (    ($pkr->{pricegroup_id} == 0)
+              and ($pkr->{price} == $form->{"sellprice_$i"})) {
+            # $pkr->{price}                         = $form->{"sellprice_$i"};
+          } else {
+            $pkr->{price} = $form->{"sellprice_$i"};
+          }
+        }
+      }
+      push @{ $form->{PRICES}{$i} }, $pkr;
+
+    }
+    $form->{"basefactor_$i"} *= $basefactor;
+
+    $i++;
+
+    $pkq->finish;
   }
-  
-  
+
+  $dbh->disconnect;
+
   $main::lxdebug->leave_sub();
-} 
+}
 
-1;
+sub has_storno {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $table) = @_;
+
+  $main::lxdebug->leave_sub() and return 0 unless ($form->{id});
+
+  # make sure there's no funny stuff in $table
+  # ToDO: die when this happens and throw an error
+  $main::lxdebug->leave_sub() and return 0 if ($table =~ /\W/);
+
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = qq|SELECT storno FROM $table WHERE id = ?|;
+  my ($result) = selectrow_query($form, $dbh, $query, $form->{id});
 
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+
+  return $result;
+}
+
+1;