List::MoreUtils für kompakteren Code benutzen.

[kivitendo-erp.git] / SL / IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index a2703b64f656fc8e93e6326afbb6eba81f41eae1..5314d4b8e694ca4333e53a27c5b31e9f537745d0 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -33,7 +33,11 @@
 #======================================================================
 
 package IC;
 #======================================================================
 
 package IC;

+

 use Data::Dumper;
 use Data::Dumper;

+use List::MoreUtils qw(all);
+use YAML;
+

 use SL::DBUtils;
 
 sub get_part {
 use SL::DBUtils;
 
 sub get_part {


@@ -44,26 +48,26 @@ sub get_part {
   # connect to db
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to db
   my $dbh = $form->dbconnect($myconfig);
 

-  my $query = qq|SELECT p.*,
-                 c1.accno AS inventory_accno,
-                c2.accno AS income_accno,
-                c3.accno AS expense_accno,
-                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 (p.partsgroup_id = pg.id)
-                 WHERE p.id = ? |;
-  my @vars = ($form->{id});
-  my $sth = $dbh->prepare($query);
-  $sth->execute(@vars) || $form->dberror("$query (" . join(', ', @vars) . ")");
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $sth;
+
+  my $query =
+    qq|SELECT p.*,
+         c1.accno AS inventory_accno,
+         c2.accno AS income_accno,
+         c3.accno AS expense_accno,
+         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 (p.partsgroup_id = pg.id)
+       WHERE p.id = ? |;
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));

 
   # copy to $form variables
   map { $form->{$_} = $ref->{$_} } (keys %{$ref});
 
 
   # copy to $form variables
   map { $form->{$_} = $ref->{$_} } (keys %{$ref});
 

-  $sth->finish;
+  $form->{onhand} *= 1;

 
   my %oid = ('Pg'     => 'a.oid',
              'Oracle' => 'a.rowid');
 
   my %oid = ('Pg'     => 'a.oid',
              'Oracle' => 'a.rowid');


@@ -74,18 +78,18 @@ sub get_part {
     $form->{item} = 'assembly';
 
     # retrieve assembly items
     $form->{item} = 'assembly';
 
     # retrieve assembly items

-    $query = qq|SELECT p.id, p.partnumber, p.description,
-                p.sellprice, p.weight, a.qty, a.bom, p.unit,
-               pg.partsgroup
-                FROM parts p
-               JOIN assembly a ON (a.parts_id = p.id)
-               LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-               WHERE a.id = ?
-               ORDER BY ?|;
-    @vars = ($form->{id}, $oid{$myconfig->{dbdriver}});
-    $sth = $dbh->prepare($query);
-    $sth->execute(@vars) || $form->dberror("$query (" . join(', ', @vars) . ")");
-    
+    $query =
+      qq|SELECT p.id, p.partnumber, p.description,
+           p.sellprice, p.lastcost, p.weight, a.qty, a.bom, p.unit,
+           pg.partsgroup, p.price_factor_id, pfac.factor AS price_factor
+         FROM parts p
+         JOIN assembly a ON (a.parts_id = p.id)
+         LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+         LEFT JOIN price_factors pfac ON pfac.id = p.price_factor_id
+         WHERE (a.id = ?)
+         ORDER BY $oid{$myconfig->{dbdriver}}|;
+    $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
+

     $form->{assembly_rows} = 0;
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       $form->{assembly_rows}++;
     $form->{assembly_rows} = 0;
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       $form->{assembly_rows}++;


@@ -104,29 +108,27 @@ sub get_part {
   $form->{amount}{IC_expense} = $form->{expense_accno};
   $form->{amount}{IC_cogs}    = $form->{expense_accno};
 
   $form->{amount}{IC_expense} = $form->{expense_accno};
   $form->{amount}{IC_cogs}    = $form->{expense_accno};
 

+  my @pricegroups          = ();
+  my @pricegroups_not_used = ();
+

   # get prices
   $query =
   # get prices
   $query =

-    qq|SELECT p.parts_id, p.pricegroup_id, p.price, (SELECT pg.pricegroup FROM pricegroup pg WHERE pg.id=p.pricegroup_id) AS pricegroup FROM prices p
-              WHERE parts_id = ? 
-              ORDER by pricegroup|;
-
-  @vars = ($form->{id});
-  $sth = $dbh->prepare($query);
-  $sth->execute(@vars) || $form->dberror("$query (" . join(', ', @vars) . ")");
-
-  @pricegroups          = ();
-  @pricegroups_not_used = ();
+    qq|SELECT p.parts_id, p.pricegroup_id, p.price,
+         (SELECT pg.pricegroup
+          FROM pricegroup pg
+          WHERE pg.id = p.pricegroup_id) AS pricegroup
+       FROM prices p
+       WHERE (parts_id = ?)
+       ORDER BY pricegroup|;
+  $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));

 
   #for pricegroups
   my $i = 1;
 
   #for pricegroups
   my $i = 1;

-  while (
-         ($form->{"klass_$i"}, $form->{"pricegroup_id_$i"},
+  while (($form->{"klass_$i"}, $form->{"pricegroup_id_$i"},

           $form->{"price_$i"}, $form->{"pricegroup_$i"})
           $form->{"price_$i"}, $form->{"pricegroup_$i"})

-         = $sth->fetchrow_array
-    ) {
+         = $sth->fetchrow_array()) {

     $form->{"price_$i"} = $form->round_amount($form->{"price_$i"}, 5);
     $form->{"price_$i"} = $form->round_amount($form->{"price_$i"}, 5);

-    $form->{"price_$i"} =
-      $form->format_amount($myconfig, $form->{"price_$i"}, 5);
+    $form->{"price_$i"} = $form->format_amount($myconfig, $form->{"price_$i"}, -2);

     push @pricegroups, $form->{"pricegroup_id_$i"};
     $i++;
   }
     push @pricegroups, $form->{"pricegroup_id_$i"};
     $i++;
   }


@@ -134,28 +136,19 @@ sub get_part {
   $sth->finish;
 
   # get pricegroups
   $sth->finish;
 
   # get pricegroups

-  $query = qq|SELECT p.id, p.pricegroup FROM pricegroup p|;
-
-  $pkq = $dbh->prepare($query);
-  $pkq->execute || $form->dberror($query);
-  while ($pkr = $pkq->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{PRICEGROUPS} }, $pkr;
-  }
-  $pkq->finish;
+  $query = qq|SELECT id, pricegroup FROM pricegroup|;
+  $form->{PRICEGROUPS} = selectall_hashref_query($form, $dbh, $query);

 
   #find not used pricegroups
 
   #find not used pricegroups

-  while ($tmp = pop @{ $form->{PRICEGROUPS} }) {
-    my $insert = 0;
-    foreach $item (@pricegroups) {
+  while ($tmp = pop(@{ $form->{PRICEGROUPS} })) {
+    my $in_use = 0;
+    foreach my $item (@pricegroups) {

       if ($item eq $tmp->{id}) {
       if ($item eq $tmp->{id}) {

-
-        #drop
-        $insert = 1;
+        $in_use = 1;
+        last;

       }
     }
       }
     }

-    if ($insert == 0) {
-      push @pricegroups_not_used, $tmp;
-    }
+    push(@pricegroups_not_used, $tmp) unless ($in_use);

   }
 
   # if not used pricegroups are avaible
   }
 
   # if not used pricegroups are avaible


@@ -164,8 +157,7 @@ sub get_part {
     foreach $name (@pricegroups_not_used) {
       $form->{"klass_$i"} = "$name->{id}";
       $form->{"price_$i"} = $form->round_amount($form->{sellprice}, 5);
     foreach $name (@pricegroups_not_used) {
       $form->{"klass_$i"} = "$name->{id}";
       $form->{"price_$i"} = $form->round_amount($form->{sellprice}, 5);

-      $form->{"price_$i"} =
-        $form->format_amount($myconfig, $form->{"price_$i"}, 5);
+      $form->{"price_$i"} = $form->format_amount($myconfig, $form->{"price_$i"}, -2);

       $form->{"pricegroup_id_$i"} = "$name->{id}";
       $form->{"pricegroup_$i"}    = "$name->{pricegroup}";
       $i++;
       $form->{"pricegroup_id_$i"} = "$name->{id}";
       $form->{"pricegroup_$i"}    = "$name->{pricegroup}";
       $i++;


@@ -179,11 +171,11 @@ sub get_part {
 
     # get makes
     if ($form->{makemodel}) {
 
     # get makes
     if ($form->{makemodel}) {

-      $query = qq|SELECT m.make, m.model FROM makemodel m
-                  WHERE m.parts_id = ?|;
-      @vars = ($form->{id});
+      $query = qq|SELECT m.make, m.model FROM makemodel m | .
+               qq|WHERE m.parts_id = ?|;
+      @values = ($form->{id});

       $sth = $dbh->prepare($query);
       $sth = $dbh->prepare($query);

-      $sth->execute(@vars) || $form->dberror("$query (" . join(', ', @vars) . ")");
+      $sth->execute(@values) || $form->dberror("$query (" . join(', ', @values) . ")");

 
       my $i = 1;
       while (($form->{"make_$i"}, $form->{"model_$i"}) = $sth->fetchrow_array)
 
       my $i = 1;
       while (($form->{"make_$i"}, $form->{"model_$i"}) = $sth->fetchrow_array)


@@ -198,24 +190,21 @@ sub get_part {
 
   # get translations
   $form->{language_values} = "";
 
   # get translations
   $form->{language_values} = "";

-  $query = qq|SELECT language_id, translation FROM translation WHERE parts_id = ?|;
-  @vars = ($form->{id});
-  $trq = $dbh->prepare($query);
-  $trq->execute(@vars) || $form->dberror("$query (" . join(', ', @vars) . ")");
-  while ($tr = $trq->fetchrow_hashref(NAME_lc)) {
-    $form->{language_values} .= "---+++---".$tr->{language_id}."--++--".$tr->{translation};
+  $query = qq|SELECT language_id, translation, longdescription
+              FROM translation
+              WHERE parts_id = ?|;
+  my $trq = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
+  while (my $tr = $trq->fetchrow_hashref(NAME_lc)) {
+    $form->{language_values} .= "---+++---" . join('--++--', @{$tr}{qw(language_id translation longdescription)});

   }
   $trq->finish;
 
   # now get accno for taxes
   }
   $trq->finish;
 
   # now get accno for taxes

-  $query = qq|SELECT c.accno
-              FROM chart c, partstax pt
-             WHERE pt.chart_id = c.id
-             AND pt.parts_id = $form->{id}|;
-
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
+  $query =
+    qq|SELECT c.accno
+       FROM chart c, partstax pt
+       WHERE (pt.chart_id = c.id) AND (pt.parts_id = ?)|;
+  $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));

   while (($key) = $sth->fetchrow_array) {
     $form->{amount}{$key} = $key;
   }
   while (($key) = $sth->fetchrow_array) {
     $form->{amount}{$key} = $key;
   }


@@ -223,36 +212,25 @@ sub get_part {
   $sth->finish;
 
   # is it an orphan
   $sth->finish;
 
   # is it an orphan

-  $query = qq|SELECT i.parts_id
-              FROM invoice i
-             WHERE i.parts_id = $form->{id}
-           UNION
-             SELECT o.parts_id
-             FROM orderitems o
-             WHERE o.parts_id = $form->{id}
-           UNION
-             SELECT a.parts_id
-             FROM assembly a
-             WHERE a.parts_id = $form->{id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($form->{orphaned}) = $sth->fetchrow_array;
-  $form->{orphaned} = !$form->{orphaned};
-  $sth->finish;
+  my @referencing_tables = qw(invoice orderitems inventory rmaitems);
+  my %column_map         = ( );
+  my $parts_id           = conv_i($form->{id});

 
 

-  $form->{"unit_changeable"} = 1;
-  foreach my $table (qw(invoice assembly orderitems inventory license)) {
-    $query = "SELECT COUNT(*) FROM $table WHERE parts_id = ?";
-    my ($count) = $dbh->selectrow_array($query, undef, $form->{"id"});
-    $form->dberror($query . " (" . $form->{"id"} . ")") if ($dbh->err);
+  $form->{orphaned}      = 1;

 
 

-    if ($count) {
-      $form->{"unit_changeable"} = 0;
+  foreach my $table (@referencing_tables) {
+    my $column  = $column_map{$table} || 'parts_id';
+    $query      = qq|SELECT $column FROM $table WHERE $column = ? LIMIT 1|;
+    my ($found) = selectrow_query($form, $dbh, $query, $parts_id);
+
+    if ($found) {
+      $form->{orphaned} = 0;

       last;
     }
   }
 
       last;
     }
   }
 

+  $form->{"unit_changeable"} = $form->{orphaned};
+

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


@@ -262,37 +240,20 @@ sub get_pricegroups {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;

-  my $dbh                  = $form->dbconnect($myconfig);
-  my $i                    = 1;
-  my @pricegroups_not_used = ();
-
-  # get pricegroups
-  my $query = qq|SELECT p.id, p.pricegroup FROM pricegroup p|;

 
 

-  my $pkq = $dbh->prepare($query);
-  $pkq->execute || $form->dberror($query);
-  while ($pkr = $pkq->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{PRICEGROUPS} }, $pkr;
-  }
-  $pkq->finish;
-
-  #find not used pricegroups
-  while ($tmp = pop @{ $form->{PRICEGROUPS} }) {
-    push @pricegroups_not_used, $tmp;
-  }
+  my $dbh = $form->dbconnect($myconfig);

 
 

-  # if not used pricegroups are avaible
-  if (@pricegroups_not_used) {
+  # get pricegroups
+  my $query = qq|SELECT id, pricegroup FROM pricegroup|;
+  my $pricegroups = selectall_hashref_query($form, $dbh, $query);

 
 

-    foreach $name (@pricegroups_not_used) {
-      $form->{"klass_$i"} = "$name->{id}";
-      $form->{"price_$i"} = $form->round_amount($form->{sellprice}, 5);
-      $form->{"price_$i"} =
-        $form->format_amount($myconfig, $form->{"price_$i"}, 5);
-      $form->{"pricegroup_id_$i"} = "$name->{id}";
-      $form->{"pricegroup_$i"}    = "$name->{pricegroup}";
-      $i++;
-    }
+  my $i = 1;
+  foreach $pg (@{ $pricegroups }) {
+    $form->{"klass_$i"} = "$pg->{id}";
+    $form->{"price_$i"} = $form->format_amount($myconfig, $form->{"price_$i"}, -2);
+    $form->{"pricegroup_id_$i"} = "$pg->{id}";
+    $form->{"pricegroup_$i"}    = "$pg->{pricegroup}";
+    $i++;

   }
 
   #correct rows
   }
 
   #correct rows


@@ -301,6 +262,8 @@ sub get_pricegroups {
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();

+
+  return $pricegroups;

 }
 
 sub retrieve_buchungsgruppen {
 }
 
 sub retrieve_buchungsgruppen {


@@ -313,17 +276,8 @@ sub retrieve_buchungsgruppen {
   my $dbh = $form->dbconnect($myconfig);
 
   # get buchungsgruppen
   my $dbh = $form->dbconnect($myconfig);
 
   # get buchungsgruppen

-  $query = qq|SELECT id, description
-              FROM buchungsgruppen
-              ORDER BY sortkey|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $form->{BUCHUNGSGRUPPEN} = [];
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push(@{ $form->{BUCHUNGSGRUPPEN} }, $ref);
-  }
-  $sth->finish;
+  $query = qq|SELECT id, description FROM buchungsgruppen ORDER BY sortkey|;
+  $form->{BUCHUNGSGRUPPEN} = selectall_hashref_query($form, $dbh, $query);

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


@@ -332,7 +286,7 @@ sub save {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;

-
+  my @values;

   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 


@@ -345,114 +299,64 @@ sub save {
   # if there is a $form->{id} then replace the old entry
   # delete all makemodel entries and add the new ones
 
   # if there is a $form->{id} then replace the old entry
   # delete all makemodel entries and add the new ones
 

-  # escape '
-  map { $form->{$_} =~ s/\'/\'\'/g } qw(partnumber description notes unit);
-

   # undo amount formatting
   map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }
   # undo amount formatting
   map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }

-    qw(rop weight listprice sellprice gv lastcost stock);
-
-  # set date to NULL if nothing entered
-  $form->{priceupdate} =
-    ($form->{priceupdate}) ? qq|'$form->{priceupdate}'| : "NULL";
+    qw(rop weight listprice sellprice gv lastcost);

 
 

-  $form->{makemodel} = (($form->{make_1}) || ($form->{model_1})) ? 1 : 0;
+  my $makemodel = (($form->{make_1}) || ($form->{model_1})) ? 1 : 0;

 
 

-  $form->{alternate} = 0;

   $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0;
   $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0;

-  $form->{obsolete} *= 1;
-  $form->{shop}     *= 1;
-  $form->{onhand}   *= 1;
-  $form->{ve}       *= 1;
-  $form->{ge}       *= 1;
-  $form->{buchungsgruppen_id}       *= 1;
-  $form->{not_discountable}       *= 1;
-  $form->{payment_id}       *= 1;

 
   my ($query, $sth);
 
 
   my ($query, $sth);
 

+  my $priceupdate = ', priceupdate = current_date';
+

   if ($form->{id}) {
 
     # get old price
   if ($form->{id}) {
 
     # get old price

-    $query = qq|SELECT p.sellprice, p.weight
-                FROM parts p
-               WHERE p.id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    my ($sellprice, $weight) = $sth->fetchrow_array;
-    $sth->finish;
+    $query = qq|SELECT sellprice, weight FROM parts WHERE id = ?|;
+    my ($sellprice, $weight) = selectrow_query($form, $dbh, $query, conv_i($form->{id}));

 
     # if item is part of an assembly adjust all assemblies
 
     # if item is part of an assembly adjust all assemblies

-    $query = qq|SELECT a.id, a.qty
-                FROM assembly a
-               WHERE a.parts_id = $form->{id}|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+    $query = qq|SELECT id, qty FROM assembly WHERE parts_id = ?|;
+    $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));

     while (my ($id, $qty) = $sth->fetchrow_array) {
       &update_assembly($dbh, $form, $id, $qty, $sellprice * 1, $weight * 1);
     }
     $sth->finish;
 
     if ($form->{item} ne 'service') {
     while (my ($id, $qty) = $sth->fetchrow_array) {
       &update_assembly($dbh, $form, $id, $qty, $sellprice * 1, $weight * 1);
     }
     $sth->finish;
 
     if ($form->{item} ne 'service') {

-

       # delete makemodel records
       # delete makemodel records

-      $query = qq|DELETE FROM makemodel
-                 WHERE parts_id = $form->{id}|;
-      $dbh->do($query) || $form->dberror($query);
+      do_query($form, $dbh, qq|DELETE FROM makemodel WHERE parts_id = ?|, conv_i($form->{id}));

     }
 
     if ($form->{item} eq 'assembly') {
     }
 
     if ($form->{item} eq 'assembly') {

-      if ($form->{onhand} != 0) {
-        &adjust_inventory($dbh, $form, $form->{id}, $form->{onhand} * -1);
-      }
-

       # delete assembly records
       # delete assembly records

-      $query = qq|DELETE FROM assembly
-                 WHERE id = $form->{id}|;
-      $dbh->do($query) || $form->dberror($query);
-
-      $form->{onhand} += $form->{stock};
+      do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));

     }
 
     # delete tax records
     }
 
     # delete tax records

-    $query = qq|DELETE FROM partstax
-               WHERE parts_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
+    do_query($form, $dbh, qq|DELETE FROM partstax WHERE parts_id = ?|, conv_i($form->{id}));

 
     # delete translations
 
     # delete translations

-    $query = qq|DELETE FROM translation
-               WHERE parts_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
+    do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));

 
 

-  } else {
-    my $uid = rand() . time;
-    $uid .= $form->{login};
-
-    $query = qq|SELECT p.id FROM parts p
-                WHERE p.partnumber = '$form->{partnumber}'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
+    # Check whether or not the prices have changed. If they haven't
+    # then 'priceupdate' should not be updated.
+    my $previous_values = selectfirst_hashref_query($form, $dbh, qq|SELECT * FROM parts WHERE id = ?|, conv_i($form->{id})) || {};
+    $priceupdate        = '' if (all { $previous_values->{$_} == $form->{$_} } qw(sellprice lastcost listprice));

 
 

-    if ($form->{id} ne "") {
+  } else {
+    my ($count) = selectrow_query($form, $dbh, qq|SELECT COUNT(*) FROM parts WHERE partnumber = ?|, $form->{partnumber});
+    if ($count) {

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

-    $query = qq|INSERT INTO parts (partnumber, description)
-                VALUES ('$uid', 'dummy')|;
-    $dbh->do($query) || $form->dberror($query);

 
 

-    $query = qq|SELECT p.id FROM parts p
-                WHERE p.partnumber = '$uid'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{id}) = $sth->fetchrow_array;
-    $sth->finish;
+    ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|);
+    do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber) VALUES (?, '')|, $form->{id});

 
     $form->{orphaned} = 1;
 
     $form->{orphaned} = 1;

-    $form->{onhand} = $form->{stock} if $form->{item} eq 'assembly';

     if ($form->{partnumber} eq "" && $form->{"item"} eq "service") {
       $form->{partnumber} = $form->update_defaults($myconfig, "servicenumber");
     }
     if ($form->{partnumber} eq "" && $form->{"item"} eq "service") {
       $form->{partnumber} = $form->update_defaults($myconfig, "servicenumber");
     }


@@ -464,87 +368,111 @@ sub save {
   my $partsgroup_id = 0;
 
   if ($form->{partsgroup}) {
   my $partsgroup_id = 0;
 
   if ($form->{partsgroup}) {

-    ($partsgroup, $partsgroup_id) = split /--/, $form->{partsgroup};
+    ($partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup});

   }
 
   my ($subq_inventory, $subq_expense, $subq_income);
   if ($form->{"item"} eq "part") {
     $subq_inventory =
   }
 
   my ($subq_inventory, $subq_expense, $subq_income);
   if ($form->{"item"} eq "part") {
     $subq_inventory =

-      qq|(SELECT bg.inventory_accno_id | .
-      qq| FROM buchungsgruppen bg | .
-      qq| WHERE bg.id = | . $dbh->quote($form->{"buchungsgruppen_id"}) . qq|)|;
+      qq|(SELECT bg.inventory_accno_id
+          FROM buchungsgruppen bg
+          WHERE bg.id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq|)|;

   } else {
     $subq_inventory = "NULL";
   }
 
   if ($form->{"item"} ne "assembly") {
     $subq_expense =
   } else {
     $subq_inventory = "NULL";
   }
 
   if ($form->{"item"} ne "assembly") {
     $subq_expense =

-      qq|(SELECT bg.expense_accno_id_0 | .
-      qq| FROM buchungsgruppen bg | .
-      qq| WHERE bg.id = | . $dbh->quote($form->{"buchungsgruppen_id"}) . qq|)|;
+      qq|(SELECT bg.expense_accno_id_0
+          FROM buchungsgruppen bg
+          WHERE bg.id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq|)|;

   } else {
     $subq_expense = "NULL";
   }
 
   } else {
     $subq_expense = "NULL";
   }
 

-  $subq_income =
-    qq|(SELECT bg.income_accno_id_0 | .
-    qq| FROM buchungsgruppen bg | .
-    qq| WHERE bg.id = | . $dbh->quote($form->{"buchungsgruppen_id"}) . qq|)|;
-
-  $query = qq|UPDATE parts SET
-             partnumber = '$form->{partnumber}',
-             description = '$form->{description}',
-             makemodel = '$form->{makemodel}',
-             alternate = '$form->{alternate}',
-             assembly = '$form->{assembly}',
-             listprice = $form->{listprice},
-             sellprice = $form->{sellprice},
-             lastcost = $form->{lastcost},
-             weight = $form->{weight},
-             priceupdate = $form->{priceupdate},
-             unit = '$form->{unit}',
-             notes = '$form->{notes}',
-             formel = '$form->{formel}',
-             rop = $form->{rop},
-             bin = '$form->{bin}',
-             buchungsgruppen_id = '$form->{buchungsgruppen_id}',
-             payment_id = '$form->{payment_id}',
-             inventory_accno_id = $subq_inventory,
-             income_accno_id = $subq_income,
-             expense_accno_id = $subq_expense,
-              obsolete = '$form->{obsolete}',
-             image = '$form->{image}',
-             drawing = '$form->{drawing}',
-             shop = '$form->{shop}',
-              ve = '$form->{ve}',
-              gv = '$form->{gv}',
-              ean = '$form->{ean}',
-              not_discountable = '$form->{not_discountable}',
-             microfiche = '$form->{microfiche}',
-             partsgroup_id = $partsgroup_id
-             WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  $query =
+    qq|UPDATE parts SET
+         partnumber = ?,
+         description = ?,
+         makemodel = ?,
+         alternate = 'f',
+         assembly = ?,
+         listprice = ?,
+         sellprice = ?,
+         lastcost = ?,
+         weight = ?,
+         unit = ?,
+         notes = ?,
+         formel = ?,
+         rop = ?,
+         bin = ?,
+         buchungsgruppen_id = ?,
+         payment_id = ?,
+         inventory_accno_id = $subq_inventory,
+         income_accno_id = (SELECT bg.income_accno_id_0 FROM buchungsgruppen bg WHERE bg.id = ?),
+         expense_accno_id = $subq_expense,
+         obsolete = ?,
+         image = ?,
+         drawing = ?,
+         shop = ?,
+         ve = ?,
+         gv = ?,
+         ean = ?,
+         not_discountable = ?,
+         microfiche = ?,
+         partsgroup_id = ?,
+         price_factor_id = ?
+         $priceupdate
+       WHERE id = ?|;
+  @values = ($form->{partnumber},
+             $form->{description},
+             $makemodel ? 't' : 'f',
+             $form->{assembly} ? 't' : 'f',
+             $form->{listprice},
+             $form->{sellprice},
+             $form->{lastcost},
+             $form->{weight},
+             $form->{unit},
+             $form->{notes},
+             $form->{formel},
+             $form->{rop},
+             $form->{bin},
+             conv_i($form->{buchungsgruppen_id}),
+             conv_i($form->{payment_id}),
+             conv_i($form->{buchungsgruppen_id}),
+             $form->{obsolete} ? 't' : 'f',
+             $form->{image},
+             $form->{drawing},
+             $form->{shop} ? 't' : 'f',
+             conv_i($form->{ve}),
+             conv_i($form->{gv}),
+             $form->{ean},
+             $form->{not_discountable} ? 't' : 'f',
+             $form->{microfiche},
+             conv_i($partsgroup_id),
+             conv_i($form->{price_factor_id}),
+             conv_i($form->{id})
+  );
+  do_query($form, $dbh, $query, @values);

 
   # delete translation records
 
   # delete translation records

-  $query = qq|DELETE FROM translation
-              WHERE parts_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));

 
   if ($form->{language_values} ne "") {
 
   if ($form->{language_values} ne "") {

-    split /---\+\+\+---/,$form->{language_values};
-    foreach $item (@_) {
-      my ($language_id, $translation, $longdescription) = split /--\+\+--/, $item;
+    foreach $item (split(/---\+\+\+---/, $form->{language_values})) {
+      my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);

       if ($translation ne "") {
       if ($translation ne "") {

-        $query = qq|INSERT into translation (parts_id, language_id, translation, longdescription) VALUES
-                    ($form->{id}, $language_id, | . $dbh->quote($translation) . qq|, | . $dbh->quote($longdescription) . qq| )|;
-        $dbh->do($query) || $form->dberror($query);
+        $query = qq|INSERT into translation (parts_id, language_id, translation, longdescription)
+                    VALUES ( ?, ?, ?, ? )|;
+        @values = (conv_i($form->{id}), conv_i($language_id), $translation, $longdescription);
+        do_query($form, $dbh, $query, @values);

       }
     }
   }
       }
     }
   }

+

   # delete price records
   # delete price records

-  $query = qq|DELETE FROM prices
-              WHERE parts_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, qq|DELETE FROM prices WHERE parts_id = ?|, conv_i($form->{id}));
+

   # insert price records only if different to sellprice
   for my $i (1 .. $form->{price_rows}) {
     if ($form->{"price_$i"} eq "0") {
   # insert price records only if different to sellprice
   for my $i (1 .. $form->{price_rows}) {
     if ($form->{"price_$i"} eq "0") {


@@ -556,13 +484,14 @@ sub save {
          || $form->{"pricegroup_id_$i"})
         and $form->{"price_$i"} != $form->{sellprice}
       ) {
          || $form->{"pricegroup_id_$i"})
         and $form->{"price_$i"} != $form->{sellprice}
       ) {

-      $klass = $form->parse_amount($myconfig, $form->{"klass_$i"});
+      #$klass = $form->parse_amount($myconfig, $form->{"klass_$i"});

       $price = $form->parse_amount($myconfig, $form->{"price_$i"});
       $pricegroup_id =
         $form->parse_amount($myconfig, $form->{"pricegroup_id_$i"});
       $price = $form->parse_amount($myconfig, $form->{"price_$i"});
       $pricegroup_id =
         $form->parse_amount($myconfig, $form->{"pricegroup_id_$i"});

-      $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price)
-                  VALUES($form->{id},$pricegroup_id,$price)|;
-      $dbh->do($query) || $form->dberror($query);
+      $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) | .
+               qq|VALUES(?, ?, ?)|;
+      @values = (conv_i($form->{id}), conv_i($pricegroup_id), $price);
+      do_query($form, $dbh, $query, @values);

     }
   }
 
     }
   }
 


