X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FOE.pm;h=7bea468e7003662786f1d31778261383efa7787d;hb=d38dee8d88775c83f64cd3c60df37d44cf607cdd;hp=210a87c758d743316d79cbfdbe3f2af931cd271b;hpb=e07e9534d0c611913e31bc620c65e46701e5f000;p=kivitendo-erp.git

diff --git a/SL/OE.pm b/SL/OE.pm
index 210a87c75..7bea468e7 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -34,6 +34,8 @@
 
 package OE;
 
+use List::Util qw(max);
+
 use SL::AM;
 use SL::Common;
 use SL::DBUtils;
@@ -49,9 +51,9 @@ sub transactions {
   my $query;
   my $ordnumber = 'ordnumber';
   my $quotation = '0';
-  my ($null, $department_id) = split /--/, $form->{department};
 
-  my $department = " AND o.department_id = $department_id" if $department_id;
+  my @values;
+  my $where;
 
   my $rate = ($form->{vc} eq 'customer') ? 'buy' : 'sell';
 
@@ -60,29 +62,60 @@ sub transactions {
     $ordnumber = 'quonumber';
   }
 
-  my $number = $form->like(lc $form->{$ordnumber});
-  my $name   = $form->like(lc $form->{ $form->{vc} });
-
-  my $query = qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate,
-                 o.amount, ct.name, o.netamount, o.$form->{vc}_id,
-		 ex.$rate AS exchangerate,
-		 o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia,
-		 e.name AS employee
-	         FROM oe o
-	         JOIN $form->{vc} ct ON (o.$form->{vc}_id = ct.id)
-	         LEFT JOIN employee e ON (o.employee_id = e.id)
-	         LEFT JOIN exchangerate ex ON (ex.curr = o.curr
-		                               AND ex.transdate = o.transdate)
-	         WHERE o.quotation = '$quotation'
-		 $department|;
-
-  if ($form->{"$form->{vc}_id"}) {
-    $query .= qq| AND o.$form->{vc}_id = $form->{"$form->{vc}_id"}|;
-  } else {
-    if ($form->{ $form->{vc} }) {
-      $query .= " AND lower(ct.name) LIKE '$name'";
-    }
+  my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
+
+  $query =
+    qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
+    qq|  o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
+    qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
+    qq|  o.transaction_description, | .
+    qq|  o.marge_total, o.marge_percent, | .
+    qq|  ex.$rate AS exchangerate, | .
+    qq|  pr.projectnumber AS globalprojectnumber, | .
+    qq|  e.name AS employee, s.name AS salesman | .
+    qq|FROM oe o | .
+    qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
+    qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
+    qq|LEFT JOIN employee s ON (o.salesman_id = s.id) | .
+    qq|LEFT JOIN exchangerate ex ON (ex.curr = o.curr | .
+    qq|  AND ex.transdate = o.transdate) | .
+    qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
+    qq|WHERE (o.quotation = ?) |;
+  push(@values, $quotation);
+
+  my ($null, $department_id) = split /--/, $form->{department};
+  if ($department_id) {
+    $query .= qq| AND o.department_id = ?|;
+    push(@values, $department_id);
+  }
+
+  if ($form->{"project_id"}) {
+    $query .=
+      qq|AND ((globalproject_id = ?) OR EXISTS | .
+      qq|  (SELECT * FROM orderitems oi | .
+      qq|   WHERE oi.project_id = ? AND oi.trans_id = o.id))|;
+    push(@values, $form->{"project_id"}, $form->{"project_id"});
   }
+
+  if ($form->{"${vc}_id"}) {
+    $query .= " AND o.${vc}_id = ?";
+    push(@values, $form->{"${vc}_id"});
+
+  } elsif ($form->{$vc}) {
+    $query .= " AND ct.name ILIKE ?";
+    push(@values, '%' . $form->{$vc} . '%');
+  }
+
+  if ($form->{employee_id}) {
+    $query .= " AND o.employee_id = ?";
+    push @values, conv_i($form->{employee_id});
+  }
+  
+  if ($form->{salesman_id}) {
+    $query .= " AND o.salesman_id = ?";
+    push @values, conv_i($form->{salesman_id});
+  }
+
   if (!$form->{open} && !$form->{closed}) {
     $query .= " AND o.id = 0";
   } elsif (!($form->{open} && $form->{closed})) {
@@ -95,21 +128,50 @@ sub transactions {
       " AND o.delivered " : " AND NOT o.delivered";
   }
 
-  my $sortorder = join ', ',
-    ("o.id", $form->sort_columns(transdate, $ordnumber, name));
-  $sortorder = $form->{sort} if $form->{sort};
+  if ($form->{$ordnumber}) {
+    $query .= qq| AND o.$ordnumber ILIKE ?|;
+    push(@values, '%' . $form->{$ordnumber} . '%');
+  }
+
+  if($form->{transdatefrom}) {
+    $query .= qq| AND o.transdate >= ?|;
+    push(@values, conv_date($form->{transdatefrom}));
+  }
 
-  $query .= " AND lower($ordnumber) LIKE '$number'" if $form->{$ordnumber};
-  $query .= " AND o.transdate >= '$form->{transdatefrom}'"
-    if $form->{transdatefrom};
-  $query .= " AND o.transdate <= '$form->{transdateto}'"
-    if $form->{transdateto};
-  $query .= " ORDER by $sortorder";
+  if($form->{transdateto}) {
+    $query .= qq| AND o.transdate <= ?|;
+    push(@values, conv_date($form->{transdateto}));
+  }
+
+  if ($form->{transaction_description}) {
+    $query .= qq| AND o.transaction_description ILIKE ?|;
+    push(@values, '%' . $form->{transaction_description} . '%');
+  }
+
+  my $sortorder = join(', ', ("o.id", $form->sort_columns("transdate", $ordnumber, "name")));
+  my %allowed_sort_columns = (
+    "transdate"               => "o.transdate",
+    "reqdate"                 => "o.reqdate",
+    "id"                      => "o.id",
+    "ordnumber"               => "o.ordnumber",
+    "quonumber"               => "o.quonumber",
+    "name"                    => "ct.name",
+    "employee"                => "e.name",
+    "salesman"                => "e.name",
+    "shipvia"                 => "o.shipvia",
+    "transaction_description" => "o.transaction_description"
+  );
+  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
+    $sortorder = $allowed_sort_columns{$form->{sort}};
+  }
+  $query .= qq| ORDER by | . $sortorder;
 
   my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  $sth->execute(@values) ||
+    $form->dberror($query . " (" . join(", ", @values) . ")");
 
   my %id = ();
+  $form->{OE} = [];
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     $ref->{exchangerate} = 1 unless $ref->{exchangerate};
     push @{ $form->{OE} }, $ref if $ref->{id} != $id{ $ref->{id} };
@@ -130,113 +192,78 @@ sub save {
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my ($query, $sth, $null);
+  my ($query, @values, $sth, $null);
   my $exchangerate = 0;
 
-  my $service_units = AM->retrieve_units($myconfig,$form,"service");
-  my $part_units = AM->retrieve_units($myconfig,$form,"dimension");
-  $form->{service_units} =$service_units;
-  $form->{part_units} =$part_units;
+  my $all_units = AM->retrieve_units($myconfig, $form);
+  $form->{all_units} = $all_units;
 
-  ($null, $form->{employee_id}) = split /--/, $form->{employee};
+  $form->{employee_id} = (split /--/, $form->{employee})[1] if !$form->{employee_id};
   unless ($form->{employee_id}) {
     $form->get_employee($dbh);
   }
 
-  $form->{payment_id} *= 1;
-  $form->{language_id} *= 1;
-  $form->{shipto_id} *= 1;
-  $form->{delivery_customer_id} *= 1;
-  $form->{delivery_vendor_id} *= 1;
-
   my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
 
   if ($form->{id}) {
 
     &adj_onhand($dbh, $form, $ml) if $form->{type} =~ /_order$/;
 
-    $query = qq|DELETE FROM orderitems
-                WHERE trans_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
+    $query = qq|DELETE FROM orderitems WHERE trans_id = ?|;
+    do_query($form, $dbh, $query, $form->{id});
 
-    $query = qq|DELETE FROM shipto
-                WHERE trans_id = $form->{id} AND module = 'OE'|;
-    $dbh->do($query) || $form->dberror($query);
+    $query = qq|DELETE FROM shipto | .
+             qq|WHERE trans_id = ? AND module = 'OE'|;
+    do_query($form, $dbh, $query, $form->{id});
 
   } else {
 
-    my $uid = rand() . time;
-
-    $uid .= $form->{login};
-
-    $uid = substr($uid, 2, 75);
+    $query = qq|SELECT nextval('id')|;
+    ($form->{id}) = selectrow_query($form, $dbh, $query);
 
-    $query = qq|INSERT INTO oe (ordnumber, employee_id)
-		VALUES ('$uid', $form->{employee_id})|;
-    $dbh->do($query) || $form->dberror($query);
-
-    $query = qq|SELECT o.id FROM oe o
-                WHERE o.ordnumber = '$uid'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
+    $query = qq|INSERT INTO oe (id, ordnumber, employee_id) VALUES (?, '', ?)|;
+    do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
   }
 
-  map { $form->{$_} =~ s/\'/\'\'/g }
-    qw(ordnumber quonumber shippingpoint shipvia notes intnotes message);
-
-  my $amount;
-  my $linetotal;
-  my $discount;
+  my $amount    = 0;
+  my $linetotal = 0;
+  my $discount  = 0;
   my $project_id;
   my $reqdate;
   my $taxrate;
-  my $taxamount;
+  my $taxamount = 0;
   my $fxsellprice;
   my %taxbase;
   my @taxaccounts;
   my %taxaccounts;
   my $netamount = 0;
 
+  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+  my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
+  my $price_factor;
+
   for my $i (1 .. $form->{rowcount}) {
 
-    map {
-      $form->{"${_}_$i"} =
-        $form->parse_amount($myconfig, $form->{"${_}_$i"})
-    } qw(qty ship);
+    map({ $form->{"${_}_$i"} =
+            $form->parse_amount($myconfig, $form->{"${_}_$i"}) } qw(qty ship));
 
     if ($form->{"id_$i"}) {
 
       # get item baseunit
-      $query = qq|SELECT p.unit
-                  FROM parts p
-                  WHERE p.id = $form->{"id_$i"}|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-
-      my ($item_unit) = $sth->fetchrow_array();
-      $sth->finish;
-
-      if ($form->{"inventory_accno_$i"}) {
-        if (defined($part_units->{$item_unit}->{factor}) && $part_units->{$item_unit}->{factor} ne '' && $part_units->{$item_unit}->{factor} ne '0') {
-          $basefactor = $part_units->{$form->{"unit_$i"}}->{factor} / $part_units->{$item_unit}->{factor};
-        } else {
-          $basefactor = 1;
-        }
-        $baseqty = $form->{"qty_$i"} * $basefactor;
-      } else {
-        if (defined($service_units->{$item_unit}->{factor}) && $service_units->{$item_unit}->{factor} ne '' && $service_units->{$item_unit}->{factor} ne '0') {
-          $basefactor = $service_units->{$form->{"unit_$i"}}->{factor} / $service_units->{$item_unit}->{factor};
-        } else {
-          $basefactor = 1;
-        }
-        $baseqty = $form->{"qty_$i"} * $basefactor;
+      $query = qq|SELECT unit FROM parts WHERE id = ?|;
+      my ($item_unit) = selectrow_query($form, $dbh, $query, $form->{"id_$i"});
+
+      my $basefactor = 1;
+      if (defined($all_units->{$item_unit}->{factor}) &&
+          (($all_units->{$item_unit}->{factor} * 1) != 0)) {
+        $basefactor = $all_units->{$form->{"unit_$i"}}->{factor} /
+          $all_units->{$item_unit}->{factor};
       }
+      my $baseqty = $form->{"qty_$i"} * $basefactor;
 
-      map { $form->{"${_}_$i"} =~ s/\'/\'\'/g }
-        qw(partnumber description unit);
+      $form->{"marge_percent_$i"} = $form->parse_amount($myconfig, $form->{"marge_percent_$i"}) * 1;
+      $form->{"marge_total_$i"} = $form->parse_amount($myconfig, $form->{"marge_total_$i"}) * 1;
+      $form->{"lastcost_$i"} = $form->{"lastcost_$i"} * 1;
 
       # set values to 0 if nothing entered
       $form->{"discount_$i"} =
@@ -247,7 +274,7 @@ sub save {
       $fxsellprice = $form->{"sellprice_$i"};
 
       my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
-      $dec = length $dec;
+      $dec = length($dec);
       my $decimalplaces = ($dec > 2) ? $dec : 2;
 
       $discount =
@@ -260,10 +287,10 @@ sub save {
       $form->{"inventory_accno_$i"} *= 1;
       $form->{"expense_accno_$i"}   *= 1;
 
-      $linetotal =
-        $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+      $price_factor = $price_factors{ $form->{"price_factor_id_$i"} } || 1;
+      $linetotal    = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2);
 
-      @taxaccounts = split / /, $form->{"taxaccounts_$i"};
+      @taxaccounts = split(/ /, $form->{"taxaccounts_$i"});
       $taxrate     = 0;
       $taxdiff     = 0;
 
@@ -309,47 +336,53 @@ sub save {
         }
       }
 
-      $netamount += $form->{"sellprice_$i"} * $form->{"qty_$i"};
+      $netamount += $form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor;
 
-      $project_id = 'NULL';
-      if ($form->{"projectnumber_$i"}) {
-        $project_id = $form->{"projectnumber_$i"};
-      }
       $reqdate =
-        ($form->{"reqdate_$i"}) ? qq|'$form->{"reqdate_$i"}'| : "NULL";
+        ($form->{"reqdate_$i"}) ? $form->{"reqdate_$i"} : undef;
 
       # get pricegroup_id and save ist
-      ($null, my $pricegroup_id) = split /--/, $form->{"sellprice_pg_$i"};
+      ($null, my $pricegroup_id) = split(/--/, $form->{"sellprice_pg_$i"});
       $pricegroup_id *= 1;
-      $subtotal = $form->{"subtotal_$i"} * 1;
 
       # save detail record in orderitems table
+      @values = ();
       $query = qq|INSERT INTO orderitems (|;
-      $query .= "id, " if $form->{"orderitems_id_$i"};
-      $query .= qq|trans_id, parts_id, description, longdescription, qty, base_qty, sellprice, discount,
-		   unit, reqdate, project_id, serialnumber, ship, pricegroup_id,
-		   ordnumber, transdate, cusordnumber, subtotal)
-                   VALUES (|;
-      $query .= qq|$form->{"orderitems_id_$i"},|
-        if $form->{"orderitems_id_$i"};
-      $query .= qq|$form->{id}, $form->{"id_$i"},
-		   '$form->{"description_$i"}', '$form->{"longdescription_$i"}', $form->{"qty_$i"}, $baseqty,
-		   $fxsellprice, $form->{"discount_$i"},
-		   '$form->{"unit_$i"}', $reqdate, (SELECT id from project where projectnumber = '$project_id'),
-		   '$form->{"serialnumber_$i"}', $form->{"ship_$i"}, '$pricegroup_id',
-		   '$form->{"ordnumber_$i"}', '$form->{"transdate_$i"}', '$form->{"cusordnumber_$i"}', '$subtotal')|;
-      $dbh->do($query) || $form->dberror($query);
+      if ($form->{"orderitems_id_$i"}) {
+        $query .= "id, ";
+      }
+      $query .= qq|trans_id, parts_id, description, longdescription, qty, base_qty, | .
+                qq|sellprice, discount, unit, reqdate, project_id, serialnumber, ship, | .
+                qq|pricegroup_id, ordnumber, transdate, cusordnumber, subtotal, | .
+                qq|marge_percent, marge_total, lastcost, price_factor_id, price_factor, marge_price_factor) | .
+                qq|VALUES (|;
+      if($form->{"orderitems_id_$i"}) {
+        $query .= qq|?,|;
+        push(@values, $form->{"orderitems_id_$i"});
+      }
+      $query .= qq|?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+                   (SELECT factor FROM price_factors WHERE id = ?), ?)|;
+		  push(@values,
+           conv_i($form->{id}), conv_i($form->{"id_$i"}),
+           $form->{"description_$i"}, $form->{"longdescription_$i"},
+           $form->{"qty_$i"}, $baseqty,
+           $fxsellprice, $form->{"discount_$i"},
+           $form->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
+           $form->{"serialnumber_$i"}, $form->{"ship_$i"}, conv_i($pricegroup_id),
+           $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
+           $form->{"cusordnumber_$i"}, $form->{"subtotal_$i"} ? 't' : 'f',
+           $form->{"marge_percent_$i"}, $form->{"marge_total_$i"},
+           $form->{"lastcost_$i"},
+           conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
+           conv_i($form->{"marge_price_factor_$i"}));
+      do_query($form, $dbh, $query, @values);
 
       $form->{"sellprice_$i"} = $fxsellprice;
       $form->{"discount_$i"} *= 100;
     }
   }
 
-  # set values which could be empty
-  map { $form->{$_} *= 1 }
-    qw(vendor_id customer_id taxincluded closed quotation);
-
-  $reqdate = ($form->{reqdate}) ? qq|'$form->{reqdate}'| : "NULL";
+  $reqdate = ($form->{reqdate}) ? $form->{reqdate} : undef;
 
   # add up the tax
   my $tax = 0;
@@ -373,80 +406,46 @@ sub save {
     ? $exchangerate
     : $form->parse_amount($myconfig, $form->{exchangerate});
 
-  my $quotation;
-
-  # fill in subject if there is none
-  if ($form->{type} =~ /_order$/) {
-    $quotation = '0';
-    $form->{subject} = qq|$form->{label} $form->{ordnumber}|
-      unless $form->{subject};
-  } else {
-    $quotation = '1';
-    $form->{subject} = qq|$form->{label} $form->{quonumber}|
-      unless $form->{subject};
-  }
-
-  # if there is a message stuff it into the intnotes
-  my $cc  = "Cc: $form->{cc}\\r\n"   if $form->{cc};
-  my $bcc = "Bcc: $form->{bcc}\\r\n" if $form->{bcc};
-  my $now = scalar localtime;
-  $form->{intnotes} .= qq|\r
-\r| if $form->{intnotes};
-
-  $form->{intnotes} .= qq|[email]\r
-Date: $now
-To: $form->{email}\r
-$cc${bcc}Subject: $form->{subject}\r
-\r
-Message: $form->{message}\r| if $form->{message};
+  my $quotation = $form->{type} =~ /_order$/ ? 'f' : 't';
 
   ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
-  $form->{payment_id} *= 1;
-  $form->{language_id} *= 1;
-  $form->{taxzone_id} *= 1;
-  $form->{proforma} *= 1;
-
-
 
   # save OE record
-  $query = qq|UPDATE oe set
-	      ordnumber = '$form->{ordnumber}',
-	      quonumber = '$form->{quonumber}',
-              cusordnumber = '$form->{cusordnumber}',
-              transdate = '$form->{transdate}',
-              vendor_id = $form->{vendor_id},
-	      customer_id = $form->{customer_id},
-              amount = $amount,
-              netamount = $netamount,
-	      reqdate = $reqdate,
-	      taxincluded = '$form->{taxincluded}',
-	      shippingpoint = '$form->{shippingpoint}',
-	      shipvia = '$form->{shipvia}',
-	      notes = '$form->{notes}',
-	      intnotes = '$form->{intnotes}',
-	      curr = '$form->{currency}',
-	      closed = '$form->{closed}',
-	      delivered = '| . ($form->{delivered} ? "t" : "f") . qq|',
-	      proforma = '$form->{proforma}',
-	      quotation = '$quotation',
-	      department_id = $form->{department_id},
-	      language_id = $form->{language_id},
-	      taxzone_id = $form->{taxzone_id},
-	      shipto_id = $form->{shipto_id},
-	      payment_id = $form->{payment_id},
-	      delivery_vendor_id = $form->{delivery_vendor_id},
-	      delivery_customer_id = $form->{delivery_customer_id},
-	      employee_id = $form->{employee_id},
-              cp_id = | . conv_i($form->{cp_id}, 'NULL') . qq|
-              WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query =
+    qq|UPDATE oe SET
+         ordnumber = ?, quonumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?,
+         customer_id = ?, amount = ?, netamount = ?, reqdate = ?, taxincluded = ?,
+         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?,
+         delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?,
+         taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?,
+         globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, marge_total = ?, marge_percent = ?
+       WHERE id = ?|;
+
+  @values = ($form->{ordnumber}, $form->{quonumber},
+             $form->{cusordnumber}, conv_date($form->{transdate}),
+             conv_i($form->{vendor_id}), conv_i($form->{customer_id}),
+             $amount, $netamount, conv_date($reqdate),
+             $form->{taxincluded} ? 't' : 'f', $form->{shippingpoint},
+             $form->{shipvia}, $form->{notes}, $form->{intnotes},
+             substr($form->{currency}, 0, 3), $form->{closed} ? 't' : 'f',
+             $form->{delivered} ? "t" : "f", $form->{proforma} ? 't' : 'f',
+             $quotation, conv_i($form->{department_id}),
+             conv_i($form->{language_id}), conv_i($form->{taxzone_id}),
+             conv_i($form->{shipto_id}), conv_i($form->{payment_id}),
+             conv_i($form->{delivery_vendor_id}),
+             conv_i($form->{delivery_customer_id}),
+             conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
+             conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
+             $form->{transaction_description},
+             $form->{marge_total} * 1, $form->{marge_percent} * 1,
+             conv_i($form->{id}));
+  do_query($form, $dbh, $query, @values);
 
   $form->{ordtotal} = $amount;
 
   # add shipto
   $form->{name} = $form->{ $form->{vc} };
-  $form->{name} =~ s/--$form->{"$form->{vc}_id"}//;
+  $form->{name} =~ s/--\Q$form->{"$form->{vc}_id"}\E//;
 
   if (!$form->{shipto_id}) {
     $form->add_shipto($dbh, $form->{id}, "OE");
@@ -475,6 +474,9 @@ Message: $form->{message}\r| if $form->{message};
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
+  $form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ?
+                                       "quonumber" : "ordnumber"};
+
   Common::webdav_folder($form) if ($main::webdav);
 
   $main::lxdebug->leave_sub();
@@ -495,9 +497,9 @@ sub close_orders {
     (1 .. $form->{rowcount});
 
   my $dbh = $form->dbconnect($myconfig);
-  $query = qq|UPDATE oe SET
-              closed = TRUE
-              WHERE ordnumber IN (|
+  $query = qq|UPDATE oe SET | .
+           qq|closed = TRUE | .
+           qq|WHERE ordnumber IN (|
     . join(', ', map { $dbh->quote($_) } @ids) . qq|)|;
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
@@ -510,7 +512,7 @@ sub close_order {
 
   my ($self, $myconfig, $form) = @_;
 
-  $main::lxdebug->leave_sub() unless ($form->{"id"});
+  return $main::lxdebug->leave_sub() unless ($form->{"id"});
 
   my $dbh = $form->dbconnect($myconfig);
   do_query($form, $dbh, qq|UPDATE oe SET closed = TRUE where id = ?|,
@@ -529,10 +531,11 @@ sub delete {
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # delete spool files
-  my $query = qq|SELECT s.spoolfile FROM status s
-                 WHERE s.trans_id = $form->{id}|;
+  my $query = qq|SELECT s.spoolfile FROM status s | .
+              qq|WHERE s.trans_id = ?|;
+  my @values = (conv_i($form->{id}));
   $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
+  $sth->execute(@values) || $self->dberror($query);
 
   my $spoolfile;
   my @spoolfiles = ();
@@ -542,39 +545,43 @@ sub delete {
   }
   $sth->finish;
 
-  $query = qq|SELECT o.parts_id, o.ship FROM orderitems o
-              WHERE o.trans_id = $form->{id}|;
+  $query = qq|SELECT o.parts_id, o.ship FROM orderitems o | .
+           qq|WHERE o.trans_id = ?|;
+  @values = (conv_i($form->{id}));
   $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
+  $sth->execute(@values) || $self->dberror($query);
 
   while (my ($id, $ship) = $sth->fetchrow_array) {
     $form->update_balance($dbh, "parts", "onhand", qq|id = $id|, $ship * -1);
   }
   $sth->finish;
 
+  # delete-values
+  @values = (conv_i($form->{id}));
+
   # delete inventory
-  $query = qq|DELETE FROM inventory
-              WHERE oe_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM inventory | .
+           qq|WHERE oe_id = ?|;
+  do_query($form, $dbh, $query, @values);
 
   # delete status entries
-  $query = qq|DELETE FROM status
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM status | .
+           qq|WHERE trans_id = ?|;
+  do_query($form, $dbh, $query, @values);
 
   # delete OE record
-  $query = qq|DELETE FROM oe
-              WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM oe | .
+           qq|WHERE id = ?|;
+  do_query($form, $dbh, $query, @values);
 
   # delete individual entries
-  $query = qq|DELETE FROM orderitems
-              WHERE trans_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM orderitems | .
+           qq|WHERE trans_id = ?|;
+  do_query($form, $dbh, $query, @values);
 
-  $query = qq|DELETE FROM shipto
-              WHERE trans_id = $form->{id} AND module = 'OE'|;
-  $dbh->do($query) || $form->dberror($query);
+  $query = qq|DELETE FROM shipto | .
+           qq|WHERE trans_id = ? AND module = 'OE'|;
+  do_query($form, $dbh, $query, @values);
 
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -598,12 +605,12 @@ sub retrieve {
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my $query, @ids;
+  my ($query, $query_add, @values, @ids, $sth);
 
   # translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
   map {
     push @ids, $form->{"trans_id_$_"}
-      if ($form->{"id_$_"} and $form->{"trans_id_$_"})
+      if ($form->{"multi_id_$_"} and $form->{"trans_id_$_"})
   } (1 .. $form->{"rowcount"});
 
   # if called in multi id mode, and still only got one id, switch back to single id
@@ -612,44 +619,21 @@ sub retrieve {
     undef @ids;
   }
 
-  if ($form->{id}) {
-
-    # get default accounts and last order 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 transdate, current_date AS reqdate
-	 	FROM defaults d|;
-  }
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  $query_add = qq|, current_date AS transdate, current_date AS reqdate| if (!$form->{id});
+
+  # get default accounts
+  $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_add
+              FROM defaults d|;
+  my $ref = selectfirst_hashref_query($form, $dbh, $query);
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
 
-  ($form->{currency}) = split /:/, $form->{currencies};
+  ($form->{currency}) = split(/:/, $form->{currencies});
 
   # set reqdate if this is an invoice->order conversion. If someone knows a better check to ensure
   # we come from invoices, feel free.
@@ -657,38 +641,39 @@ sub retrieve {
     if (    $form->{deliverydate}
         and $form->{callback} =~ /action=ar_transactions/);
 
+  my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
+
   if ($form->{id} or @ids) {
 
     # retrieve order for single id
     # NOTE: this query is intended to fetch all information only ONCE.
     # so if any of these infos is important (or even different) for any item,
     # it will be killed out and then has to be fetched from the item scope query further down
-    $query = qq|SELECT o.cp_id, o.ordnumber, o.transdate, o.reqdate,
-                o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes,
-		o.curr AS currency, e.name AS employee, o.employee_id,
-		o.$form->{vc}_id, cv.name AS $form->{vc}, o.amount AS invtotal,
-		o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
-		d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
-                o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,
-                o.delivered
-		FROM oe o
-	        JOIN $form->{vc} cv ON (o.$form->{vc}_id = cv.id)
-	        LEFT JOIN employee e ON (o.employee_id = e.id)
-	        LEFT JOIN department d ON (o.department_id = d.id)
-		|
-      . ($form->{id}
-         ? qq|WHERE o.id = $form->{id}|
-         : qq|WHERE o.id IN (| . join(', ', @ids) . qq|)|);
-
-    #$main::lxdebug->message(0, $query);
-
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $query =
+      qq|SELECT o.cp_id, o.ordnumber, o.transdate, o.reqdate,
+           o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes,
+           o.curr AS currency, e.name AS employee, o.employee_id, o.salesman_id,
+           o.${vc}_id, cv.name AS ${vc}, o.amount AS invtotal,
+           o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
+           d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
+           o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,
+           o.globalproject_id, o.delivered, o.transaction_description
+         FROM oe o
+         JOIN ${vc} cv ON (o.${vc}_id = cv.id)
+         LEFT JOIN employee e ON (o.employee_id = e.id)
+         LEFT JOIN department d ON (o.department_id = d.id) | .
+        ($form->{id} 
+         ? "WHERE o.id = ?" 
+         : "WHERE o.id IN (" . join(', ', map("? ", @ids)) . ")"
+        );
+    @values = $form->{id} ? ($form->{id}) : @ids;
+    $sth = prepare_execute_query($form, $dbh, $query, @values);
 
     $ref = $sth->fetchrow_hashref(NAME_lc);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
 
-
+    $form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ?
+                                         "quonumber" : "ordnumber"};
 
     # set all entries for multiple ids blank that yield different information
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
@@ -702,27 +687,19 @@ sub retrieve {
     $sth->finish;
 
     if ($form->{delivery_customer_id}) {
-      $query = qq|SELECT name FROM customer WHERE id=$form->{delivery_customer_id}|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-      ($form->{delivery_customer_string}) = $sth->fetchrow_array();
-      $sth->finish;
+      $query = qq|SELECT name FROM customer WHERE id = ?|;
+      ($form->{delivery_customer_string}) = selectrow_query($form, $dbh, $query, $form->{delivery_customer_id});
     }
 
     if ($form->{delivery_vendor_id}) {
-      $query = qq|SELECT name FROM customer WHERE id=$form->{delivery_vendor_id}|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-      ($form->{delivery_vendor_string}) = $sth->fetchrow_array();
-      $sth->finish;
+      $query = qq|SELECT name FROM customer WHERE id = ?|;
+      ($form->{delivery_vendor_string}) = selectrow_query($form, $dbh, $query, $form->{delivery_vendor_id});
     }
 
     # shipto and pinted/mailed/queued status makes only sense for single id retrieve
     if (!@ids) {
-      $query = qq|SELECT s.* FROM shipto s
-                  WHERE s.trans_id = $form->{id} AND s.module = 'OE'|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
+      $query = qq|SELECT s.* FROM shipto s WHERE s.trans_id = ? AND s.module = 'OE'|;
+      $sth = prepare_execute_query($form, $dbh, $query, $form->{id});
 
       $ref = $sth->fetchrow_hashref(NAME_lc);
       delete($ref->{id});
@@ -730,17 +707,13 @@ sub retrieve {
       $sth->finish;
 
       # get printed, emailed and queued
-      $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 s.printed, s.emailed, s.spoolfile, s.formname FROM status s WHERE s.trans_id = ?|;
+      $sth = prepare_execute_query($form, $dbh, $query, $form->{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);
@@ -749,43 +722,41 @@ sub retrieve {
     my %oid = ('Pg'     => 'oid',
                'Oracle' => 'rowid');
 
-    my $transdate =
-      $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
+    my $transdate = $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
+
+    $form->{taxzone_id} = 0 unless ($form->{taxzone_id});
 
-    if(!$form->{taxzone_id}) {
-      $form->{taxzone_id} = 0;
-    }
     # retrieve individual items
     # this query looks up all information about the items
     # stuff different from the whole will not be overwritten, but saved with a suffix.
-    $query = qq|SELECT o.id AS orderitems_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,
-		oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe, 
-                p.partnumber, p.assembly, o.description, o.qty,
-		o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
-                o.reqdate, o.project_id, o.serialnumber, o.ship,
-		o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,
-		pr.projectnumber, p.formel,
-		pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
-		FROM orderitems o
-		JOIN parts p ON (o.parts_id = p.id)
-		JOIN oe ON (o.trans_id = oe.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_$form->{taxzone_id} from buchungsgruppen where id=p.buchungsgruppen_id) = c2.id)
-		LEFT JOIN chart c3 ON ((select expense_accno_id_$form->{taxzone_id} from buchungsgruppen where id=p.buchungsgruppen_id) = c3.id)
-		LEFT JOIN project pr ON (o.project_id = pr.id)
-		LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-		|
-      . ($form->{id}
-         ? qq|WHERE o.trans_id = $form->{id}|
-         : qq|WHERE o.trans_id IN (| . join(", ", @ids) . qq|)|)
-      . qq|
-                ORDER BY o.$oid{$myconfig->{dbdriver}}|;
-
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $query =
+      qq|SELECT o.id AS orderitems_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,
+           oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe,
+           p.partnumber, p.assembly, o.description, o.qty,
+           o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
+           o.reqdate, o.project_id, o.serialnumber, o.ship, o.lastcost,
+           o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,
+           o.price_factor_id, o.price_factor, o.marge_price_factor,
+           pr.projectnumber, p.formel,
+           pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
+         FROM orderitems o
+         JOIN parts p ON (o.parts_id = p.id)
+         JOIN oe ON (o.trans_id = oe.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_$form->{taxzone_id}  FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c2.id)
+         LEFT JOIN chart c3 ON ((SELECT expense_accno_id_$form->{taxzone_id} FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c3.id)
+         LEFT JOIN project pr ON (o.project_id = pr.id)
+         LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) | .
+      ($form->{id}
+       ? qq|WHERE o.trans_id = ?|
+       : qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
+      qq|ORDER BY o.$oid{$myconfig->{dbdriver}}|;
+
+    @ids = $form->{id} ? ($form->{id}) : @ids;
+    $sth = prepare_execute_query($form, $dbh, $query, @values);
 
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
       if (!$ref->{"part_inventory_accno_id"}) {
@@ -803,53 +774,58 @@ sub retrieve {
 
 
 
-    while ($ref->{inventory_new_chart} && ($ref->{inventory_valid} >=0)) {
-      my $query = qq| SELECT accno AS inventory_accno, new_chart_id AS inventory_new_chart, date($transdate) - valid_from AS inventory_valid FROM chart WHERE id = $ref->{inventory_new_chart}|;
-      my $stw = $dbh->prepare($query);
-      $stw->execute || $form->dberror($query);
-      ($ref->{inventory_accno}, $ref->{inventory_new_chart}, $ref->{inventory_valid}) = $stw->fetchrow_array;
-      $stw->finish;
-    }
+      while ($ref->{inventory_new_chart} && ($ref->{inventory_valid} >= 0)) {
+        my $query =
+          qq|SELECT accno AS inventory_accno, | .
+          qq|  new_chart_id AS inventory_new_chart, | .
+          qq|  date($transdate) - valid_from AS inventory_valid | .
+          qq|FROM chart WHERE id = $ref->{inventory_new_chart}|;
+        ($ref->{inventory_accno}, $ref->{inventory_new_chart},
+         $ref->{inventory_valid}) = selectrow_query($form, $dbh, $query);
+      }
 
-    while ($ref->{income_new_chart} && ($ref->{income_valid} >=0)) {
-      my $query = qq| SELECT accno AS income_accno, new_chart_id AS income_new_chart, date($transdate) - valid_from AS income_valid FROM chart WHERE id = $ref->{income_new_chart}|;
-      my $stw = $dbh->prepare($query);
-      $stw->execute || $form->dberror($query);
-      ($ref->{income_accno}, $ref->{income_new_chart}, $ref->{income_valid}) = $stw->fetchrow_array;
-      $stw->finish;
-    }
+      while ($ref->{income_new_chart} && ($ref->{income_valid} >= 0)) {
+        my $query =
+          qq|SELECT accno AS income_accno, | .
+          qq|  new_chart_id AS income_new_chart, | .
+          qq|  date($transdate) - valid_from AS income_valid | .
+          qq|FROM chart WHERE id = $ref->{income_new_chart}|;
+        ($ref->{income_accno}, $ref->{income_new_chart},
+         $ref->{income_valid}) = selectrow_query($form, $dbh, $query);
+      }
 
-    while ($ref->{expense_new_chart} && ($ref->{expense_valid} >=0)) {
-      my $query = qq| SELECT accno AS expense_accno, new_chart_id AS expense_new_chart, date($transdate) - valid_from AS expense_valid FROM chart WHERE id = $ref->{expense_new_chart}|;
-      my $stw = $dbh->prepare($query);
-      $stw->execute || $form->dberror($query);
-      ($ref->{expense_accno}, $ref->{expense_new_chart}, $ref->{expense_valid}) = $stw->fetchrow_array;
-      $stw->finish;
-    }
+      while ($ref->{expense_new_chart} && ($ref->{expense_valid} >= 0)) {
+        my $query =
+          qq|SELECT accno AS expense_accno, | .
+          qq|  new_chart_id AS expense_new_chart, | .
+          qq|  date($transdate) - valid_from AS expense_valid | .
+          qq|FROM chart WHERE id = $ref->{expense_new_chart}|;
+        ($ref->{expense_accno}, $ref->{expense_new_chart},
+         $ref->{expense_valid}) = selectrow_query($form, $dbh, $query);
+      }
 
       # delete orderitems_id in collective orders, so that they get cloned no matter what
       delete $ref->{orderitems_id} if (@ids);
 
       # 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='$accno_id') AND startdate<=$transdate ORDER BY startdate desc LIMIT 1)
-	      ORDER BY c.accno|;
-      $stw = $dbh->prepare($query);
-      $stw->execute || $form->dberror($query);
+      $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+      $query =
+        qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber | .
+        qq|FROM tax t LEFT JOIN chart c on (c.id = t.chart_id) | .
+        qq|WHERE t.id IN (SELECT tk.tax_id FROM taxkeys tk | .
+        qq|               WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?) | .
+        qq|                 AND startdate <= $transdate ORDER BY startdate DESC LIMIT 1) | .
+        qq|ORDER BY c.accno|;
+      $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}/)) {
+        if (!($form->{taxaccounts} =~ /\Q$ptr->{accno}\E/)) {
           $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
           $form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
           $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
@@ -872,25 +848,10 @@ sub retrieve {
 
   }
 
-  $form->{exchangerate} =
-    $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},
-                            ($form->{vc} eq 'customer') ? "buy" : "sell");
+  $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate}, ($form->{vc} eq 'customer') ? "buy" : "sell");
 
   Common::webdav_folder($form) if ($main::webdav);
 
-  # get tax zones
-  $query = qq|SELECT id, description
-              FROM tax_zones|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{TAXZONE} }, $ref;
-  }
-  $sth->finish;
-
-
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
@@ -907,6 +868,7 @@ sub order_details {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query;
+  my @values = ();
   my $sth;
   my $nodiscount;
   my $yesdiscount;
@@ -923,6 +885,19 @@ sub order_details {
   my %oid = ('Pg'     => 'oid',
              'Oracle' => 'rowid');
 
+  my (@project_ids, %projectnumbers);
+
+  push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});
+
+  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+  my %price_factors;
+
+  foreach my $pfac (@{ $form->{ALL_PRICE_FACTORS} }) {
+    $price_factors{$pfac->{id}}  = $pfac;
+    $pfac->{factor}             *= 1;
+    $pfac->{formatted_factor}    = $form->format_amount($myconfig, $pfac->{factor});
+  }
+
   # sort items by partsgroup
   for $i (1 .. $form->{rowcount}) {
     $partsgroup = "";
@@ -930,8 +905,29 @@ sub order_details {
       $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 = prepare_execute_query($form, $dbh, $query, @project_ids);
+    while (my $ref = $sth->fetchrow_hashref()) {
+      $projectnumbers{$ref->{id}} = $ref->{projectnumber};
+    }
+    $sth->finish();
   }
 
+  $form->{"globalprojectnumber"} =
+    $projectnumbers{$form->{"globalproject_id"}};
+
+  my @arrays =
+    qw(runningnumber number description longdescription qty ship unit bin
+       partnotes serialnumber reqdate sellprice listprice netprice
+       discount p_discount discount_sub nodiscount_sub
+       linetotal  nodiscount_linetotal tax_rate projectnumber
+       price_factor price_factor_name);
+
   my $sameitem = "";
   foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
     $i = $item->[0];
@@ -940,10 +936,7 @@ sub order_details {
       push(@{ $form->{description} }, qq|$item->[1]|);
       $sameitem = $item->[1];
 
-      map { push(@{ $form->{$_} }, "") }
-        qw(runningnumber number qty ship unit bin partnotes
-           serialnumber reqdate sellprice listprice netprice
-           discount p_discount linetotal);
+      map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
     }
 
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
@@ -966,95 +959,75 @@ sub order_details {
         $position++;
       }
 
-      push(@{ $form->{runningnumber} }, $i);
-      push(@{ $form->{number} },        qq|$form->{"partnumber_$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->{ship} },
-           $form->format_amount($myconfig, $form->{"ship_$i"}));
-      push(@{ $form->{unit} },         qq|$form->{"unit_$i"}|);
-      push(@{ $form->{bin} },          qq|$form->{"bin_$i"}|);
-      push(@{ $form->{"partnotes"} },  qq|$form->{"partnotes_$i"}|);
-      push(@{ $form->{serialnumber} }, qq|$form->{"serialnumber_$i"}|);
-      push(@{ $form->{reqdate} },      qq|$form->{"reqdate_$i"}|);
-
-      push(@{ $form->{sellprice} }, $form->{"sellprice_$i"});
-
-      push(@{ $form->{listprice} }, $form->{"listprice_$i"});
-
-      my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
-      my ($dec) = ($sellprice =~ /\.(\d+)/);
-      $dec = length $dec;
-      my $decimalplaces = ($dec > 2) ? $dec : 2;
-
-      my $i_discount =
-        $form->round_amount(
-                            $sellprice * $form->parse_amount($myconfig,
-                                                 $form->{"discount_$i"}) / 100,
-                            $decimalplaces);
-
-      my $discount =
-        $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
-
-      # keep a netprice as well, (sellprice - discount)
-      #$form->{"netprice_$i"} = $sellprice - $discount;
-      $form->{"netprice_$i"} = $sellprice - $i_discount;
-      my $nodiscount_linetotal =
-        $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
-      my $linetotal =
-        $form->round_amount($form->{"qty_$i"} * $form->{"netprice_$i"}, 2);
-
-      push(@{ $form->{netprice} },
-           ($form->{"netprice_$i"} != 0)
-           ? $form->format_amount(
-                                 $myconfig, $form->{"netprice_$i"},
-                                 $decimalplaces
-             )
-           : " ");
-
-      $discount =
-        ($discount != 0)
-        ? $form->format_amount($myconfig, $discount * -1, $decimalplaces)
-        : " ";
-      $linetotal = ($linetotal != 0) ? $linetotal : " ";
-
-      push(@{ $form->{discount} },   $discount);
-      push(@{ $form->{p_discount} }, $form->{"discount_$i"});
-
-      $form->{ordtotal} += $linetotal;
-     $discount_subtotal += $linetotal;
+      my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 };
+
+      push @{ $form->{runningnumber} },     $position;
+      push @{ $form->{number} },            $form->{"partnumber_$i"};
+      push @{ $form->{description} },       $form->{"description_$i"};
+      push @{ $form->{longdescription} },   $form->{"longdescription_$i"};
+      push @{ $form->{qty} },               $form->format_amount($myconfig, $form->{"qty_$i"});
+      push @{ $form->{ship} },              $form->format_amount($myconfig, $form->{"ship_$i"});
+      push @{ $form->{unit} },              $form->{"unit_$i"};
+      push @{ $form->{bin} },               $form->{"bin_$i"};
+      push @{ $form->{partnotes} },         $form->{"partnotes_$i"};
+      push @{ $form->{serialnumber} },      $form->{"serialnumber_$i"};
+      push @{ $form->{reqdate} },           $form->{"reqdate_$i"};
+      push @{ $form->{sellprice} },         $form->{"sellprice_$i"};
+      push @{ $form->{listprice} },         $form->{"listprice_$i"};
+      push @{ $form->{price_factor} },      $price_factor->{formatted_factor};
+      push @{ $form->{price_factor_name} }, $price_factor->{description};
+
+      my $sellprice     = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+      my ($dec)         = ($sellprice =~ /\.(\d+)/);
+      my $decimalplaces = max 2, length($dec);
+
+      my $discount             = $form->round_amount($form->{"qty_$i"} * $sellprice * $form->{"discount_$i"} / 100 / $price_factor->{factor}, $decimalplaces);
+      my $linetotal            = $form->round_amount($form->{"qty_$i"} * $sellprice * (100 - $form->{"discount_$i"}) / 100 / $price_factor->{factor}, 2);
+      my $nodiscount_linetotal = $form->round_amount($form->{"qty_$i"} * $sellprice / $price_factor->{factor}, 2);
+      $form->{"netprice_$i"}   = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, 2);
+
+      push @{ $form->{netprice} }, ($form->{"netprice_$i"} != 0) ? $form->format_amount($myconfig, $form->{"netprice_$i"}, $decimalplaces) : '';
+
+      $linetotal = ($linetotal != 0) ? $linetotal : '';
+
+      push @{ $form->{discount} },  ($discount  != 0) ? $form->format_amount($myconfig, $discount * -1, $decimalplaces) : '';
+      push @{ $form->{p_discount} }, $form->{"discount_$i"};
+
+      $form->{ordtotal}         += $linetotal;
       $form->{nodiscount_total} += $nodiscount_linetotal;
-      $nodiscount_subtotal += $nodiscount_linetotal;
-      $form->{discount_total} += $form->parse_amount($myconfig, $discount);
+      $form->{discount_total}   += $discount;
+
+      if ($subtotal_header) {
+        $discount_subtotal   += $linetotal;
+        $nodiscount_subtotal += $nodiscount_linetotal;
+      }
 
       if ($form->{"subtotal_$i"} && $subtotal_header && ($subtotal_header != $i)) {
-        $discount_subtotal = $form->format_amount($myconfig, $discount_subtotal, 2);
-        push(@{ $form->{discount_sub} },  $discount_subtotal);
-        $nodiscount_subtotal = $form->format_amount($myconfig, $nodiscount_subtotal, 2);
-        push(@{ $form->{nodiscount_sub} }, $nodiscount_subtotal);
-        $discount_subtotal = 0;
+        push @{ $form->{discount_sub} },   $form->format_amount($myconfig, $discount_subtotal,   2);
+        push @{ $form->{nodiscount_sub} }, $form->format_amount($myconfig, $nodiscount_subtotal, 2);
+
+        $discount_subtotal   = 0;
         $nodiscount_subtotal = 0;
-        $subtotal_header = 0;
+        $subtotal_header     = 0;
+
       } else {
-        push(@{ $form->{discount_sub} }, "");
-        push(@{ $form->{nodiscount_sub} }, "");
+        push @{ $form->{discount_sub} },   "";
+        push @{ $form->{nodiscount_sub} }, "";
       }
 
-      if ($linetotal == $netto_linetotal) {
+      if (!$form->{"discount_$i"}) {
         $nodiscount += $linetotal;
       }
-      push(@{ $form->{linetotal} },
-           $form->format_amount($myconfig, $linetotal, 2));
-      push(@{ $form->{nodiscount_linetotal} },
-           $form->format_amount($myconfig, $nodiscount_linetotal, 2));
+
+      push @{ $form->{linetotal} }, $form->format_amount($myconfig, $linetotal, 2);
+      push @{ $form->{nodiscount_linetotal} }, $form->format_amount($myconfig, $nodiscount_linetotal, 2);
+
+      push(@{ $form->{projectnumber} }, $projectnumbers{$form->{"project_id_$i"}});
 
       my ($taxamount, $taxbase);
       my $taxrate = 0;
 
-      map { $taxrate += $form->{"${_}_rate"} } split / /,
-        $form->{"taxaccounts_$i"};
+      map { $taxrate += $form->{"${_}_rate"} } split(/ /, $form->{"taxaccounts_$i"});
 
       if ($form->{taxincluded}) {
 
@@ -1089,23 +1062,21 @@ sub order_details {
           $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|;
+        $query = qq|SELECT p.partnumber, p.description, p.unit, a.qty, | .
+	               qq|pg.partsgroup | .
+	               qq|FROM assembly a | .
+		             qq|  JOIN parts p ON (a.parts_id = p.id) | .
+		             qq|    LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) | .
+		             qq|    WHERE a.bom = '1' | .
+		             qq|    AND a.id = ? | . $sortorder;
+		    @values = ($form->{"id_$i"});
         $sth = $dbh->prepare($query);
-        $sth->execute || $form->dberror($query);
+        $sth->execute(@values) || $form->dberror($query);
 
         while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
           if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
-            map { push(@{ $form->{$_} }, "") }
-              qw(runningnumber ship bin serialnumber number unit bin qty 
-                 reqdate sellprice listprice netprice discount p_discount
-                 linetotal nodiscount_linetotal);
+            map({ push(@{ $form->{$_} }, "") }
+                grep({ $_ ne "description" } @arrays));
             $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
             push(@{ $form->{description} }, $sameitem);
           }
@@ -1115,11 +1086,8 @@ sub order_details {
                  )
                  . qq|, $ref->{partnumber}, $ref->{description}|);
 
-          map { push(@{ $form->{$_} }, "") }
-            qw(number unit qty runningnumber ship bin serialnumber reqdate 
-               sellprice listprice netprice discount p_discount linetotal 
-               nodiscount_linetotal);
-
+          map({ push(@{ $form->{$_} }, "") }
+              grep({ $_ ne "description" } @arrays));
         }
         $sth->finish;
       }
@@ -1129,31 +1097,33 @@ sub order_details {
 
   my $tax = 0;
   foreach $item (sort keys %taxaccounts) {
-      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, 2));
-      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"});
   }
-  $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
-  $yesdiscount = $form->{nodiscount_total} - $nodiscount;
+
   $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
-  $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
-  $form->{nodiscount} = $form->format_amount($myconfig, $nodiscount, 2);
-  $form->{yesdiscount} = $form->format_amount($myconfig, $yesdiscount, 2);
+  $form->{discount_total}      = $form->format_amount($myconfig, $form->{discount_total}, 2);
+  $form->{nodiscount}          = $form->format_amount($myconfig, $nodiscount, 2);
+  $form->{yesdiscount}         = $form->format_amount($myconfig, $form->{nodiscount_total} - $nodiscount, 2);
+
+  if($form->{taxincluded}) {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal} - $tax, 2);
+  } else {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
+  }
 
-  $form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
-  $form->{ordtotal} =
-    ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;
+  $form->{ordtotal} = ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;
 
   # format amounts
-  $form->{quototal} = $form->{ordtotal} =
-    $form->format_amount($myconfig, $form->{ordtotal}, 2);
+  $form->{quototal} = $form->{ordtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
 
   if ($form->{type} =~ /_quotation/) {
     $form->set_payment_options($myconfig, $form->{quodate});
@@ -1161,9 +1131,6 @@ sub order_details {
     $form->set_payment_options($myconfig, $form->{orddate});
   }
 
-  # myconfig variables
-  map { $form->{$_} = $myconfig->{$_} }
-    (qw(company address tel fax signature businessnumber));
   $form->{username} = $myconfig->{name};
 
   $dbh->disconnect;
@@ -1176,19 +1143,12 @@ sub project_description {
 
   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 ($value) = selectrow_query($form, $dbh, $query, $id);
 
   $main::lxdebug->leave_sub();
 
-  return $_;
+  return $value;
 }
 
 sub adj_onhand {
@@ -1196,27 +1156,27 @@ sub adj_onhand {
 
   my ($dbh, $form, $ml) = @_;
 
-  my $service_units = $form->{service_units};
-  my $part_units = $form->{part_units};
+  my $all_units = $form->{all_units};
 
-  my $query = qq|SELECT oi.parts_id, oi.ship, oi.unit, p.inventory_accno_id, p.assembly
-                 FROM orderitems oi
-		 JOIN parts p ON (p.id = oi.parts_id)
-                 WHERE oi.trans_id = $form->{id}|;
+  my $query =
+    qq|SELECT oi.parts_id, oi.ship, oi.unit, p.inventory_accno_id, p.assembly | .
+    qq|   FROM orderitems oi | .
+    qq|   JOIN parts p ON (p.id = oi.parts_id) | .
+    qq|   WHERE oi.trans_id = ?|;
+  my @values = ($form->{id});
   my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  $sth->execute(@values) || $form->dberror($query);
 
-  $query = qq|SELECT sum(p.inventory_accno_id)
-	      FROM parts p
-	      JOIN assembly a ON (a.parts_id = p.id)
-	      WHERE a.id = ?|;
+  $query =
+    qq|SELECT sum(p.inventory_accno_id) | .
+    qq|FROM parts p | .
+    qq|JOIN assembly a ON (a.parts_id = p.id) | .
+    qq|WHERE a.id = ?|;
   my $ath = $dbh->prepare($query) || $form->dberror($query);
 
   my $ispa;
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-  #print(STDERR "Bin in Schleife $ref->{inventory_accno_id}\n");
-
     if ($ref->{inventory_accno_id} || $ref->{assembly}) {
 
       # do not update if assembly consists of all services
@@ -1231,31 +1191,16 @@ sub adj_onhand {
       }
 
       # get item baseunit
-      $query = qq|SELECT p.unit
-                  FROM parts p
-                  WHERE p.id = $ref->{parts_id}|;
-      my $stw = $dbh->prepare($query);
-      $stw->execute || $form->dberror($query);
-
-      my ($item_unit) = $stw->fetchrow_array();
-      $stw->finish;
-
-      if ($ref->{inventory_accno_id}) {        
-        if (defined($part_units->{$item_unit}->{factor}) && $part_units->{$item_unit}->{factor} ne '' && $part_units->{$item_unit}->{factor} ne '0') {
-          $basefactor = $part_units->{$ref->{unit}}->{factor} / $part_units->{$item_unit}->{factor};
-        } else {
-          $basefactor = 1;
-        }
-        $baseqty = $ref->{ship} * $basefactor;
-      } else {
-        if (defined($service_units->{$item_unit}->{factor}) && $service_units->{$item_unit}->{factor} ne '' && $service_units->{$item_unit}->{factor} ne '0') {
-          $basefactor = $service_units->{$ref->{unit}}->{factor} / $part_units->{$item_unit}->{factor};
-        } else {
-          $basefactor = 1;
-        }
-        $baseqty = $ref->{ship} * $basefactor;
-      }  
-      #print(STDERR "$baseqty Basismenge\n");
+      $query = qq|SELECT unit FROM parts WHERE id = ?|;
+      my ($item_unit) = selectrow_query($form, $dbh, $query, $ref->{parts_id});
+
+      my $basefactor = 1;
+      if (defined($all_units->{$item_unit}->{factor}) &&
+          (($all_units->{$item_unit}->{factor} * 1) != 0)) {
+        $basefactor = $all_units->{$ref->{unit}}->{factor} /
+          $all_units->{$item_unit}->{factor};
+      }
+      my $baseqty = $ref->{ship} * $basefactor;
 
       # adjust onhand in parts table
       $form->update_balance($dbh, "parts", "onhand",
@@ -1270,4 +1215,3 @@ sub adj_onhand {
 }
 
 1;
-