@@ -570,25 +499,24 @@ sub save {
   unless ($form->{item} eq 'service') {
     for my $i (1 .. $form->{makemodel_rows}) {
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {
   unless ($form->{item} eq 'service') {
     for my $i (1 .. $form->{makemodel_rows}) {
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {

-        map { $form->{"${_}_$i"} =~ s/\'/\'\'/g } qw(make model);

 
 

-        $query = qq|INSERT INTO makemodel (parts_id, make, model)
-                   VALUES ($form->{id},
-                   '$form->{"make_$i"}', '$form->{"model_$i"}')|;
-        $dbh->do($query) || $form->dberror($query);
+        $query = qq|INSERT INTO makemodel (parts_id, make, model) | .
+                            qq|VALUES (?, ?, ?)|;
+                   @values = (conv_i($form->{id}), conv_i($form->{"make_$i"}), $form->{"model_$i"});
+
+        do_query($form, $dbh, $query, @values);

       }
     }
   }
 
   # insert taxes
       }
     }
   }
 
   # insert taxes

-  foreach $item (split / /, $form->{taxaccounts}) {
+  foreach $item (split(/ /, $form->{taxaccounts})) {

     if ($form->{"IC_tax_$item"}) {
     if ($form->{"IC_tax_$item"}) {

-      $query = qq|INSERT INTO partstax (parts_id, chart_id)
-                  VALUES ($form->{id},
-                         (SELECT c.id
-                          FROM chart c
-                          WHERE c.accno = '$item'))|;
-      $dbh->do($query) || $form->dberror($query);
+      $query =
+        qq|INSERT INTO partstax (parts_id, chart_id)
+           VALUES (?, (SELECT id FROM chart WHERE accno = ?))|;
+                       @values = (conv_i($form->{id}), $item);
+      do_query($form, $dbh, $query, @values);

     }
   }
 
     }
   }
 


@@ -600,18 +528,13 @@ sub save {
 
       if ($form->{"qty_$i"} != 0) {
         $form->{"bom_$i"} *= 1;
 
       if ($form->{"qty_$i"} != 0) {
         $form->{"bom_$i"} *= 1;

-        $query = qq|INSERT INTO assembly (id, parts_id, qty, bom)
-                   VALUES ($form->{id}, $form->{"id_$i"},
-                   $form->{"qty_$i"}, '$form->{"bom_$i"}')|;
-        $dbh->do($query) || $form->dberror($query);
+        $query = qq|INSERT INTO assembly (id, parts_id, qty, bom) | .
+                            qq|VALUES (?, ?, ?, ?)|;
+                   @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}), conv_i($form->{"qty_$i"}), $form->{"bom_$i"} ? 't' : 'f');
+        do_query($form, $dbh, $query, @values);

       }
     }
 
       }
     }
 

-    # adjust onhand for the parts
-    if ($form->{onhand} != 0) {
-      &adjust_inventory($dbh, $form, $form->{id}, $form->{onhand});
-    }
-

     @a = localtime;
     $a[5] += 1900;
     $a[4]++;
     @a = localtime;
     $a[5] += 1900;
     $a[4]++;


@@ -619,13 +542,6 @@ sub save {
 
     $form->get_employee($dbh);
 
 
     $form->get_employee($dbh);
 

-    # add inventory record
-    $query = qq|INSERT INTO inventory (warehouse_id, parts_id, qty,
-                shippingdate, employee_id) VALUES (
-               0, $form->{id}, $form->{stock}, '$shippingdate',
-               $form->{employee_id})|;
-    $dbh->do($query) || $form->dberror($query);
-

   }
 
   #set expense_accno=inventory_accno if they are different => bilanz
   }
 
   #set expense_accno=inventory_accno if they are different => bilanz


@@ -637,26 +553,22 @@ sub save {
   # get tax rates and description
   $accno_id =
     ($form->{vc} eq "customer") ? $form->{income_accno} : $vendor_accno;
   # get tax rates and description
   $accno_id =
     ($form->{vc} eq "customer") ? $form->{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 c.accno|;
-  $stw = $dbh->prepare($query);
-
-  $stw->execute || $form->dberror($query);
+  $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 = ?))
+       ORDER BY c.accno|;
+  $stw = prepare_execute_query($form, $dbh, $query, $accno_id);

 
   $form->{taxaccount} = "";
   while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
 
   $form->{taxaccount} = "";
   while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {

-
-    #    if ($customertax{$ref->{accno}}) {

     $form->{taxaccount} .= "$ptr->{accno} ";
     $form->{taxaccount} .= "$ptr->{accno} ";

-    if (!($form->{taxaccount2} =~ /$ptr->{accno}/)) {
+    if (!($form->{taxaccount2} =~ /\Q$ptr->{accno}\E/)) {

       $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
       $form->{"$ptr->{accno}_description"} = $ptr->{description};
       $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
       $form->{taxaccount2} .= " $ptr->{accno} ";
     }
       $form->{"$ptr->{accno}_rate"}        = $ptr->{rate};
       $form->{"$ptr->{accno}_description"} = $ptr->{description};
       $form->{"$ptr->{accno}_taxnumber"}   = $ptr->{taxnumber};
       $form->{taxaccount2} .= " $ptr->{accno} ";
     }

-

   }
 
   # commit
   }
 
   # commit


@@ -673,24 +585,20 @@ sub update_assembly {
 
   my ($dbh, $form, $id, $qty, $sellprice, $weight) = @_;
 
 
   my ($dbh, $form, $id, $qty, $sellprice, $weight) = @_;
 

-  my $query = qq|SELECT a.id, a.qty
-                 FROM assembly a
-                WHERE a.parts_id = $id|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query = qq|SELECT id, qty FROM assembly WHERE parts_id = ?|;
+  my $sth = prepare_execute_query($form, $dbh, $query, conv_i($id));

 
   while (my ($pid, $aqty) = $sth->fetchrow_array) {
     &update_assembly($dbh, $form, $pid, $aqty * $qty, $sellprice, $weight);
   }
   $sth->finish;
 
 
   while (my ($pid, $aqty) = $sth->fetchrow_array) {
     &update_assembly($dbh, $form, $pid, $aqty * $qty, $sellprice, $weight);
   }
   $sth->finish;
 

-  $query = qq|UPDATE parts
-              SET sellprice = sellprice +
-                 $qty * ($form->{sellprice} - $sellprice),
-                  weight = weight +
-                 $qty * ($form->{weight} - $weight)
-             WHERE id = $id|;
-  $dbh->do($query) || $form->dberror($query);
+  $query =
+    qq|UPDATE parts SET sellprice = sellprice + ?, weight = weight + ?
+       WHERE id = ?|;
+  @values = ($qty * ($form->{sellprice} - $sellprice),
+             $qty * ($form->{weight} - $weight), conv_i($id));
+  do_query($form, $dbh, $query, @values);

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


@@ -703,149 +611,49 @@ sub retrieve_assemblies {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  my $where = '1 = 1';
+  my $where = qq|NOT p.obsolete|;
+  my @values;

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

-    my $partnumber = $form->like(lc $form->{partnumber});
-    $where .= " AND lower(p.partnumber) LIKE '$partnumber'";
+    $where .= qq| AND (p.partnumber ILIKE ?)|;
+    push(@values, '%' . $form->{partnumber} . '%');

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

-    my $description = $form->like(lc $form->{description});
-    $where .= " AND lower(p.description) LIKE '$description'";
+    $where .= qq| AND (p.description ILIKE ?)|;
+    push(@values, '%' . $form->{description} . '%');

   }
   }

-  $where .= " AND NOT p.obsolete = '1'";

 
   # retrieve assembly items
 
   # retrieve assembly items

-  my $query = qq|SELECT p.id, p.partnumber, p.description,
-                 p.bin, p.onhand, p.rop,
-                  (SELECT sum(p2.inventory_accno_id)
-                   FROM parts p2, assembly a
-                   WHERE p2.id = a.parts_id
-                   AND a.id = p.id) AS inventory
-                 FROM parts p
-                WHERE $where
-                AND assembly = '1'|;
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query =
+    qq|SELECT p.id, p.partnumber, p.description,
+         p.bin, p.onhand, p.rop,
+         (SELECT sum(p2.inventory_accno_id)
+          FROM parts p2, assembly a
+          WHERE (p2.id = a.parts_id) AND (a.id = p.id)) AS inventory
+       FROM parts p
+       WHERE NOT p.obsolete AND p.assembly $where|;

 
 

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{assembly_items} }, $ref if $ref->{inventory};
-  }
-  $sth->finish;
+  $form->{assembly_items} = selectall_hashref_query($form, $dbh, $query, @values);

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

-sub restock_assemblies {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
-
-  for my $i (1 .. $form->{rowcount}) {
-
-    $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
-
-    if ($form->{"qty_$i"} != 0) {
-      &adjust_inventory($dbh, $form, $form->{"id_$i"}, $form->{"qty_$i"});
-    }
-
-  }
-
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-
-  return $rc;
-}
-
-sub adjust_inventory {
-  $main::lxdebug->enter_sub();
-
-  my ($dbh, $form, $id, $qty) = @_;
-
-  my $query = qq|SELECT p.id, p.inventory_accno_id, p.assembly, a.qty
-                FROM parts p, assembly a
-                WHERE a.parts_id = p.id
-                AND a.id = $id|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-    my $allocate = $qty * $ref->{qty};
-
-    # is it a service item, then loop
-    $ref->{inventory_accno_id} *= 1;
-    next if (($ref->{inventory_accno_id} == 0) && !$ref->{assembly});
-
-    # adjust parts onhand
-    $form->update_balance($dbh, "parts", "onhand",
-                          qq|id = $ref->{id}|,
-                          $allocate * -1);
-  }
-
-  $sth->finish;
-
-  # update assembly
-  my $rc = $form->update_balance($dbh, "parts", "onhand", qq|id = $id|, $qty);
-
-  $main::lxdebug->leave_sub();
-
-  return $rc;
-}
-

 sub delete {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 sub delete {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;

-
+  my @values = (conv_i($form->{id}));

   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 

-  # first delete prices of pricegroup 
-  my $query = qq|DELETE FROM prices
-           WHERE parts_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-
-  my $query = qq|DELETE FROM parts
-                WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-
-  $query = qq|DELETE FROM partstax
-             WHERE parts_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  my %columns = ( "assembly" => "id", "parts" => "id" );

 
 

-  # check if it is a part, assembly or service
-  if ($form->{item} ne 'service') {
-    $query = qq|DELETE FROM makemodel
-               WHERE parts_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
-  }
-
-  if ($form->{item} eq 'assembly') {
-
-    # delete inventory
-    $query = qq|DELETE FROM inventory
-                WHERE parts_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
-
-    $query = qq|DELETE FROM assembly
-               WHERE id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
-  }
-
-  if ($form->{item} eq 'alternate') {
-    $query = qq|DELETE FROM alternate
-               WHERE id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
+  for my $table (qw(prices partstax makemodel inventory assembly license translation parts)) {
+    my $column = defined($columns{$table}) ? $columns{$table} : "parts_id";
+    do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values);

   }
 
   # commit
   }
 
   # commit


@@ -864,444 +672,326 @@ sub assembly_item {
 
   my $i = $form->{assembly_rows};
   my $var;
 
   my $i = $form->{assembly_rows};
   my $var;

-  my $where = "1 = 1";
+  my $where = qq|1 = 1|;
+  my @values;

 
 

-  if ($form->{"partnumber_$i"}) {
-    $var = $form->like(lc $form->{"partnumber_$i"});
-    $where .= " AND lower(p.partnumber) LIKE '$var'";
-  }
-  if ($form->{"description_$i"}) {
-    $var = $form->like(lc $form->{"description_$i"});
-    $where .= " AND lower(p.description) LIKE '$var'";
-  }
-  if ($form->{"partsgroup_$i"}) {
-    $var = $form->like(lc $form->{"partsgroup_$i"});
-    $where .= " AND lower(pg.partsgroup) LIKE '$var'";
+  my %columns = ("partnumber" => "p", "description" => "p", "partsgroup" => "pg");
+
+  while (my ($column, $table) = each(%columns)) {
+    next unless ($form->{"${column}_$i"});
+    $where .= qq| AND ${table}.${column} ILIKE ?|;
+    push(@values, '%' . $form->{"${column}_$i"} . '%');

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

-    $where .= " AND NOT p.id = $form->{id}";
+    $where .= qq| AND NOT (p.id = ?)|;
+    push(@values, conv_i($form->{id}));

   }
 
   if ($partnumber) {
   }
 
   if ($partnumber) {

-    $where .= " ORDER BY p.partnumber";
+    $where .= qq| ORDER BY p.partnumber|;

   } else {
   } else {

-    $where .= " ORDER BY p.description";
+    $where .= qq| ORDER BY p.description|;

   }
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   }
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
-                 p.weight, p.onhand, p.unit,
-                pg.partsgroup
-                FROM parts p
-                LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                WHERE $where|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{item_list} }, $ref;
-  }
+  my $query =
+    qq|SELECT p.id, p.partnumber, p.description, p.sellprice, p.weight, p.onhand, p.unit, pg.partsgroup,
+              p.price_factor_id, pfac.factor AS price_factor
+       FROM parts p
+       LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+       LEFT JOIN price_factors pfac ON pfac.id = p.price_factor_id
+       WHERE $where|;
+  $form->{item_list} = selectall_hashref_query($form, $dbh, $query, @values);

 
 

-  $sth->finish;

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

+#
+# Report for Wares.
+# Warning, deep magic ahead.
+# This function gets all parts from the database according to the filters specified
+#
+# specials:
+#   sort revers  - sorting field + direction
+#   top100
+#
+# simple filter strings (every one of those also has a column flag prefixed with 'l_' associated):
+#   partnumber ean description partsgroup microfiche drawing
+#
+# column flags:
+#   l_partnumber l_description l_listprice l_sellprice l_lastcost l_priceupdate l_weight l_unit l_bin l_rop l_image l_drawing l_microfiche l_partsgroup
+#
+# exclusives:
+#   itemstatus  = active | onhand | short | obsolete | orphaned
+#   searchitems = part | assembly | service
+#
+# joining filters:
+#   make model                               - makemodel
+#   serialnumber transdatefrom transdateto   - invoice/orderitems
+#
+# binary flags:
+#   bought sold onorder ordered rfq quoted   - aggreg joins with invoices/orders
+#   l_linetotal l_subtotal                   - aggreg joins to display totals (complicated) - NOT IMPLEMENTED here, implementation at frontend
+#   l_soldtotal                              - aggreg join to display total of sold quantity
+#   onhand                                   - as above, but masking the simple itemstatus results (doh!)
+#   short                                    - NOT IMPLEMENTED as form filter, only as itemstatus option
+#   l_serialnumber                           - belonges to serialnumber filter
+#   l_deliverydate                           - displays deliverydate is sold etc. flags are active
+#   l_soldtotal                              - aggreg join to display total of sold quantity, works as long as there's no bullshit in soldtotal
+#
+# not working:
+#   onhand                                   - as above, but masking the simple itemstatus results (doh!)
+#   masking of onhand in bsooqr mode         - ToDO: fixme
+#
+# disabled sanity checks and changes:
+#  - searchitems = assembly will no longer disable bought
+#  - searchitems = service will no longer disable make and model, although services don't have make/model, it doesn't break the query
+#  - itemstatus = orphaned will no longer disable onhand short bought sold onorder ordered rfq quoted transdate[from|to]
+#  - itemstatus = obsolete will no longer disable onhand, short
+#  - allow sorting by ean
+#  - serialnumber filter also works if l_serialnumber isn't ticked
+#  - onhand doesn't get masked by it's oi or invoice counterparts atm. ToDO: fix this
+#  - sorting will now change sorting if the requested sorting column isn't checked and doesn't get checked as a side effect
+#

 sub all_parts {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 sub all_parts {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;

-
-  my $where = '1 = 1';
-  my $var;
-
-  my $group;
-  my $limit;
-
-  foreach my $item (qw(partnumber drawing microfiche)) {
-    if ($form->{$item}) {
-      $var = $form->like(lc $form->{$item});
-      $where .= " AND lower(p.$item) LIKE '$var'";
+  my $dbh = $form->get_standard_dbh($myconfig);
+
+  $form->{parts}     = +{ };
+  $form->{soldtotal} = undef if $form->{l_soldtotal}; # security fix. top100 insists on putting strings in there...
+
+  my @simple_filters       = qw(partnumber ean description partsgroup microfiche drawing onhand);
+  my @makemodel_filters    = qw(make model);
+  my @invoice_oi_filters   = qw(serialnumber soldtotal);
+  my @apoe_filters         = qw(transdate);
+  my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, qw(serialnumber));
+  my @simple_l_switches    = (@all_columns, qw(listprice sellprice lastcost priceupdate weight unit bin rop image));
+  my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
+  my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module);
+  my @deliverydate_flags   = qw(deliverydate);
+#  my @other_flags          = qw(onhand); # ToDO: implement these
+#  my @inactive_flags       = qw(l_subtotal short l_linetotal);
+
+  my %joins = (
+    partsgroup => 'LEFT JOIN partsgroup pg      ON (pg.id       = p.partsgroup_id)',
+    makemodel  => 'LEFT JOIN makemodel mm       ON (mm.parts_id = p.id)',
+    pfac       => 'LEFT JOIN price_factors pfac ON (pfac.id     = p.price_factor_id)',
+    invoice_oi =>
+      q|LEFT JOIN (
+         SELECT parts_id, description, serialnumber, trans_id, unit, sellprice, qty,          assemblyitem, 'invoice'    AS ioi FROM invoice UNION
+         SELECT parts_id, description, serialnumber, trans_id, unit, sellprice, qty, FALSE AS assemblyitem, 'orderitems' AS ioi FROM orderitems
+       ) AS ioi ON ioi.parts_id = p.id|,
+    apoe       =>
+      q|LEFT JOIN (
+         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id, NULL AS deliverydate, 'invoice'    AS ioi FROM ap UNION
+         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation,         customer_id, NULL AS vendor_id,         deliverydate, 'invoice'    AS ioi FROM ar UNION
+         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, NULL AS deliverydate, 'orderitems' AS ioi FROM oe
+       ) AS apoe ON ((ioi.trans_id = apoe.id) AND (ioi.ioi = apoe.ioi))|,
+    cv         =>
+      q|LEFT JOIN (
+           SELECT id, name, 'customer' AS cv FROM customer UNION
+           SELECT id, name, 'vendor'   AS cv FROM vendor
+         ) AS cv ON cv.id = apoe.customer_id OR cv.id = apoe.vendor_id|,
+  );
+  my @join_order = qw(partsgroup makemodel invoice_oi apoe cv pfac);
+  my %joins_needed;
+
+  if (($form->{searchitems} eq 'assembly') && $form->{l_lastcost}) {
+    @simple_l_switches = grep { $_ ne 'lastcost' } @simple_l_switches;
+  }
+
+  #===== switches and simple filters ========#
+
+  my @select_tokens = qw(id factor);
+  my @where_tokens  = qw(1=1);
+  my @group_tokens  = ();
+
+  # special case transdate
+  if (grep { $form->{$_} } qw(transdatefrom transdateto)) {
+    $form->{"l_transdate"} = 1;
+    push @select_tokens, 'transdate';
+    for (qw(transdatefrom transdateto)) {
+      next unless $form->{$_};
+      push @where_tokens, sprintf "transdate %s ?", /from$/ ? '>=' : '<=';
+      push @bind_vars,    $form->{$_};

     }
   }
 
     }
   }
 

-  # special case for description
-  if ($form->{description}) {
-    unless (   $form->{bought}
-            || $form->{sold}
-            || $form->{onorder}
-            || $form->{ordered}
-            || $form->{rfq}
-            || $form->{quoted}) {
-      $var = $form->like(lc $form->{description});
-      $where .= " AND lower(p.description) LIKE '$var'";
-    }
-  }
-
-  # special case for serialnumber
-  if ($form->{l_serialnumber}) {
-    if ($form->{serialnumber}) {
-      $var = $form->like(lc $form->{serialnumber});
-      $where .= " AND lower(serialnumber) LIKE '$var'";
+  my %simple_filter_table_prefix = (
+     description  => 'p.',
+  );
+
+  foreach (@simple_filters, @makemodel_filters, @invoice_oi_filters) {
+    next unless $form->{$_};
+    $form->{"l_$_"} = '1'; # show the column
+    push @where_tokens, "$simple_filter_table_prefix{$_}$_ ILIKE ?";
+    push @bind_vars,    "%$form->{$_}%";
+  }
+
+  foreach (@simple_l_switches) {
+    next unless $form->{"l_$_"};
+    push @select_tokens, $_;
+  }
+
+  for ($form->{searchitems}) {
+    push @where_tokens, 'p.inventory_accno_id > 0'     if /part/;
+    push @where_tokens, 'p.inventory_accno_id IS NULL' if /service/;
+    push @where_tokens, 'NOT p.assembly'               if /service/;
+    push @where_tokens, '    p.assembly'               if /assembly/;
+  }
+
+  for ($form->{itemstatus}) {
+    push @where_tokens, 'p.id NOT IN
+        (SELECT DISTINCT parts_id FROM invoice UNION
+         SELECT DISTINCT parts_id FROM assembly UNION
+         SELECT DISTINCT parts_id FROM orderitems)'    if /orphaned/;
+    push @where_tokens, 'p.onhand = 0'                 if /orphaned/;
+    push @where_tokens, 'NOT p.obsolete'               if /active/;
+    push @where_tokens, '    p.obsolete',              if /obsolete/;
+    push @where_tokens, 'p.onhand > 0',                if /onhand/;
+    push @where_tokens, 'p.onhand < p.rop',            if /short/;
+  }
+
+  my $q_assembly_lastcost =
+    qq|(SELECT SUM(a_lc.qty * p_lc.lastcost / COALESCE(pfac_lc.factor, 1))
+        FROM assembly a_lc
+        LEFT JOIN parts p_lc            ON (a_lc.parts_id        = p_lc.id)
+        LEFT JOIN price_factors pfac_lc ON (p_lc.price_factor_id = pfac_lc.id)
+        WHERE (a_lc.id = p.id)) AS lastcost|;
+
+  my @sort_cols = (@simple_filters, qw(id bin priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate));
+  $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols;
+
+  my $sort_order = ($form->{revers} ? ' DESC' : ' ASC');
+
+  # special case: sorting by partnumber
+  # since partnumbers are expected to be prefixed integers, a special sorting is implemented sorting first lexically by prefix and then by suffix.
+  # and yes, that expression is designed to hold that array of regexes only once, so the map is kinda messy, sorry about that.
+  # ToDO: implement proper functional sorting
+  $form->{sort} = join ', ', map { push @select_tokens, $_; ($table_prefix{$_} = "substring(partnumber,'[") . $_ } qw|^[:digit:]]+') [:digit:]]+')::INTEGER|
+    if $form->{sort} eq 'partnumber';
+
+  my $order_clause = " ORDER BY $form->{sort} $sort_order";
+
+  my $limit_clause = " LIMIT 100" if $form->{top100};
+
+  #=== joins and complicated filters ========#
+
+  my $bsooqr = $form->{bought}  || $form->{sold}
+            || $form->{ordered} || $form->{onorder}
+            || $form->{quoted}  || $form->{rfq};
+
+  my @bsooqr;
+  push @select_tokens, @qsooqr_flags                                          if $bsooqr;
+  push @select_tokens, @deliverydate_flags                                    if $bsooqr && $form->{l_deliverydate};
+  push @select_tokens, $q_assembly_lastcost                                   if ($form->{searchitems} eq 'assembly') && $form->{l_lastcost};
+  push @bsooqr_tokens, q|module = 'ir' AND NOT ioi.assemblyitem|              if $form->{bought};
+  push @bsooqr_tokens, q|module = 'is' AND NOT ioi.assemblyitem|              if $form->{sold};
+  push @bsooqr_tokens, q|module = 'oe' AND NOT quotation AND cv = 'customer'| if $form->{ordered};
+  push @bsooqr_tokens, q|module = 'oe' AND NOT quotation AND cv = 'vendor'|   if $form->{onorder};
+  push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'customer'| if $form->{quoted};
+  push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'vendor'|   if $form->{rfq};
+  push @where_tokens, join ' OR ', map { "($_)" } @bsooqr_tokens              if $bsooqr;
+
+  $joins_needed{partsgroup}  = 1;
+  $joins_needed{pfac}        = 1;
+  $joins_needed{makemodel}   = 1 if grep { $form->{$_} || $form->{"l_$_"} } @makemodel_filters;
+  $joins_needed{cv}          = 1 if $bsooqr;
+  $joins_needed{apoe}        = 1 if $joins_needed{cv}   || grep { $form->{$_} || $form->{"l_$_"} } @apoe_filters;
+  $joins_needed{invoice_oi}  = 1 if $joins_needed{apoe} || grep { $form->{$_} || $form->{"l_$_"} } @invoice_oi_filters;
+
+  # special case for description search.
+  # up in the simple filter section the description filter got interpreted as something like: WHERE description ILIKE '%$form->{description}%'
+  # now we'd like to search also for the masked description entered in orderitems and invoice, so...
+  # find the old entries in of @where_tokens and @bind_vars, and adjust them
+  if ($joins_needed{invoice_oi}) {
+    for (my ($wi, $bi) = (0)x2; $wi <= $#where_tokens; $bi++ if $where_tokens[$wi++] =~ /\?/) {
+      next unless $where_tokens[$wi] =~ /^description ILIKE/;
+      splice @where_tokens, $wi, 1, 'p.description ILIKE ? OR ioi.description ILIKE ?';
+      splice @bind_vars,    $bi, 0, $bind_vars[$bi];
+      last;

     }
   }
 
     }
   }
 

-  if ($form->{ean}) {
-    $var = $form->like(lc $form->{ean});
-    $where .= " AND lower(ean) LIKE '$var'";
-  }
-  
-  if ($form->{searchitems} eq 'part') {
-    $where .= " AND p.inventory_accno_id > 0";
-  }
-  if ($form->{searchitems} eq 'assembly') {
-    $form->{bought} = "";
-    $where .= " AND p.assembly = '1'";
-  }
-  if ($form->{searchitems} eq 'service') {
-    $where .= " AND p.inventory_accno_id IS NULL AND NOT p.assembly = '1'";
-
-    # irrelevant for services
-    $form->{make} = $form->{model} = "";
-  }
-
-  # items which were never bought, sold or on an order
-  if ($form->{itemstatus} eq 'orphaned') {
-    $form->{onhand}  = $form->{short}   = 0;
-    $form->{bought}  = $form->{sold}    = 0;
-    $form->{onorder} = $form->{ordered} = 0;
-    $form->{rfq}     = $form->{quoted}  = 0;
-
-    $form->{transdatefrom} = $form->{transdateto} = "";
-
-    $where .= " AND p.onhand = 0
-                AND p.id NOT IN (SELECT p.id FROM parts p, invoice i
-                                WHERE p.id = i.parts_id)
-               AND p.id NOT IN (SELECT p.id FROM parts p, assembly a
-                                WHERE p.id = a.parts_id)
-                AND p.id NOT IN (SELECT p.id FROM parts p, orderitems o
-                                WHERE p.id = o.parts_id)";
-  }
-
-  if ($form->{itemstatus} eq 'active') {
-    $where .= " AND p.obsolete = '0'";
-  }
-  if ($form->{itemstatus} eq 'obsolete') {
-    $where .= " AND p.obsolete = '1'";
-    $form->{onhand} = $form->{short} = 0;
-  }
-  if ($form->{itemstatus} eq 'onhand') {
-    $where .= " AND p.onhand > 0";
-  }
-  if ($form->{itemstatus} eq 'short') {
-    $where .= " AND p.onhand < p.rop";
-  }
-  if ($form->{make}) {
-    $var = $form->like(lc $form->{make});
-    $where .= " AND p.id IN (SELECT DISTINCT ON (m.parts_id) m.parts_id
-                           FROM makemodel m WHERE lower(m.make) LIKE '$var')";
-  }
-  if ($form->{model}) {
-    $var = $form->like(lc $form->{model});
-    $where .= " AND p.id IN (SELECT DISTINCT ON (m.parts_id) m.parts_id
-                           FROM makemodel m WHERE lower(m.model) LIKE '$var')";
-  }
-  if ($form->{partsgroup}) {
-    $var = $form->like(lc $form->{partsgroup});
-    $where .= " AND lower(pg.partsgroup) LIKE '$var'";
-  }
-  if ($form->{l_soldtotal}) {
-    $where .= " AND p.id=i.parts_id AND  i.qty >= 0";
-    $group =
-      " GROUP BY  p.id,p.partnumber,p.description,p.onhand,p.unit,p.bin, p.sellprice,p.listprice,p.lastcost,p.priceupdate,pg.partsgroup";
-  }
-  if ($form->{top100}) {
-    $limit = " LIMIT 100";
-  }
-
-  # tables revers?
-  if ($form->{revers} == 1) {
-    $form->{desc} = " DESC";
-  } else {
-    $form->{desc} = "";
-  }
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $sortorder = $form->{sort};
-  $sortorder .= $form->{desc};
-  $sortorder = $form->{sort} if $form->{sort};
-
-  my $query = "";
-
+  # now the master trick: soldtotal.

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

-    $form->{soldtotal} = 'soldtotal';
-    $query =
-      qq|SELECT p.id,p.partnumber,p.description,p.onhand,p.unit,p.bin,p.sellprice,p.listprice,
-               p.lastcost,p.priceupdate,pg.partsgroup,sum(i.qty) as soldtotal FROM parts
-               p LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id), invoice i
-               WHERE $where
-               $group
-               ORDER BY $sortorder
-               $limit|;
-  } else {
-    $query = qq|SELECT p.id, p.partnumber, p.description, p.onhand, p.unit,
-                 p.bin, p.sellprice, p.listprice, p.lastcost, p.rop, p.weight,
-                p.priceupdate, p.image, p.drawing, p.microfiche,
-                pg.partsgroup
-                 FROM parts p
-                LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                WHERE $where
-                $group
-                ORDER BY $sortorder|;
+    push @where_tokens, 'ioi.qty >= 0';
+    push @group_tokens, @select_tokens;
+     map { s/.*\sAS\s+//si } @group_tokens;
+    push @select_tokens, 'SUM(ioi.qty)';

   }
 
   }
 

-  # rebuild query for bought and sold items
-  if (   $form->{bought}
-      || $form->{sold}
-      || $form->{onorder}
-      || $form->{ordered}
-      || $form->{rfq}
-      || $form->{quoted}) {
-
-    my @a = qw(partnumber description bin priceupdate name);
-
-    push @a, qw(invnumber serialnumber) if ($form->{bought} || $form->{sold});
-    push @a, "ordnumber" if ($form->{onorder} || $form->{ordered});
-    push @a, "quonumber" if ($form->{rfq}     || $form->{quoted});
-
-    my $union = "";
-    $query = "";
-
-    if ($form->{bought} || $form->{sold}) {
-
-      my $invwhere = "$where";
-      $invwhere .= " AND i.assemblyitem = '0'";
-      $invwhere .= " AND a.transdate >= '$form->{transdatefrom}'"
-        if $form->{transdatefrom};
-      $invwhere .= " AND a.transdate <= '$form->{transdateto}'"
-        if $form->{transdateto};
-
-      if ($form->{description}) {
-        $var = $form->like(lc $form->{description});
-        $invwhere .= " AND lower(i.description) LIKE '$var'";
-      }
-
-      my $flds = qq|p.id, p.partnumber, i.description, i.serialnumber,
-                    i.qty AS onhand, i.unit, p.bin, i.sellprice,
-                   p.listprice, p.lastcost, p.rop, p.weight,
-                   p.priceupdate, p.image, p.drawing, p.microfiche,
-                   pg.partsgroup,
-                   a.invnumber, a.ordnumber, a.quonumber, i.trans_id,
-                   ct.name, i.deliverydate|;
-
-      if ($form->{bought}) {
-        $query = qq|
-                   SELECT $flds, 'ir' AS module, '' AS type,
-                   1 AS exchangerate
-                   FROM invoice i
-                   JOIN parts p ON (p.id = i.parts_id)
-                   JOIN ap a ON (a.id = i.trans_id)
-                   JOIN vendor ct ON (a.vendor_id = ct.id)
-                   LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                   WHERE $invwhere|;
-        $union = "
-                 UNION";
-      }
-
-      if ($form->{sold}) {
-        $query .= qq|$union
-                     SELECT $flds, 'is' AS module, '' AS type,
-                    1 As exchangerate
-                    FROM invoice i
-                    JOIN parts p ON (p.id = i.parts_id)
-                    JOIN ar a ON (a.id = i.trans_id)
-                    JOIN customer ct ON (a.customer_id = ct.id)
-                    LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                    WHERE $invwhere|;
-        $union = "
-                 UNION";
-      }
-    }
-
-    if ($form->{onorder} || $form->{ordered}) {
-      my $ordwhere = "$where
-                    AND o.quotation = '0'";
-      $ordwhere .= " AND o.transdate >= '$form->{transdatefrom}'"
-        if $form->{transdatefrom};
-      $ordwhere .= " AND o.transdate <= '$form->{transdateto}'"
-        if $form->{transdateto};
-
-      if ($form->{description}) {
-        $var = $form->like(lc $form->{description});
-        $ordwhere .= " AND lower(oi.description) LIKE '$var'";
-      }
-
-      $flds =
-        qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
-                 oi.qty AS onhand, oi.unit, p.bin, oi.sellprice,
-                p.listprice, p.lastcost, p.rop, p.weight,
-                p.priceupdate, p.image, p.drawing, p.microfiche,
-                pg.partsgroup,
-                '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-                ct.name, NULL AS deliverydate|;
-
-      if ($form->{ordered}) {
-        $query .= qq|$union
-                     SELECT $flds, 'oe' AS module, 'sales_order' AS type,
-                   (SELECT buy FROM exchangerate ex
-                    WHERE ex.curr = o.curr
-                    AND ex.transdate = o.transdate) AS exchangerate
-                    FROM orderitems oi
-                    JOIN parts p ON (oi.parts_id = p.id)
-                    JOIN oe o ON (oi.trans_id = o.id)
-                    JOIN customer ct ON (o.customer_id = ct.id)
-                    LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                    WHERE $ordwhere
-                    AND o.customer_id > 0|;
-        $union = "
-                 UNION";
-      }
-
-      if ($form->{onorder}) {
-        $flds =
-          qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
-                   oi.qty * -1 AS onhand, oi.unit, p.bin, oi.sellprice,
-                  p.listprice, p.lastcost, p.rop, p.weight,
-                  p.priceupdate, p.image, p.drawing, p.microfiche,
-                  pg.partsgroup,
-                  '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-                  ct.name, NULL AS deliverydate|;
-
-        $query .= qq|$union
-                   SELECT $flds, 'oe' AS module, 'purchase_order' AS type,
-                   (SELECT sell FROM exchangerate ex
-                    WHERE ex.curr = o.curr
-                    AND ex.transdate = o.transdate) AS exchangerate
-                   FROM orderitems oi
-                   JOIN parts p ON (oi.parts_id = p.id)
-                   JOIN oe o ON (oi.trans_id = o.id)
-                   JOIN vendor ct ON (o.vendor_id = ct.id)
-                   LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                   WHERE $ordwhere
-                   AND o.vendor_id > 0|;
-      }
+  #============= build query ================#

 
 

-    }
+  %table_prefix = (
+     %table_prefix,
+     deliverydate => 'apoe.', serialnumber => 'ioi.',
+     transdate    => 'apoe.', trans_id     => 'ioi.',
+     module       => 'apoe.', name         => 'cv.',
+     ordnumber    => 'apoe.', make         => 'mm.',
+     quonumber    => 'apoe.', model        => 'mm.',
+     invnumber    => 'apoe.', partsgroup   => 'pg.',
+     lastcost     => ' ',
+     factor       => 'pfac.',
+     'SUM(ioi.qty)' => ' ',
+  );

 
 

-    if ($form->{rfq} || $form->{quoted}) {
-      my $quowhere = "$where
-                    AND o.quotation = '1'";
-      $quowhere .= " AND o.transdate >= '$form->{transdatefrom}'"
-        if $form->{transdatefrom};
-      $quowhere .= " AND o.transdate <= '$form->{transdateto}'"
-        if $form->{transdateto};
-
-      if ($form->{description}) {
-        $var = $form->like(lc $form->{description});
-        $quowhere .= " AND lower(oi.description) LIKE '$var'";
-      }
+  $table_prefix{$q_assembly_lastcost} = ' ';

 
 

-      $flds =
-        qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
-                 oi.qty AS onhand, oi.unit, p.bin, oi.sellprice,
-                p.listprice, p.lastcost, p.rop, p.weight,
-                p.priceupdate, p.image, p.drawing, p.microfiche,
-                pg.partsgroup,
-                '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-                ct.name, NULL AS deliverydate|;
-
-      if ($form->{quoted}) {
-        $query .= qq|$union
-                     SELECT $flds, 'oe' AS module, 'sales_quotation' AS type,
-                   (SELECT buy FROM exchangerate ex
-                    WHERE ex.curr = o.curr
-                    AND ex.transdate = o.transdate) AS exchangerate
-                    FROM orderitems oi
-                    JOIN parts p ON (oi.parts_id = p.id)
-                    JOIN oe o ON (oi.trans_id = o.id)
-                    JOIN customer ct ON (o.customer_id = ct.id)
-                    LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                    WHERE $quowhere
-                    AND o.customer_id > 0|;
-        $union = "
-                 UNION";
-      }
+  my %renamed_columns = (
+    'factor'       => 'price_factor',
+    'SUM(ioi.qty)' => 'soldtotal',
+  );

 
 

-      if ($form->{rfq}) {
-        $flds =
-          qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
-                   oi.qty * -1 AS onhand, oi.unit, p.bin, oi.sellprice,
-                  p.listprice, p.lastcost, p.rop, p.weight,
-                  p.priceupdate, p.image, p.drawing, p.microfiche,
-                  pg.partsgroup,
-                  '' AS invnumber, o.ordnumber, o.quonumber, oi.trans_id,
-                  ct.name, NULL AS deliverydate|;
-
-        $query .= qq|$union
-                   SELECT $flds, 'oe' AS module, 'request_quotation' AS type,
-                   (SELECT sell FROM exchangerate ex
-                    WHERE ex.curr = o.curr
-                    AND ex.transdate = o.transdate) AS exchangerate
-                   FROM orderitems oi
-                   JOIN parts p ON (oi.parts_id = p.id)
-                   JOIN oe o ON (oi.trans_id = o.id)
-                   JOIN vendor ct ON (o.vendor_id = ct.id)
-                   LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                   WHERE $quowhere
-                   AND o.vendor_id > 0|;
-      }
+  map { $table_prefix{$_} = 'ioi.' } qw(description serialnumber qty unit) if $joins_needed{invoice_oi};
+  map { $renamed_columns{$_} = ' AS ' . $renamed_columns{$_} } keys %renamed_columns;

 
 

-    }
-    $query .= qq|
-                ORDER BY $sortorder|;
+  my $select_clause = join ', ',    map { ($table_prefix{$_} || "p.") . $_ . $renamed_columns{$_} } @select_tokens;
+  my $join_clause   = join ' ',     @joins{ grep $joins_needed{$_}, @join_order };
+  my $where_clause  = join ' AND ', map { "($_)" } @where_tokens;
+  my $group_clause  = ' GROUP BY ' . join ', ',    map { ($table_prefix{$_} || "p.") . $_ } @group_tokens if scalar @group_tokens;

 
 

-  }
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $query = qq|SELECT DISTINCT $select_clause FROM parts p $join_clause WHERE $where_clause $group_clause $order_clause $limit_clause|;

 
 

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{parts} }, $ref;
-  }
+  $form->{parts} = selectall_hashref_query($form, $dbh, $query, @bind_vars);

 
 

-  $sth->finish;
+  map { $_->{onhand} *= 1 } @{ $form->{parts} };

 
 

+  my @assemblies;

   # include individual items for assemblies
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
   # include individual items for assemblies
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {

-    foreach $item (@{ $form->{parts} }) {
-      push @assemblies, $item;
-      $query = qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
-                  p.unit, p.bin,
-                  p.sellprice, p.listprice, p.lastcost,
-                 p.rop, p.weight, p.priceupdate,
-                 p.image, p.drawing, p.microfiche
-                 FROM parts p, assembly a
-                 WHERE p.id = a.parts_id
-                 AND a.id = $item->{id}|;
+    $query =
+      qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
+           p.unit, p.bin,
+           p.sellprice, p.listprice, p.lastcost,
+           p.rop, p.weight, p.priceupdate,
+           p.image, p.drawing, p.microfiche
+         FROM parts p, assembly a
+         WHERE (p.id = a.parts_id) AND (a.id = ?)|;
+    $sth = prepare_query($form, $dbh, $query);

 
 

-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
+    foreach $item (@{ $form->{parts} }) {
+      push(@assemblies, $item);
+      do_statement($form, $sth, $query, conv_i($item->{id}));

 
 

-      while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+      while ($ref = $sth->fetchrow_hashref(NAME_lc)) {

         $ref->{assemblyitem} = 1;
         $ref->{assemblyitem} = 1;

-        push @assemblies, $ref;
+        push(@assemblies, $ref);

       }
       $sth->finish;
       }
       $sth->finish;

-
-      push @assemblies, { id => $item->{id} };
-

     }
 
     # copy assemblies to $form->{parts}
     }
 
     # copy assemblies to $form->{parts}

-    @{ $form->{parts} } = @assemblies;
+    $form->{parts} = \@assemblies;

   }
 
   }
 

-  $dbh->disconnect;

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


@@ -1309,43 +999,35 @@ sub update_prices {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;

-
+  my @where_values;

   my $where = '1 = 1';
   my $var;
 
   my $group;
   my $limit;
 
   my $where = '1 = 1';
   my $var;
 
   my $group;
   my $limit;
 

-  foreach my $item (qw(partnumber drawing microfiche make model)) {
-    if ($form->{$item}) {
-      $var = $form->like(lc $form->{$item});
-
-      # make will build later Bugfix 145
-      if ($item ne 'make') {
-        $where .= " AND lower(p.$item) LIKE '$var'";
-      }
+  if ($item ne 'make') {
+    foreach my $item (qw(partnumber drawing microfiche make model pg.partsgroup)) {
+      my $column = $item;
+      $column =~ s/.*\.//;
+      next unless ($form->{$column});
+      $where .= qq| AND $item ILIKE ?|;
+      push(@where_values, '%' . $form->{$column} . '%');

     }
   }
 
   # special case for description
     }
   }
 
   # special case for description

-  if ($form->{description}) {
-    unless (   $form->{bought}
-            || $form->{sold}
-            || $form->{onorder}
-            || $form->{ordered}
-            || $form->{rfq}
-            || $form->{quoted}) {
-      $var = $form->like(lc $form->{description});
-      $where .= " AND lower(p.description) LIKE '$var'";
-    }
+  if ($form->{description}
+      && !(   $form->{bought}  || $form->{sold} || $form->{onorder}
+           || $form->{ordered} || $form->{rfq} || $form->{quoted})) {
+    $where .= qq| AND (p.description ILIKE ?)|;
+    push(@where_values, '%' . $form->{description} . '%');

   }
 
   # special case for serialnumber
   }
 
   # special case for serialnumber

-  if ($form->{l_serialnumber}) {
-    if ($form->{serialnumber}) {
-      $var = $form->like(lc $form->{serialnumber});
-      $where .= " AND lower(serialnumber) LIKE '$var'";
-    }
+  if ($form->{l_serialnumber} && $form->{serialnumber}) {
+    $where .= qq| AND serialnumber ILIKE ?|;
+    push(@where_values, '%' . $form->{serialnumber} . '%');

   }
 
 
   }
 
 


@@ -1358,113 +1040,101 @@ sub update_prices {
 
     $form->{transdatefrom} = $form->{transdateto} = "";
 
 
     $form->{transdatefrom} = $form->{transdateto} = "";
 

-    $where .= " AND p.onhand = 0
-                AND p.id NOT IN (SELECT p.id FROM parts p, invoice i
-                                WHERE p.id = i.parts_id)
-               AND p.id NOT IN (SELECT p.id FROM parts p, assembly a
-                                WHERE p.id = a.parts_id)
-                AND p.id NOT IN (SELECT p.id FROM parts p, orderitems o
-                                WHERE p.id = o.parts_id)";
+    $where .=
+      qq| AND (p.onhand = 0)
+          AND p.id NOT IN
+            (
+              SELECT DISTINCT parts_id FROM invoice
+              UNION
+              SELECT DISTINCT parts_id FROM assembly
+              UNION
+              SELECT DISTINCT parts_id FROM orderitems
+            )|;

   }
 
   if ($form->{itemstatus} eq 'active') {
   }
 
   if ($form->{itemstatus} eq 'active') {

-    $where .= " AND p.obsolete = '0'";
+    $where .= qq| AND p.obsolete = '0'|;

   }
   }

+

   if ($form->{itemstatus} eq 'obsolete') {
   if ($form->{itemstatus} eq 'obsolete') {

-    $where .= " AND p.obsolete = '1'";
+    $where .= qq| AND p.obsolete = '1'|;

     $form->{onhand} = $form->{short} = 0;
   }
     $form->{onhand} = $form->{short} = 0;
   }

+

   if ($form->{itemstatus} eq 'onhand') {
   if ($form->{itemstatus} eq 'onhand') {

-    $where .= " AND p.onhand > 0";
+    $where .= qq| AND p.onhand > 0|;

   }
   }

+

   if ($form->{itemstatus} eq 'short') {
   if ($form->{itemstatus} eq 'short') {

-    $where .= " AND p.onhand < p.rop";
-  }
-  if ($form->{make}) {
-    $var = $form->like(lc $form->{make});
-    $where .= " AND p.id IN (SELECT DISTINCT ON (m.parts_id) m.parts_id
-                           FROM makemodel m WHERE lower(m.make) LIKE '$var')";
-  }
-  if ($form->{model}) {
-    $var = $form->like(lc $form->{model});
-    $where .= " AND p.id IN (SELECT DISTINCT ON (m.parts_id) m.parts_id
-                           FROM makemodel m WHERE lower(m.model) LIKE '$var')";
-  }
-  if ($form->{partsgroup}) {
-    $var = $form->like(lc $form->{partsgroup});
-    $where .= " AND lower(pg.partsgroup) LIKE '$var'";
+    $where .= qq| AND p.onhand < p.rop|;

   }
 
   }
 

+  foreach my $column (qw(make model)) {
+    next unless ($form->{$colum});
+    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|;
+    push(@where_values, '%' . $form->{$column} . '%');
+  }

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

-  if ($form->{"sellprice"} ne "") {
-    my $update = "";
-    my $faktor = $form->parse_amount($myconfig,$form->{"sellprice"});
-    if ($form->{"sellprice_type"} eq "percent") {
-      my $faktor = $form->parse_amount($myconfig,$form->{"sellprice"})/100 +1;
-      $update = "sellprice* $faktor";
-    } else {
-      $update = "sellprice+$faktor";
-    }
-  
-    $query = qq|UPDATE parts set sellprice=$update WHERE id IN (SELECT p.id
-                  FROM parts p
-                  LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                  WHERE $where)|;
-    $dbh->do($query);
-  }
-
-  if ($form->{"listprice"} ne "") {
-    my $update = "";
-    my $faktor = $form->parse_amount($myconfig,$form->{"listprice"});
-    if ($form->{"listprice_type"} eq "percent") {
-      my $faktor = $form->parse_amount($myconfig,$form->{"sellprice"})/100 +1;
-      $update = "listprice* $faktor";
-    } else {
-      $update = "listprice+$faktor";
-    }
-  
-    $query = qq|UPDATE parts set listprice=$update WHERE id IN (SELECT p.id
-                  FROM parts p
-                  LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                  WHERE $where)|;
-  
-    $dbh->do($query);
-  }
+  for my $column (qw(sellprice listprice)) {
+    next if ($form->{$column} eq "");

 
 

+    my $value = $form->parse_amount($myconfig, $form->{$column});
+    my $operator = '+';

 
 

+    if ($form->{"${column}_type"} eq "percent") {
+      $value = ($value / 100) + 1;
+      $operator = '*';
+    }

 
 

+    $query =
+      qq|UPDATE parts SET $column = $column $operator ?
+         WHERE id IN
+           (SELECT p.id
+            FROM parts p
+            LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+            WHERE $where)|;
+    do_query($from, $dbh, $query, $value, @where_values);
+  }
+
+  my $q_add =
+    qq|UPDATE prices SET price = price + ?
+       WHERE parts_id IN
+         (SELECT p.id
+          FROM parts p
+          LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+          WHERE $where) AND (pricegroup_id = ?)|;
+  my $sth_add = prepare_query($form, $dbh, $q_add);
+
+  my $q_multiply =
+    qq|UPDATE prices SET price = price * ?
+       WHERE parts_id IN
+         (SELECT p.id
+          FROM parts p
+          LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+          WHERE $where) AND (pricegroup_id = ?)|;
+  my $sth_multiply = prepare_query($form, $dbh, $q_multiply);

 
   for my $i (1 .. $form->{price_rows}) {
 
   for my $i (1 .. $form->{price_rows}) {

+    next if ($form->{"price_$i"} eq "");

 
 

-    my $query = "";
-    
-  
-    if ($form->{"price_$i"} ne "") {
-      my $update = "";
-      my $faktor = $form->parse_amount($myconfig,$form->{"price_$i"});
-      if ($form->{"pricegroup_type_$i"} eq "percent") {
-        my $faktor = $form->parse_amount($myconfig,$form->{"sellprice"})/100 +1;
-        $update = "price* $faktor";
-      } else {
-        $update = "price+$faktor";
-      }
-    
-      $query = qq|UPDATE prices set price=$update WHERE parts_id IN (SELECT p.id
-                    FROM parts p
-                    LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-                    WHERE $where) AND pricegroup_id=$form->{"pricegroup_id_$i"}|;
-    
-      $dbh->do($query);
+    my $value = $form->parse_amount($myconfig, $form->{"price_$i"});
+
+    if ($form->{"pricegroup_type_$i"} eq "percent") {
+      do_statement($form, $sth_multiply, $q_multiply, ($value / 100) + 1, @where_values, conv_i($form->{"pricegroup_id_$i"}));
+    } else {
+      do_statement($form, $sth_add, $q_add, $value, @where_values, conv_i($form->{"pricegroup_id_$i"}));

     }
   }
 
     }
   }
 

-
+  $sth_add->finish();
+  $sth_multiply->finish();

 
   my $rc= $dbh->commit;
   $dbh->disconnect;
 
   my $rc= $dbh->commit;
   $dbh->disconnect;

+

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


@@ -1478,26 +1148,30 @@ sub create_links {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

+  my @values = ('%' . $module . '%');
+

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

-    $query = qq|SELECT c.accno, c.description, c.link, c.id,
-                       p.inventory_accno_id, p.income_accno_id, p.expense_accno_id
-                       FROM chart c, parts p
-                       WHERE c.link LIKE '%$module%'
-                       AND p.id = $form->{id}
-                       ORDER BY c.accno|;
+    $query =
+      qq|SELECT c.accno, c.description, c.link, c.id,
+           p.inventory_accno_id, p.income_accno_id, p.expense_accno_id
+         FROM chart c, parts p
+         WHERE (c.link LIKE ?) AND (p.id = ?)
+         ORDER BY c.accno|;
+    push(@values, conv_i($form->{id}));
+

   } else {
   } else {

-    $query = qq|SELECT c.accno, c.description, c.link, c.id,
-               d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
-               FROM chart c, defaults d
-               WHERE c.link LIKE '%$module%'
-               ORDER BY c.accno|;
+    $query =
+      qq|SELECT c.accno, c.description, c.link, c.id,
+           d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
+         FROM chart c, defaults d
+         WHERE c.link LIKE ?
+         ORDER BY c.accno|;

   }
 
   }
 

-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $sth = prepare_execute_query($form, $dbh, $query, @values);

   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {

-    foreach my $key (split /:/, $ref->{link}) {
-      if ($key =~ /$module/) {
+    foreach my $key (split(/:/, $ref->{link})) {
+      if ($key =~ /\Q$module\E/) {

         if (   ($ref->{id} eq $ref->{inventory_accno_id})
             || ($ref->{id} eq $ref->{income_accno_id})
             || ($ref->{id} eq $ref->{expense_accno_id})) {
         if (   ($ref->{id} eq $ref->{inventory_accno_id})
             || ($ref->{id} eq $ref->{income_accno_id})
             || ($ref->{id} eq $ref->{expense_accno_id})) {


@@ -1518,36 +1192,13 @@ sub create_links {
   $sth->finish;
 
   # get buchungsgruppen
   $sth->finish;
 
   # get buchungsgruppen

-  $query = qq|SELECT id, description
-              FROM buchungsgruppen|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $form->{BUCHUNGSGRUPPEN} = [];
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{BUCHUNGSGRUPPEN} }, $ref;
-  }
-  $sth->finish;
+  $form->{BUCHUNGSGRUPPEN} = selectall_hashref_query($form, $dbh, qq|SELECT id, description FROM buchungsgruppen|);

 
   # get payment terms
 
   # get payment terms

-  $query = qq|SELECT id, description
-              FROM payment_terms
-              ORDER BY sortkey|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $self->{payment_terms} }, $ref;
-  }
-  $sth->finish;
+  $form->{payment_terms} = selectall_hashref_query($form, $dbh, qq|SELECT id, description FROM payment_terms ORDER BY sortkey|);

 
   if (!$form->{id}) {
 
   if (!$form->{id}) {

-    $query = qq|SELECT current_date FROM defaults|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{priceupdate}) = $sth->fetchrow_array;
-    $sth->finish;
+    ($form->{priceupdate}) = selectrow_query($form, $dbh, qq|SELECT current_date|);

   }
 
   $dbh->disconnect;
   }
 
   $dbh->disconnect;


@@ -1560,38 +1211,45 @@ sub get_parts {
 
   my ($self, $myconfig, $form, $sortorder) = @_;
   my $dbh   = $form->dbconnect($myconfig);
 
   my ($self, $myconfig, $form, $sortorder) = @_;
   my $dbh   = $form->dbconnect($myconfig);

-  my $order = " p.partnumber";
-  my $where = "1 = 1";
+  my $order = qq| p.partnumber|;
+  my $where = qq|1 = 1|;
+  my @values;

 
   if ($sortorder eq "all") {
 
   if ($sortorder eq "all") {

-    $where .= " AND p.partnumber LIKE '%$form->{partnumber}%'";
-    $where .= " AND p.description LIKE '%$form->{description}%'";
-  } else {
-    if ($sortorder eq "partnumber") {
-      $where .= " AND p.partnumber LIKE '%$form->{partnumber}%'";
-      $order = qq|p.$sortorder|;
-    }
-    if ($sortorder eq "description") {
-      $where .= " AND p.description LIKE '%$form->{description}%'";
-    }
+    $where .= qq| AND (partnumber ILIKE ?) AND (description ILIKE ?)|;
+    push(@values, '%' . $form->{partnumber} . '%', '%' . $form->{description} . '%');
+
+  } elsif ($sortorder eq "partnumber") {
+    $where .= qq| AND (partnumber ILIKE ?)|;
+    push(@values, '%' . $form->{partnumber} . '%');
+
+  } elsif ($sortorder eq "description") {
+    $where .= qq| AND (description ILIKE ?)|;
+    push(@values, '%' . $form->{description} . '%');
+    $order = "description";
+

   }
 
   my $query =
   }
 
   my $query =

-    qq|SELECT p.id, p.partnumber, p.description, p.unit, p.sellprice FROM parts p WHERE $where ORDER BY $order|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
+    qq|SELECT id, partnumber, description, unit, sellprice
+       FROM parts
+       WHERE $where ORDER BY $order|;
+
+  my $sth = prepare_execute_query($form, $dbh, $query, @values);
+

   my $j = 0;
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     if (($ref->{partnumber} eq "*") && ($ref->{description} eq "")) {
   my $j = 0;
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     if (($ref->{partnumber} eq "*") && ($ref->{description} eq "")) {

-    } else {
-      $j++;
-      $form->{"id_$j"}          = $ref->{id};
-      $form->{"partnumber_$j"}  = $ref->{partnumber};
-      $form->{"description_$j"} = $ref->{description};
-      $form->{"unit_$j"}        = $ref->{unit};
-      $form->{"sellprice_$j"}   = $ref->{sellprice};
-      $form->{"soldtotal_$j"}   = get_soldtotal($dbh, $ref->{id});
-    }    #fi
+      next;
+    }
+
+    $j++;
+    $form->{"id_$j"}          = $ref->{id};
+    $form->{"partnumber_$j"}  = $ref->{partnumber};
+    $form->{"description_$j"} = $ref->{description};
+    $form->{"unit_$j"}        = $ref->{unit};
+    $form->{"sellprice_$j"}   = $ref->{sellprice};
+    $form->{"soldtotal_$j"}   = get_soldtotal($dbh, $ref->{id});

   }    #while
   $form->{rows} = $j;
   $sth->finish;
   }    #while
   $form->{rows} = $j;
   $sth->finish;


@@ -1608,108 +1266,15 @@ sub get_soldtotal {
 
   my ($dbh, $id) = @_;
 
 
   my ($dbh, $id) = @_;
 

-  my $query =
-    qq|SELECT sum(i.qty) as totalsold FROM invoice i WHERE i.parts_id = $id|;
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $sum = 0;
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-    $sum = $ref->{totalsold};
-  }    #while
-  $sth->finish;
-
-  if ($sum eq undef) {
-    $sum = 0;
-  }    #fi
+  my $query = qq|SELECT sum(qty) FROM invoice WHERE parts_id = ?|;
+  my ($sum) = selectrow_query($form, $dbh, $query, conv_i($id));
+  $sum ||= 0;

 
   $main::lxdebug->leave_sub();
 
   return $sum;
 }    #end get_soldtotal
 
 
   $main::lxdebug->leave_sub();
 
   return $sum;
 }    #end get_soldtotal
 

-sub retrieve_item {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-  my $i     = $form->{rowcount};
-  my $where = "NOT p.obsolete = '1'";
-
-  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'";
-  }
-
-  if ($form->{"partsgroup_$i"}) {
-    my $partsgroup = $form->like(lc $form->{"partsgroup_$i"});
-    $where .= " AND lower(pg.partsgroup) LIKE '$partsgroup'";
-  }
-
-  if ($form->{"description_$i"}) {
-    $where .= " ORDER BY description";
-  } else {
-    $where .= " ORDER BY partnumber";
-  }
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  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);
-
-  #while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-  # get tax rates and description
-  #$accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{inventory_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)) {
-
-  #   $form->{"$ptr->{accno}_rate"} = $ptr->{rate};
-  #  $form->{"$ptr->{accno}_description"} = $ptr->{description};
-  #   $form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
-  #   $form->{taxaccounts} .= "$ptr->{accno} ";
-  #   $ref->{taxaccounts} .= "$ptr->{accno} ";
-
-  #}
-
-  #$stw->finish;
-  #chop $ref->{taxaccounts};
-
-  push @{ $form->{item_list} }, $ref;
-
-  #}
-  $sth->finish;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-

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


@@ -1718,31 +1283,30 @@ sub retrieve_languages {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  if ($form->{id}) {
-    $where .= "tr.parts_id=$form->{id}";
-  }
-
+  my @values;
+  my $where;

 
   if ($form->{language_values} ne "") {
 
   if ($form->{language_values} ne "") {

-  $query = qq|SELECT l.id, l.description, tr.translation, tr.longdescription
-                 FROM language l LEFT OUTER JOIN translation tr ON (tr.language_id=l.id AND $where)|;
+    $query =
+      qq|SELECT l.id, l.description, tr.translation, tr.longdescription
+         FROM language l
+         LEFT OUTER JOIN translation tr ON (tr.language_id = l.id) AND (tr.parts_id = ?)
+         ORDER BY lower(l.description)|;
+    @values = (conv_i($form->{id}));
+

   } else {
   } else {

-  $query = qq|SELECT l.id, l.description
-                 FROM language l|;
+    $query = qq|SELECT id, description
+                FROM language
+                ORDER BY lower(description)|;

   }
   }

-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);

 
 

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push(@{$languages}, $ref);
-  }
-  $sth->finish;
+  my $languages = selectall_hashref_query($form, $dbh, $query, @values);

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

-  return $languages;

 
 

+  return $languages;

 }
 
 sub follow_account_chain {
 }
 
 sub follow_account_chain {


@@ -1755,15 +1319,15 @@ sub follow_account_chain {
   my ($query, $sth);
 
   $query =
   my ($query, $sth);
 
   $query =

-    "SELECT c.new_chart_id, date($transdate) >= c.valid_from AS is_valid, " .
-    "  cnew.accno " .
-    "FROM chart c " .
-    "LEFT JOIN chart cnew ON c.new_chart_id = cnew.id " .
-    "WHERE (c.id = ?) AND NOT c.new_chart_id ISNULL AND (c.new_chart_id > 0)";
-  $sth = $dbh->prepare($query);
+    qq|SELECT c.new_chart_id, date($transdate) >= c.valid_from AS is_valid, | .
+    qq|  cnew.accno | .
+    qq|FROM chart c | .
+    qq|LEFT JOIN chart cnew ON c.new_chart_id = cnew.id | .
+    qq|WHERE (c.id = ?) AND NOT c.new_chart_id ISNULL AND (c.new_chart_id > 0)|;
+  $sth = prepare_query($form, $dbh, $query);

 
   while (1) {
 
   while (1) {

-    $sth->execute($accno_id) || $form->dberror($query . " ($accno_id)");
+    do_statement($form, $sth, $query, $accno_id);

     $ref = $sth->fetchrow_hashref();
     last unless ($ref && $ref->{"is_valid"} &&
                  !grep({ $_ == $ref->{"new_chart_id"} } @visited_accno_ids));
     $ref = $sth->fetchrow_hashref();
     last unless ($ref && $ref->{"is_valid"} &&
                  !grep({ $_ == $ref->{"new_chart_id"} } @visited_accno_ids));


@@ -1780,13 +1344,13 @@ sub follow_account_chain {
 sub retrieve_accounts {
   $main::lxdebug->enter_sub(2);
 
 sub retrieve_accounts {
   $main::lxdebug->enter_sub(2);
 

-  my ($self, $myconfig, $form, $parts_id, $index, $copy_accnos) = @_;
+  my ($self, $myconfig, $form, $parts_id, $index) = @_;

 
   my ($query, $sth, $dbh);
 
   $form->{"taxzone_id"} *= 1;
 
 
   my ($query, $sth, $dbh);
 
   $form->{"taxzone_id"} *= 1;
 

-  $dbh = $form->dbconnect($myconfig);
+  $dbh = $form->get_standard_dbh($myconfig);

 
   my $transdate = "";
   if ($form->{type} eq "invoice") {
 
   my $transdate = "";
   if ($form->{type} eq "invoice") {


@@ -1795,7 +1359,7 @@ sub retrieve_accounts {
     } else {
       $transdate = $form->{deliverydate};
     }
     } else {
       $transdate = $form->{deliverydate};
     }

-  } elsif ($form->{type} eq "credit_note") {
+  } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {

     $transdate = $form->{invdate};
   } else {
     $transdate = $form->{transdate};
     $transdate = $form->{invdate};
   } else {
     $transdate = $form->{transdate};


@@ -1808,31 +1372,23 @@ sub retrieve_accounts {
   }
 
   $query =
   }
 
   $query =

-    "SELECT " .
-    "  p.inventory_accno_id AS is_part, " .
-    "  bg.inventory_accno_id, " .
-    "  bg.income_accno_id_$form->{taxzone_id} AS income_accno_id, " .
-    "  bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id, " .
-    "  c1.accno AS inventory_accno, " .
-    "  c2.accno AS income_accno, " .
-    "  c3.accno AS expense_accno " .
-    "FROM parts p " .
-    "LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id " .
-    "LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id " .
-    "LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id " .
-    "LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id " .
-    "WHERE p.id = ?";
-  $sth = $dbh->prepare($query);
-  $sth->execute($parts_id) || $form->dberror($query . " ($parts_id)");
-  my $ref = $sth->fetchrow_hashref();
-  $sth->finish();
-
-#   $main::lxdebug->message(0, "q $query");
-
-  if (!$ref) {
-    $dbh->disconnect();
-    return $main::lxdebug->leave_sub(2);
-  }
+    qq|SELECT | .
+    qq|  p.inventory_accno_id AS is_part, | .
+    qq|  bg.inventory_accno_id, | .
+    qq|  bg.income_accno_id_$form->{taxzone_id} AS income_accno_id, | .
+    qq|  bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id, | .
+    qq|  c1.accno AS inventory_accno, | .
+    qq|  c2.accno AS income_accno, | .
+    qq|  c3.accno AS expense_accno | .
+    qq|FROM parts p | .
+    qq|LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id | .
+    qq|LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id | .
+    qq|LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id | .
+    qq|LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id | .
+    qq|WHERE p.id = ?|;
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, $parts_id);
+
+  return $main::lxdebug->leave_sub(2) if (!$ref);

 
   $ref->{"inventory_accno_id"} = undef unless ($ref->{"is_part"});
 
 
   $ref->{"inventory_accno_id"} = undef unless ($ref->{"is_part"});
 


@@ -1852,20 +1408,15 @@ sub retrieve_accounts {
   my $accno_id = $accounts{"${inc_exp}_accno_id"};
 
   $query =
   my $accno_id = $accounts{"${inc_exp}_accno_id"};
 
   $query =

-    "SELECT c.accno, t.taxdescription AS description, 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 = ? AND startdate <= " . quote_db_date($transdate) .
-    "   ORDER BY startdate DESC LIMIT 1) ";
-  @vars = ($accno_id);
-  $sth = $dbh->prepare($query);
-  $sth->execute(@vars) || $form->dberror("$query (" . join(', ', @vars) . ")");
-  $ref = $sth->fetchrow_hashref();
-  $sth->finish();
-  $dbh->disconnect();
+    qq|SELECT c.accno, t.taxdescription AS description, t.rate, t.taxnumber | .
+    qq|FROM tax t | .
+    qq|LEFT JOIN chart c ON c.id = t.chart_id | .
+    qq|WHERE t.id IN | .
+    qq|  (SELECT tk.tax_id | .
+    qq|   FROM taxkeys tk | .
+    qq|   WHERE tk.chart_id = ? AND startdate <= | . quote_db_date($transdate) .
+    qq|   ORDER BY startdate DESC LIMIT 1) |;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $accno_id);

 
   unless ($ref) {
     $main::lxdebug->leave_sub(2);
 
   unless ($ref) {
     $main::lxdebug->leave_sub(2);


@@ -1888,4 +1439,113 @@ sub retrieve_accounts {
   $main::lxdebug->leave_sub(2);
 }
 
   $main::lxdebug->leave_sub(2);
 }
 

+sub get_basic_part_info {
+  $main::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  Common::check_params(\%params, qw(id));
+
+  my @ids      = 'ARRAY' eq ref $params{id} ? @{ $params{id} } : ($params{id});
+
+  if (!scalar @ids) {
+    $main::lxdebug->leave_sub();
+    return ();
+  }
+
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
+
+  my $dbh      = $form->get_standard_dbh($myconfig);
+
+  my $query    = qq|SELECT id, partnumber, description, unit FROM parts WHERE id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)|;
+
+  my $info     = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids);
+
+  if ('' eq ref $params{id}) {
+    $info = $info->[0] || { };
+
+    $main::lxdebug->leave_sub();
+    return $info;
+  }
+
+  my %info_map = map { $_->{id} => $_ } @{ $info };
+
+  $main::lxdebug->leave_sub();
+
+  return %info_map;
+}
+
+sub prepare_parts_for_printing {
+  $main::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
+
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
+
+  my $prefix   = $params{prefix} || 'id_';
+  my $rowcount = defined $params{rowcount} ? $params{rowcount} : $form->{rowcount};
+
+  my @part_ids = keys %{ { map { $_ => 1 } grep { $_ } map { $form->{"${prefix}${_}"} } (1 .. $rowcount) } };
+
+  if (!@part_ids) {
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
+  my $placeholders = join ', ', ('?') x scalar(@part_ids);
+  my $query        = qq|SELECT mm.parts_id, mm.model, v.name AS make
+                        FROM makemodel mm
+                        LEFT JOIN vendor v ON (mm.make = cast (v.id as text))
+                        WHERE mm.parts_id IN ($placeholders)|;
+
+  my %makemodel    = ();
+
+  my $sth          = prepare_execute_query($form, $dbh, $query, @part_ids);
+
+  while (my $ref = $sth->fetchrow_hashref()) {
+    $makemodel{$ref->{parts_id}} ||= [];
+    push @{ $makemodel{$ref->{parts_id}} }, $ref;
+  }
+
+  $sth->finish();
+
+  my @columns = qw(ean);
+
+  $query      = qq|SELECT id, | . join(', ', @columns) . qq|
+                   FROM parts
+                   WHERE id IN ($placeholders)|;
+
+  my %data    = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
+
+  map { $form->{$_} = [] } (qw(make model), @columns);
+
+  foreach my $i (1 .. $rowcount) {
+    my $id = $form->{"${prefix}${i}"};
+
+    next if (!$id);
+
+    foreach (@columns) {
+      push @{ $form->{$_} }, $data{$id}->{$_};
+    }
+
+    push @{ $form->{make} },  [];
+    push @{ $form->{model} }, [];
+
+    next if (!$makemodel{$id});
+
+    foreach my $ref (@{ $makemodel{$id} }) {
+      map { push @{ $form->{$_}->[-1] }, $ref->{$_} } qw(make model);
+    }
+  }
+
+  $main::lxdebug->leave_sub();
+}
+
+

 1;
 1;