Auftrags-Controller: Einheiten per Select ändern können und sellprice anpassen.

[mfinanz.git] / SL / IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index 8c2242d484ab8f1c9986d33ad39b1ec34cef9aea..dc86484b39f7050e52ffec23f8194fd091d1ae25 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -35,11 +35,15 @@
 package IC;
 
 use Data::Dumper;
 package IC;
 
 use Data::Dumper;

-use List::MoreUtils qw(all);
+use List::MoreUtils qw(all any uniq);

 use YAML;
 
 use SL::CVar;
 use SL::DBUtils;
 use YAML;
 
 use SL::CVar;
 use SL::DBUtils;

+use SL::HTML::Restrict;
+use SL::TransNumber;
+
+use strict;

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


@@ -47,7 +51,7 @@ sub get_part {
   my ($self, $myconfig, $form) = @_;
 
   # connect to db
   my ($self, $myconfig, $form) = @_;
 
   # connect to db

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

 
   my $sth;
 
 
   my $sth;
 


@@ -68,11 +72,10 @@ sub get_part {
   # copy to $form variables
   map { $form->{$_} = $ref->{$_} } (keys %{$ref});
 
   # copy to $form variables
   map { $form->{$_} = $ref->{$_} } (keys %{$ref});
 

+  $form->{mtime} = $form->{itime} if !$form->{mtime};
+  $form->{lastmtime} = $form->{mtime};

   $form->{onhand} *= 1;
 
   $form->{onhand} *= 1;
 

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

   # part or service item
   $form->{item} = ($form->{inventory_accno}) ? 'part' : 'service';
   if ($form->{assembly}) {
   # part or service item
   $form->{item} = ($form->{inventory_accno}) ? 'part' : 'service';
   if ($form->{assembly}) {


@@ -88,7 +91,7 @@ sub get_part {
          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 = ?)
          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}}|;
+         ORDER BY a.oid|;

     $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
 
     $form->{assembly_rows} = 0;
     $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
 
     $form->{assembly_rows} = 0;


@@ -109,107 +112,50 @@ 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
   # 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|;
-  $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
-
-  #for pricegroups
-  my $i = 1;
-  while (($form->{"klass_$i"}, $form->{"pricegroup_id_$i"},
-          $form->{"price_$i"}, $form->{"pricegroup_$i"})
-         = $sth->fetchrow_array()) {
-    push @pricegroups, $form->{"pricegroup_id_$i"};
-    $i++;
+  $query = <<SQL;
+    SELECT pg.pricegroup, pg.id AS pricegroup_id, COALESCE(pr.price, 0) AS price
+    FROM pricegroup pg
+    LEFT JOIN prices pr ON (pr.pricegroup_id = pg.id) AND (pr.parts_id = ?)
+    ORDER BY lower(pg.pricegroup)
+SQL
+
+  my $row = 1;
+  foreach $ref (selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}))) {
+    $form->{"${_}_${row}"} = $ref->{$_} for qw(pricegroup_id pricegroup price);
+    $row++;

   }
   }

-
-  $sth->finish;
-
-  # get pricegroups
-  $query = qq|SELECT id, pricegroup FROM pricegroup|;
-  $form->{PRICEGROUPS} = selectall_hashref_query($form, $dbh, $query);
-
-  #find not used pricegroups
-  while (my $tmp = pop(@{ $form->{PRICEGROUPS} })) {
-    my $in_use = 0;
-    foreach my $item (@pricegroups) {
-      if ($item eq $tmp->{id}) {
-        $in_use = 1;
-        last;
-      }
-    }
-    push(@pricegroups_not_used, $tmp) unless ($in_use);
-  }
-
-  # if not used pricegroups are avaible
-  if (@pricegroups_not_used) {
-
-    foreach my $name (@pricegroups_not_used) {
-      $form->{"klass_$i"} = "$name->{id}";
-      $form->{"pricegroup_id_$i"} = "$name->{id}";
-      $form->{"pricegroup_$i"}    = "$name->{pricegroup}";
+  $form->{price_rows} = $row - 1;
+
+  # get makes
+  if ($form->{makemodel}) {
+  #hli
+    $query = qq|SELECT m.make, m.model,m.lastcost,m.lastcost,m.lastupdate,m.sortorder FROM makemodel m | .
+             qq|WHERE m.parts_id = ? order by m.sortorder asc|;
+    my @values = ($form->{id});
+    $sth = $dbh->prepare($query);
+    $sth->execute(@values) || $form->dberror("$query (" . join(', ', @values) . ")");
+
+    my $i = 1;
+
+    while (($form->{"make_$i"}, $form->{"model_$i"}, $form->{"old_lastcost_$i"},
+              $form->{"lastcost_$i"}, $form->{"lastupdate_$i"}, $form->{"sortorder_$i"}) = $sth->fetchrow_array)
+    {

       $i++;
     }
       $i++;
     }

-  }
-
-  #correct rows
-  $form->{price_rows} = $i - 1;
-
-  unless ($form->{item} eq 'service') {
-
-    # get makes
-    if ($form->{makemodel}) {
-      $query = qq|SELECT m.make, m.model FROM makemodel m | .
-               qq|WHERE m.parts_id = ?|;
-      my @values = ($form->{id});
-      $sth = $dbh->prepare($query);
-      $sth->execute(@values) || $form->dberror("$query (" . join(', ', @values) . ")");
-
-      my $i = 1;
-      while (($form->{"make_$i"}, $form->{"model_$i"}) = $sth->fetchrow_array)
-      {
-        $i++;
-      }
-      $sth->finish;
-      $form->{makemodel_rows} = $i - 1;
+    $sth->finish;
+    $form->{makemodel_rows} = $i - 1;

 
 

-    }

   }
 
   # get translations
   }
 
   # get translations

-  $form->{language_values} = "";

   $query = qq|SELECT language_id, translation, longdescription
               FROM translation
               WHERE parts_id = ?|;
   $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
-  $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 (my ($key) = $sth->fetchrow_array) {
-    $form->{amount}{$key} = $key;
-  }
-
-  $sth->finish;
+  $form->{translations} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));

 
   # is it an orphan
 
   # is it an orphan

-  my @referencing_tables = qw(invoice orderitems inventory rmaitems);
+  my @referencing_tables = qw(invoice orderitems inventory);

   my %column_map         = ( );
   my $parts_id           = conv_i($form->{id});
 
   my %column_map         = ( );
   my $parts_id           = conv_i($form->{id});
 


@@ -228,7 +174,7 @@ sub get_part {
 
   $form->{"unit_changeable"} = $form->{orphaned};
 
 
   $form->{"unit_changeable"} = $form->{orphaned};
 

-  $dbh->disconnect;
+  Common::webdav_folder($form) if $::lx_office_conf{features}{webdav};

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


@@ -238,10 +184,10 @@ sub get_pricegroups {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

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

 
   # get pricegroups
 
   # get pricegroups

-  my $query = qq|SELECT id, pricegroup FROM pricegroup|;
+  my $query = qq|SELECT id, pricegroup FROM pricegroup ORDER BY lower(pricegroup)|;

   my $pricegroups = selectall_hashref_query($form, $dbh, $query);
 
   my $i = 1;
   my $pricegroups = selectall_hashref_query($form, $dbh, $query);
 
   my $i = 1;


@@ -256,8 +202,6 @@ sub get_pricegroups {
   #correct rows
   $form->{price_rows} = $i - 1;
 
   #correct rows
   $form->{price_rows} = $i - 1;
 

-  $dbh->disconnect;
-

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


@@ -270,7 +214,7 @@ sub retrieve_buchungsgruppen {
 
   my ($query, $sth);
 
 
   my ($query, $sth);
 

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

 
   # get buchungsgruppen
   $query = qq|SELECT id, description FROM buchungsgruppen ORDER BY sortkey|;
 
   # get buchungsgruppen
   $query = qq|SELECT id, description FROM buchungsgruppen ORDER BY sortkey|;


@@ -285,7 +229,8 @@ sub save {
   my ($self, $myconfig, $form) = @_;
   my @values;
   # connect to database, turn off AutoCommit
   my ($self, $myconfig, $form) = @_;
   my @values;
   # connect to database, turn off AutoCommit

-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $form->get_standard_dbh;
+  my $restricter = SL::HTML::Restrict->create;

 
   # save the part
   # make up a unique handle and store in partnumber field
 
   # save the part
   # make up a unique handle and store in partnumber field


@@ -300,7 +245,7 @@ sub save {
   map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }
     qw(rop weight listprice sellprice gv lastcost);
 
   map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }
     qw(rop weight listprice sellprice gv lastcost);
 

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

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


@@ -309,6 +254,11 @@ sub save {
   my $priceupdate = ', priceupdate = current_date';
 
   if ($form->{id}) {
   my $priceupdate = ', priceupdate = current_date';
 
   if ($form->{id}) {

+    my $trans_number = SL::TransNumber->new(type => $form->{item}, dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
+    if (!$trans_number->is_unique) {
+      $::lxdebug->leave_sub;
+      return 3;
+    }

 
     # get old price
     $query = qq|SELECT sellprice, weight FROM parts WHERE id = ?|;
 
     # get old price
     $query = qq|SELECT sellprice, weight FROM parts WHERE id = ?|;


@@ -322,19 +272,14 @@ sub save {
     }
     $sth->finish;
 
     }
     $sth->finish;
 

-    if ($form->{item} ne 'service') {
-      # delete makemodel records
-      do_query($form, $dbh, qq|DELETE FROM makemodel WHERE parts_id = ?|, conv_i($form->{id}));
-    }
+    # delete makemodel records
+    do_query($form, $dbh, qq|DELETE FROM makemodel WHERE parts_id = ?|, conv_i($form->{id}));

 
     if ($form->{item} eq 'assembly') {
       # delete assembly records
       do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));
     }
 
 
     if ($form->{item} eq 'assembly') {
       # delete assembly records
       do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));
     }
 

-    # delete tax records
-    do_query($form, $dbh, qq|DELETE FROM partstax WHERE parts_id = ?|, conv_i($form->{id}));
-

     # delete translations
     do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 
     # delete translations
     do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 


@@ -344,25 +289,21 @@ sub save {
     $priceupdate        = '' if (all { $previous_values->{$_} == $form->{$_} } qw(sellprice lastcost listprice));
 
   } else {
     $priceupdate        = '' if (all { $previous_values->{$_} == $form->{$_} } qw(sellprice lastcost listprice));
 
   } else {

-    my ($count) = selectrow_query($form, $dbh, qq|SELECT COUNT(*) FROM parts WHERE partnumber = ?|, $form->{partnumber});
-    if ($count) {
-      $main::lxdebug->leave_sub();
+    my $trans_number = SL::TransNumber->new(type => $form->{item}, dbh => $dbh, number => $form->{partnumber}, save => 1);
+
+    if ($form->{partnumber} && !$trans_number->is_unique) {
+      $::lxdebug->leave_sub;

       return 3;
     }
 
       return 3;
     }
 

+    $form->{partnumber} ||= $trans_number->create_unique;
+

     ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|);
     ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|);

-    do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber) VALUES (?, '')|, $form->{id});
+    do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber, unit) VALUES (?, ?, ?)|, $form->{id}, $form->{partnumber}, $form->{unit});

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

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

   }
   }

-  my $partsgroup_id = 0;
+  my $partsgroup_id = undef;

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


@@ -380,13 +321,15 @@ sub save {
 
   if ($form->{"item"} ne "assembly") {
     $subq_expense =
 
   if ($form->{"item"} ne "assembly") {
     $subq_expense =

-      qq|(SELECT bg.expense_accno_id_0
-          FROM buchungsgruppen bg
-          WHERE bg.id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq|)|;
+      qq|(SELECT tc.expense_accno_id
+          FROM taxzone_charts tc
+          WHERE tc.buchungsgruppen_id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq| and tc.taxzone_id = 0)|;

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

+  normalize_text_blocks();
+

   $query =
     qq|UPDATE parts SET
          partnumber = ?,
   $query =
     qq|UPDATE parts SET
          partnumber = ?,


@@ -402,11 +345,12 @@ sub save {
          notes = ?,
          formel = ?,
          rop = ?,
          notes = ?,
          formel = ?,
          rop = ?,

-         bin = ?,
+         warehouse_id = ?,
+         bin_id = ?,

          buchungsgruppen_id = ?,
          payment_id = ?,
          inventory_accno_id = $subq_inventory,
          buchungsgruppen_id = ?,
          payment_id = ?,
          inventory_accno_id = $subq_inventory,

-         income_accno_id = (SELECT bg.income_accno_id_0 FROM buchungsgruppen bg WHERE bg.id = ?),
+         income_accno_id = (SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = 0 and tc.buchungsgruppen_id = ?),

          expense_accno_id = $subq_expense,
          obsolete = ?,
          image = ?,
          expense_accno_id = $subq_expense,
          obsolete = ?,
          image = ?,


@@ -415,6 +359,7 @@ sub save {
          ve = ?,
          gv = ?,
          ean = ?,
          ve = ?,
          gv = ?,
          ean = ?,

+         has_sernumber = ?,

          not_discountable = ?,
          microfiche = ?,
          partsgroup_id = ?,
          not_discountable = ?,
          microfiche = ?,
          partsgroup_id = ?,


@@ -430,10 +375,11 @@ sub save {
              $form->{lastcost},
              $form->{weight},
              $form->{unit},
              $form->{lastcost},
              $form->{weight},
              $form->{unit},

-             $form->{notes},
+             $restricter->process($form->{notes}),

              $form->{formel},
              $form->{rop},
              $form->{formel},
              $form->{rop},

-             $form->{bin},
+             conv_i($form->{warehouse_id}),
+             conv_i($form->{bin_id}),

              conv_i($form->{buchungsgruppen_id}),
              conv_i($form->{payment_id}),
              conv_i($form->{buchungsgruppen_id}),
              conv_i($form->{buchungsgruppen_id}),
              conv_i($form->{payment_id}),
              conv_i($form->{buchungsgruppen_id}),


@@ -444,6 +390,7 @@ sub save {
              conv_i($form->{ve}),
              conv_i($form->{gv}),
              $form->{ean},
              conv_i($form->{ve}),
              conv_i($form->{gv}),
              $form->{ean},

+             $form->{has_sernumber} ? 't' : 'f',

              $form->{not_discountable} ? 't' : 'f',
              $form->{microfiche},
              conv_i($partsgroup_id),
              $form->{not_discountable} ? 't' : 'f',
              $form->{microfiche},
              conv_i($partsgroup_id),


@@ -455,68 +402,78 @@ sub save {
   # delete translation records
   do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 
   # delete translation records
   do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
 

-  if ($form->{language_values} ne "") {
-    foreach my $item (split(/---\+\+\+---/, $form->{language_values})) {
-      my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
-      if ($translation ne "") {
-        $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);
-      }
+  my @translations = grep { $_->{language_id} && $_->{translation} } @{ $form->{translations} || [] };
+  if (@translations) {
+    $query = qq|INSERT into translation (parts_id, language_id, translation, longdescription)
+                VALUES ( ?, ?, ?, ? )|;
+    $sth   = $dbh->prepare($query);
+
+    foreach my $translation (@translations) {
+      do_statement($form, $sth, $query, conv_i($form->{id}), conv_i($translation->{language_id}), $translation->{translation}, $restricter->process($translation->{longdescription}));

     }
     }

+
+    $sth->finish();

   }
 
   # delete price records
   do_query($form, $dbh, qq|DELETE FROM prices WHERE parts_id = ?|, conv_i($form->{id}));
 
   }
 
   # delete price records
   do_query($form, $dbh, qq|DELETE FROM prices WHERE parts_id = ?|, conv_i($form->{id}));
 

-  # insert price records only if different to sellprice
+  $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) VALUES(?, ?, ?)|;
+  $sth   = prepare_query($form, $dbh, $query);
+

   for my $i (1 .. $form->{price_rows}) {
     my $price = $form->parse_amount($myconfig, $form->{"price_$i"});
   for my $i (1 .. $form->{price_rows}) {
     my $price = $form->parse_amount($myconfig, $form->{"price_$i"});

-    if ($price == 0) {
-      $form->{"price_$i"} = $form->{sellprice};
-    }
-    if (
-        (   $price
-         || $form->{"klass_$i"}
-         || $form->{"pricegroup_id_$i"})
-        and $price != $form->{sellprice}
-      ) {
-      #$klass = $form->parse_amount($myconfig, $form->{"klass_$i"});
-      $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) | .
-               qq|VALUES(?, ?, ?)|;
-      @values = (conv_i($form->{id}), conv_i($form->{"pricegroup_id_$i"}), $price);
-      do_query($form, $dbh, $query, @values);
-    }
+    next unless $price;
+
+    @values = (conv_i($form->{id}), conv_i($form->{"pricegroup_id_$i"}), $price);
+    do_statement($form, $sth, $query, @values);

   }
 
   }
 

+  $sth->finish;
+

   # insert makemodel records
   # insert makemodel records

-  unless ($form->{item} eq 'service') {
+    my $lastupdate = '';
+    my $value = 0;

     for my $i (1 .. $form->{makemodel_rows}) {
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {
     for my $i (1 .. $form->{makemodel_rows}) {
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {

-
-        $query = qq|INSERT INTO makemodel (parts_id, make, model) | .
-                            qq|VALUES (?, ?, ?)|;
-                   @values = (conv_i($form->{id}), conv_i($form->{"make_$i"}), $form->{"model_$i"});
+        #hli
+        $value = $form->parse_amount($myconfig, $form->{"lastcost_$i"});
+        if ($value == $form->parse_amount($myconfig, $form->{"old_lastcost_$i"}))
+        {
+            if ($form->{"lastupdate_$i"} eq "") {
+                $lastupdate = 'now()';
+            } else {
+                $lastupdate = $dbh->quote($form->{"lastupdate_$i"});
+            }
+        } else {
+            $lastupdate = 'now()';
+        }
+        $query = qq|INSERT INTO makemodel (parts_id, make, model, lastcost, lastupdate, sortorder) | .
+                 qq|VALUES (?, ?, ?, ?, ?, ?)|;
+        @values = (conv_i($form->{id}), conv_i($form->{"make_$i"}), $form->{"model_$i"}, $value, $lastupdate, conv_i($form->{"sortorder_$i"}) );

 
         do_query($form, $dbh, $query, @values);
       }
     }
 
         do_query($form, $dbh, $query, @values);
       }
     }

-  }
-
-  # insert taxes
-  foreach my $item (split(/ /, $form->{taxaccounts})) {
-    if ($form->{"IC_tax_$item"}) {
-      $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);
-    }
-  }

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

+    # check additional assembly row
+    my $i = $form->{assembly_rows};
+    # if last row is not empty add them
+    if ($form->{"partnumber_$i"} ne "") {
+      $query = qq|SELECT id FROM parts WHERE partnumber = ?|;
+      my ($partid) = selectrow_query($form, $dbh, $query,$form->{"partnumber_$i"} );
+      if ( $partid ) {
+        $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+        $form->{"id_$i"} = $partid;
+        $form->{"bom_$i"} = 0;
+        $form->{assembly_rows}++;
+      }
+      else {
+        $::form->error($::locale->text("uncorrect partnumber ").$form->{"partnumber_$i"});
+      }
+    }

 
     for my $i (1 .. $form->{assembly_rows}) {
       $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
 
     for my $i (1 .. $form->{assembly_rows}) {
       $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});


@@ -524,12 +481,11 @@ sub save {
       if ($form->{"qty_$i"} != 0) {
         $form->{"bom_$i"} *= 1;
         $query = qq|INSERT INTO assembly (id, parts_id, qty, bom) | .
       if ($form->{"qty_$i"} != 0) {
         $form->{"bom_$i"} *= 1;
         $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');
+                 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);
       }
     }
         do_query($form, $dbh, $query, @values);
       }
     }

-

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


@@ -566,14 +522,28 @@ sub save {
     }
   }
 
     }
   }
 

-  CVar->save_custom_variables('dbh'       => $dbh,
-                              'module'    => 'IC',
-                              'trans_id'  => $form->{id},
-                              'variables' => $form);
+  CVar->save_custom_variables(dbh           => $dbh,
+                              module        => 'IC',
+                              trans_id      => $form->{id},
+                              variables     => $form,
+                              save_validity => 1);
+
+  # Delete saved custom variable values for configs that have been
+  # marked invalid for this part.
+  $query = <<SQL;
+    DELETE FROM custom_variables
+    WHERE (config_id IN (
+        SELECT val.config_id
+        FROM custom_variables_validity val
+        LEFT JOIN custom_variable_configs val_cfg ON (val.config_id = val_cfg.id)
+        WHERE (val_cfg.module = 'IC')
+          AND (val.trans_id   = ?)))
+      AND (trans_id = ?)
+SQL
+  do_query($form, $dbh, $query, ($form->{id}) x 2);

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

-  $dbh->disconnect;

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


@@ -609,7 +579,7 @@ sub retrieve_assemblies {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

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

 
   my $where = qq|NOT p.obsolete|;
   my @values;
 
   my $where = qq|NOT p.obsolete|;
   my @values;


@@ -627,7 +597,7 @@ sub retrieve_assemblies {
   # retrieve assembly items
   my $query =
     qq|SELECT p.id, p.partnumber, p.description,
   # retrieve assembly items
   my $query =
     qq|SELECT p.id, p.partnumber, p.description,

-         p.bin, p.onhand, p.rop,
+              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
          (SELECT sum(p2.inventory_accno_id)
           FROM parts p2, assembly a
           WHERE (p2.id = a.parts_id) AND (a.id = p.id)) AS inventory


@@ -636,8 +606,6 @@ sub retrieve_assemblies {
 
   $form->{assembly_items} = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   $form->{assembly_items} = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $dbh->disconnect;
-

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


@@ -647,18 +615,17 @@ sub delete {
   my ($self, $myconfig, $form) = @_;
   my @values = (conv_i($form->{id}));
   # connect to database, turn off AutoCommit
   my ($self, $myconfig, $form) = @_;
   my @values = (conv_i($form->{id}));
   # connect to database, turn off AutoCommit

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

 
   my %columns = ( "assembly" => "id", "parts" => "id" );
 
 
   my %columns = ( "assembly" => "id", "parts" => "id" );
 

-  for my $table (qw(prices partstax makemodel inventory assembly license translation parts)) {
+  for my $table (qw(prices makemodel inventory assembly translation parts)) {

     my $column = defined($columns{$table}) ? $columns{$table} : "parts_id";
     do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values);
   }
 
   # commit
   my $rc = $dbh->commit;
     my $column = defined($columns{$table}) ? $columns{$table} : "parts_id";
     do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values);
   }
 
   # commit
   my $rc = $dbh->commit;

-  $dbh->disconnect;

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


@@ -688,6 +655,12 @@ sub assembly_item {
     push(@values, conv_i($form->{id}));
   }
 
     push(@values, conv_i($form->{id}));
   }
 

+  # Search for part ID overrides all other criteria.
+  if ($form->{"id_${i}"}) {
+    $where  = qq|p.id = ?|;
+    @values = ($form->{"id_${i}"});
+  }
+

   if ($form->{partnumber}) {
     $where .= qq| ORDER BY p.partnumber|;
   } else {
   if ($form->{partnumber}) {
     $where .= qq| ORDER BY p.partnumber|;
   } else {


@@ -695,7 +668,7 @@ sub assembly_item {
   }
 
   # connect to database
   }
 
   # connect to database

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

 
   my $query =
     qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
 
   my $query =
     qq|SELECT p.id, p.partnumber, p.description, p.sellprice,


@@ -707,8 +680,6 @@ sub assembly_item {
        WHERE $where|;
   $form->{item_list} = selectall_hashref_query($form, $dbh, $query, @values);
 
        WHERE $where|;
   $form->{item_list} = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $dbh->disconnect;
-

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


@@ -725,7 +696,7 @@ sub assembly_item {
 #   partnumber ean description partsgroup microfiche drawing
 #
 # column flags:
 #   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
+#   l_partnumber l_description l_listprice l_sellprice l_lastcost l_priceupdate l_weight l_unit l_rop l_image l_drawing l_microfiche l_partsgroup

 #
 # exclusives:
 #   itemstatus  = active | onhand | short | obsolete | orphaned
 #
 # exclusives:
 #   itemstatus  = active | onhand | short | obsolete | orphaned


@@ -747,17 +718,16 @@ sub assembly_item {
 #
 # not working:
 #   onhand                                   - as above, but masking the simple itemstatus results (doh!)
 #
 # not working:
 #   onhand                                   - as above, but masking the simple itemstatus results (doh!)

-#   masking of onhand in bsooqr mode         - ToDO: fixme

 #   warehouse onhand
 #   warehouse onhand

+#   search by overrides of description

 #
 # disabled sanity checks and changes:
 #  - searchitems = assembly will no longer disable bought
 #
 # 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
+#  - 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
 #  - 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 {
 #  - 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 {


@@ -770,39 +740,49 @@ sub all_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);
   $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 @project_filters      = qw(projectnumber projectdescription);

   my @makemodel_filters    = qw(make model);
   my @invoice_oi_filters   = qw(serialnumber soldtotal);
   my @apoe_filters         = qw(transdate);
   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 @like_filters         = (@simple_filters, @invoice_oi_filters);
+  my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
+  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image shop insertdate));

   my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
   my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
   my @deliverydate_flags   = qw(deliverydate);
 #  my @other_flags          = qw(onhand); # ToDO: implement these
 #  my @inactive_flags       = qw(l_subtotal short l_linetotal);
 
   my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
   my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
   my @deliverydate_flags   = qw(deliverydate);
 #  my @other_flags          = qw(onhand); # ToDO: implement these
 #  my @inactive_flags       = qw(l_subtotal short l_linetotal);
 

+  my @select_tokens = qw(id factor);
+  my @where_tokens  = qw(1=1);
+  my @group_tokens  = ();
+  my @bind_vars     = ();
+  my %joins_needed  = ();
+

   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 (
   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
+         SELECT parts_id, description, serialnumber, trans_id, unit, sellprice, qty,          assemblyitem,         deliverydate, 'invoice'    AS ioi, project_id, id FROM invoice UNION
+         SELECT parts_id, description, serialnumber, trans_id, unit, sellprice, qty, FALSE AS assemblyitem, NULL AS deliverydate, 'orderitems' AS ioi, project_id, id FROM orderitems

        ) AS ioi ON ioi.parts_id = p.id|,
     apoe       =>
       q|LEFT JOIN (
        ) 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
+         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id,    NULL AS deliverydate, globalproject_id, '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, globalproject_id, 'invoice'    AS ioi FROM ar UNION
+         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, reqdate AS deliverydate, globalproject_id, '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|,
        ) 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|,

+    mv         => 'LEFT JOIN vendor AS mv ON mv.id = mm.make',
+    project    => 'LEFT JOIN project AS pj ON pj.id = COALESCE(ioi.project_id, apoe.globalproject_id)',

   );
   );

-  my @join_order = qw(partsgroup makemodel invoice_oi apoe cv pfac);
+  my @join_order = qw(partsgroup makemodel mv invoice_oi apoe cv pfac project);

 
   my %table_prefix = (
      deliverydate => 'apoe.', serialnumber => 'ioi.',
 
   my %table_prefix = (
      deliverydate => 'apoe.', serialnumber => 'ioi.',


@@ -811,28 +791,71 @@ sub all_parts {
      ordnumber    => 'apoe.', make         => 'mm.',
      quonumber    => 'apoe.', model        => 'mm.',
      invnumber    => 'apoe.', partsgroup   => 'pg.',
      ordnumber    => 'apoe.', make         => 'mm.',
      quonumber    => 'apoe.', model        => 'mm.',
      invnumber    => 'apoe.', partsgroup   => 'pg.',

-     lastcost     => ' ',
-     factor       => 'pfac.',
-     'SUM(ioi.qty)' => ' ',
+     lastcost     => 'p.',  , soldtotal    => ' ',
+     factor       => 'pfac.', projectnumber => 'pj.',
+     'SUM(ioi.qty)' => ' ',   projectdescription => 'pj.',
+     description  => 'p.',
+     qty          => 'ioi.',
+     serialnumber => 'ioi.',
+     quotation    => 'apoe.',
+     cv           => 'cv.',
+     "ioi.id"     => ' ',
+     "ioi.ioi"    => ' ',
+  );
+
+  # if the join condition in these blocks are met, the column
+  # of the scecified table will gently override (coalesce actually) the original value
+  # use it to conditionally coalesce values from subtables
+  my @column_override = (
+    #  column name,   prefix,  joins_needed,  nick name (in case column is named like another)
+    [ 'description',  'ioi.',  'invoice_oi'  ],
+    [ 'deliverydate', 'ioi.',  'invoice_oi'  ],
+    [ 'transdate',    'apoe.', 'apoe'        ],
+    [ 'unit',         'ioi.',  'invoice_oi'  ],
+    [ 'sellprice',    'ioi.',  'invoice_oi'  ],

   );
 
   );
 

+  # careful with renames. these are HARD, and any filters done on the original column will break

   my %renamed_columns = (
     'factor'       => 'price_factor',
     'SUM(ioi.qty)' => 'soldtotal',
   my %renamed_columns = (
     'factor'       => 'price_factor',
     'SUM(ioi.qty)' => 'soldtotal',

+    'ioi.id'       => 'ioi_id',
+    'ioi.ioi'      => 'ioi',
+    'projectdescription' => 'projectdescription',
+    'insertdate'   => 'insertdate',

   );
 
   );
 

-  my %joins_needed;
+  my %real_column = (
+    projectdescription => 'description',
+    insertdate         => 'itime::DATE',
+  );

 
   if (($form->{searchitems} eq 'assembly') && $form->{l_lastcost}) {
     @simple_l_switches = grep { $_ ne 'lastcost' } @simple_l_switches;
   }
 
 
   if (($form->{searchitems} eq 'assembly') && $form->{l_lastcost}) {
     @simple_l_switches = grep { $_ ne 'lastcost' } @simple_l_switches;
   }
 

-  #===== switches and simple filters ========#
+  my $make_token_builder = sub {
+    my $joins_needed = shift;
+    sub {
+      my ($nick, $alias) = @_;
+      my ($col) = $real_column{$nick} || $nick;
+      my @coalesce_tokens =
+        map  { ($_->[1] || 'p.') . $_->[0] }
+        grep { !$_->[2] || $joins_needed->{$_->[2]} }
+        grep { ($_->[3] || $_->[0]) eq $nick }
+        @column_override, [ $col, $table_prefix{$nick}, undef , $nick ];
+
+      my $coalesce = scalar @coalesce_tokens > 1;
+      return ($coalesce
+        ? sprintf 'COALESCE(%s)', join ', ', @coalesce_tokens
+        : shift                              @coalesce_tokens)
+        . ($alias && ($coalesce || $renamed_columns{$nick})
+        ?  " AS " . ($renamed_columns{$nick} || $nick)
+        : '');
+    }
+  };

 
 

-  my @select_tokens = qw(id factor);
-  my @where_tokens  = qw(1=1);
-  my @group_tokens  = ();
-  my @bind_vars     = ();
+  #===== switches and simple filters ========#

 
   # special case transdate
   if (grep { $form->{$_} } qw(transdatefrom transdateto)) {
 
   # special case transdate
   if (grep { $form->{$_} } qw(transdatefrom transdateto)) {


@@ -845,14 +868,41 @@ sub all_parts {
     }
   }
 
     }
   }
 

-  my %simple_filter_table_prefix = (
-     description  => 'p.',
-  );
+  # special case insertdate
+  if (grep { $form->{$_} } qw(insertdatefrom insertdateto)) {
+    $form->{"l_insertdate"} = 1;
+    push @select_tokens, 'insertdate';
+
+    my $token_builder = $make_token_builder->();
+    my $token = $token_builder->('insertdate');
+
+    for (qw(insertdatefrom insertdateto)) {
+      next unless $form->{$_};
+      push @where_tokens, sprintf "$token %s ?", /from$/ ? '>=' : '<=';
+      push @bind_vars,    $form->{$_};
+    }
+  }
+
+  if ($form->{"partsgroup_id"}) {
+    $form->{"l_partsgroup"} = '1'; # show the column
+    push @where_tokens, "pg.id = ?";
+    push @bind_vars, $form->{"partsgroup_id"};
+  }
+
+  if ($form->{shop} ne '') {
+    $form->{l_shop} = '1'; # show the column
+    if ($form->{shop} eq '0' || $form->{shop} eq 'f') {
+      push @where_tokens, 'NOT p.shop';
+      $form->{shop} = 'f';
+    } else {
+      push @where_tokens, 'p.shop';
+    }
+  }

 
 

-  foreach (@simple_filters, @makemodel_filters, @invoice_oi_filters) {
+  foreach (@like_filters) {

     next unless $form->{$_};
     $form->{"l_$_"} = '1'; # show the column
     next unless $form->{$_};
     $form->{"l_$_"} = '1'; # show the column

-    push @where_tokens, "$simple_filter_table_prefix{$_}$_ ILIKE ?";
+    push @where_tokens, "$table_prefix{$_}$_ ILIKE ?";

     push @bind_vars,    "%$form->{$_}%";
   }
 
     push @bind_vars,    "%$form->{$_}%";
   }
 


@@ -886,13 +936,20 @@ sub all_parts {
         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|;
         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|;

+  $table_prefix{$q_assembly_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');
-
-  my $order_clause = " ORDER BY $form->{sort} " . ($form->{revers} ? 'DESC' : 'ASC');
+  # special case makemodel search
+  # all_parts is based upon the assumption that every parameter is named like the column it represents
+  # unfortunately make would have to match vendor.name which is already taken for vendor.name in bsooqr mode.
+  # fortunately makemodel doesn't need to be displayed later, so adding a special clause to where_token is sufficient.
+  if ($form->{make}) {
+    push @where_tokens, 'mv.name ILIKE ?';
+    push @bind_vars, "%$form->{make}%";
+  }
+  if ($form->{model}) {
+    push @where_tokens, 'mm.model ILIKE ?';
+    push @bind_vars, "%$form->{model}%";
+  }

 
   # 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.
 
   # 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.


@@ -905,17 +962,16 @@ sub all_parts {
 
   #my $order_clause = " ORDER BY $form->{sort} $sort_order";
 
 
   #my $order_clause = " ORDER BY $form->{sort} $sort_order";
 

-  my $limit_clause = " LIMIT 100" if $form->{top100};
+  my $limit_clause;
+  $limit_clause = " LIMIT 100"                   if $form->{top100};
+  $limit_clause = " LIMIT " . $form->{limit} * 1 if $form->{limit} * 1;

 
   #=== joins and complicated filters ========#
 
 
   #=== joins and complicated filters ========#
 

-  my $bsooqr = $form->{bought}  || $form->{sold}
-            || $form->{ordered} || $form->{onorder}
-            || $form->{quoted}  || $form->{rfq};
-
-  my @bsooqr;
+  my $bsooqr        = any { $form->{$_} } @oe_flags;

   my @bsooqr_tokens = ();
   my @bsooqr_tokens = ();

-  push @select_tokens, @qsooqr_flags                                          if $bsooqr;
+
+  push @select_tokens, @qsooqr_flags, 'quotation', 'cv', 'ioi.id', 'ioi.ioi'  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 @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};


@@ -926,15 +982,14 @@ sub all_parts {
   push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'vendor'|   if $form->{rfq};
   push @where_tokens, join ' OR ', map { "($_)" } @bsooqr_tokens              if $bsooqr;
 
   push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'vendor'|   if $form->{rfq};
   push @where_tokens, join ' OR ', map { "($_)" } @bsooqr_tokens              if $bsooqr;
 

-  $renamed_columns{onhand} = 'onhand_before_bsooqr';
-  $renamed_columns{qty}    = 'onhand';
-

   $joins_needed{partsgroup}  = 1;
   $joins_needed{pfac}        = 1;
   $joins_needed{partsgroup}  = 1;
   $joins_needed{pfac}        = 1;

+  $joins_needed{project}     = 1 if grep { $form->{$_} || $form->{"l_$_"} } @project_filters;

   $joins_needed{makemodel}   = 1 if grep { $form->{$_} || $form->{"l_$_"} } @makemodel_filters;
   $joins_needed{makemodel}   = 1 if grep { $form->{$_} || $form->{"l_$_"} } @makemodel_filters;

+  $joins_needed{mv}          = 1 if $joins_needed{makemodel};

   $joins_needed{cv}          = 1 if $bsooqr;
   $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;
+  $joins_needed{apoe}        = 1 if $joins_needed{project} || $joins_needed{cv}   || grep { $form->{$_} || $form->{"l_$_"} } @apoe_filters;
+  $joins_needed{invoice_oi}  = 1 if $joins_needed{project} || $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}%'
 
   # special case for description search.
   # up in the simple filter section the description filter got interpreted as something like: WHERE description ILIKE '%$form->{description}%'


@@ -942,7 +997,7 @@ sub all_parts {
   # 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++] =~ /\?/) {
   # 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/;
+      next unless $where_tokens[$wi] =~ /\bdescription ILIKE/;

       splice @where_tokens, $wi, 1, 'p.description ILIKE ? OR ioi.description ILIKE ?';
       splice @bind_vars,    $bi, 0, $bind_vars[$bi];
       last;
       splice @where_tokens, $wi, 1, 'p.description ILIKE ? OR ioi.description ILIKE ?';
       splice @bind_vars,    $bi, 0, $bind_vars[$bi];
       last;


@@ -951,7 +1006,7 @@ sub all_parts {
 
   # now the master trick: soldtotal.
   if ($form->{l_soldtotal}) {
 
   # now the master trick: soldtotal.
   if ($form->{l_soldtotal}) {

-    push @where_tokens, 'ioi.qty >= 0';
+    push @where_tokens, 'NOT ioi.qty = 0';

     push @group_tokens, @select_tokens;
      map { s/.*\sAS\s+//si } @group_tokens;
     push @select_tokens, 'SUM(ioi.qty)';
     push @group_tokens, @select_tokens;
      map { s/.*\sAS\s+//si } @group_tokens;
     push @select_tokens, 'SUM(ioi.qty)';


@@ -959,38 +1014,67 @@ sub all_parts {
 
   #============= build query ================#
 
 
   #============= build query ================#
 

-  $table_prefix{$q_assembly_lastcost} = ' ';
+  my $token_builder = $make_token_builder->(\%joins_needed);

 
 

-  map { $table_prefix{$_} = 'ioi.' } qw(description serialnumber qty unit) if $joins_needed{invoice_oi};
-  map { $renamed_columns{$_} = ' AS ' . $renamed_columns{$_} } keys %renamed_columns;
+  my @sort_cols    = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate insertdate shop));
+     $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols; # sort by id if unknown or invisible column
+  my $sort_order   = ($form->{revers} ? ' DESC' : ' ASC');
+  my $order_clause = " ORDER BY " . $token_builder->($form->{sort}) . ($form->{revers} ? ' DESC' : ' ASC');

 
 

-  my $select_clause = join ', ',    map { ($table_prefix{$_} || "p.") . $_ . $renamed_columns{$_} } @select_tokens;
+  my $select_clause = join ', ',    map { $token_builder->($_, 1) } @select_tokens;

   my $join_clause   = join ' ',     @joins{ grep $joins_needed{$_}, @join_order };
   my $where_clause  = join ' AND ', map { "($_)" } @where_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 $group_clause  = @group_tokens ? ' GROUP BY ' . join ', ',    map { $token_builder->($_) } @group_tokens : '';
+
+  my %oe_flag_to_cvar = (
+    bought   => 'invoice',
+    sold     => 'invoice',
+    onorder  => 'orderitems',
+    ordered  => 'orderitems',
+    rfq      => 'orderitems',
+    quoted   => 'orderitems',
+  );

 
 

-  my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'IC',
-                                                            'trans_id_field' => 'p.id',
-                                                            'filter'         => $form);
+  my ($cvar_where, @cvar_values) = CVar->build_filter_query(
+    module         => 'IC',
+    trans_id_field => $bsooqr ? 'ioi.id': 'p.id',
+    filter         => $form,
+    sub_module     => $bsooqr ? [ uniq grep { $oe_flag_to_cvar{$form->{$_}} } @oe_flags ] : undef,
+  );

 
   if ($cvar_where) {
     $where_clause .= qq| AND ($cvar_where)|;
     push @bind_vars, @cvar_values;
   }
 
 
   if ($cvar_where) {
     $where_clause .= qq| AND ($cvar_where)|;
     push @bind_vars, @cvar_values;
   }
 

-  my $query = qq|SELECT DISTINCT $select_clause FROM parts p $join_clause WHERE $where_clause $group_clause $order_clause $limit_clause|;
+  my $query = <<"  SQL";
+    SELECT DISTINCT $select_clause
+    FROM parts p
+    $join_clause
+    WHERE $where_clause
+    $group_clause
+    $order_clause
+    $limit_clause
+  SQL

 
   $form->{parts} = selectall_hashref_query($form, $dbh, $query, @bind_vars);
 
   map { $_->{onhand} *= 1 } @{ $form->{parts} };
 
 
   $form->{parts} = selectall_hashref_query($form, $dbh, $query, @bind_vars);
 
   map { $_->{onhand} *= 1 } @{ $form->{parts} };
 

+  # fix qty sign in ap. those are saved negative
+  if ($bsooqr && $form->{bought}) {
+    for my $row (@{ $form->{parts} }) {
+      $row->{qty} *= -1 if $row->{module} eq 'ir';
+    }
+  }
+

   # post processing for assembly parts lists (bom)
   # for each part get the assembly parts and add them into the partlist.
   my @assemblies;
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
     $query =
       qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
   # post processing for assembly parts lists (bom)
   # for each part get the assembly parts and add them into the partlist.
   my @assemblies;
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
     $query =
       qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,

-           p.unit, p.bin,
+           p.unit, p.notes, p.itime::DATE as insertdate,

            p.sellprice, p.listprice, p.lastcost,
            p.rop, p.weight, p.priceupdate,
            p.image, p.drawing, p.microfiche,
            p.sellprice, p.listprice, p.lastcost,
            p.rop, p.weight, p.priceupdate,
            p.image, p.drawing, p.microfiche,


@@ -1017,7 +1101,29 @@ sub all_parts {
     $form->{parts} = \@assemblies;
   }
 
     $form->{parts} = \@assemblies;
   }
 

+  if ($form->{l_pricegroups} ) {
+    my $query = <<SQL;
+       SELECT parts_id, price, pricegroup_id
+       FROM prices
+       WHERE parts_id = ?
+SQL
+
+    my $sth = prepare_query($form, $dbh, $query);
+
+    foreach my $part (@{ $form->{parts} }) {
+      do_statement($form, $sth, $query, conv_i($part->{id}));
+
+      while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+        $part->{"pricegroup_$ref->{pricegroup_id}"} = $ref->{price};
+      }
+      $sth->finish;
+    }
+  };
+
+

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

+
+  return @{ $form->{parts} };

 }
 
 sub _create_filter_for_priceupdate {
 }
 
 sub _create_filter_for_priceupdate {


@@ -1147,7 +1253,7 @@ sub update_prices {
   my $num_updated = 0;
 
   # connect to database
   my $num_updated = 0;
 
   # connect to database

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

 
   for my $column (qw(sellprice listprice)) {
     next if ($form->{$column} eq "");
 
   for my $column (qw(sellprice listprice)) {
     next if ($form->{$column} eq "");


@@ -1208,7 +1314,6 @@ sub update_prices {
   $sth_multiply->finish();
 
   my $rc= $dbh->commit;
   $sth_multiply->finish();
 
   my $rc= $dbh->commit;

-  $dbh->disconnect;

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


@@ -1221,7 +1326,7 @@ sub create_links {
   my ($self, $module, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $module, $myconfig, $form) = @_;
 
   # connect to database

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

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


@@ -1277,7 +1382,6 @@ sub create_links {
     ($form->{priceupdate}) = selectrow_query($form, $dbh, qq|SELECT current_date|);
   }
 
     ($form->{priceupdate}) = selectrow_query($form, $dbh, qq|SELECT current_date|);
   }
 

-  $dbh->disconnect;

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


@@ -1286,7 +1390,7 @@ sub get_parts {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $sortorder) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $sortorder) = @_;

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

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


@@ -1329,7 +1433,6 @@ sub get_parts {
   }    #while
   $form->{rows} = $j;
   $sth->finish;
   }    #while
   $form->{rows} = $j;
   $sth->finish;

-  $dbh->disconnect;

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


@@ -1357,7 +1460,7 @@ sub retrieve_languages {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

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

 
   my @values;
   my $where;
 
   my @values;
   my $where;


@@ -1379,8 +1482,6 @@ sub retrieve_languages {
 
   my $languages = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   my $languages = selectall_hashref_query($form, $dbh, $query, @values);
 

-  $dbh->disconnect;
-

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


@@ -1395,17 +1496,17 @@ sub follow_account_chain {
 
   my ($query, $sth);
 
 
   my ($query, $sth);
 

-  $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);
+  $form->{ACCOUNT_CHAIN_BY_ID} ||= {
+    map { $_->{id} => $_ }
+      selectall_hashref_query($form, $dbh, <<SQL, $transdate) };
+    SELECT c.id, c.new_chart_id, date(?) >= c.valid_from AS is_valid, cnew.accno
+    FROM chart c
+    LEFT JOIN chart cnew ON c.new_chart_id = cnew.id
+    WHERE NOT c.new_chart_id IS NULL AND (c.new_chart_id > 0)
+SQL

 
   while (1) {
 
   while (1) {

-    do_statement($form, $sth, $query, $accno_id);
-    my $ref = $sth->fetchrow_hashref();
+    my $ref = $form->{ACCOUNT_CHAIN_BY_ID}->{$accno_id};

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


@@ -1419,23 +1520,47 @@ sub follow_account_chain {
 }
 
 sub retrieve_accounts {
 }
 
 sub retrieve_accounts {

-  $main::lxdebug->enter_sub(2);
-
-  my ($self, $myconfig, $form, $parts_id, $index) = @_;
+  $main::lxdebug->enter_sub;

 
 

-  my ($query, $sth, $dbh);
+  my $self     = shift;
+  my $myconfig = shift;
+  my $form     = shift;
+  my $dbh      = $form->get_standard_dbh;
+  my %args     = @_;     # index => part_id

 
 

-  $form->{"taxzone_id"} *= 1;
+  $form->{taxzone_id} *= 1;

 
 

-  $dbh = $form->get_standard_dbh($myconfig);
+  return unless grep $_, values %args; # shortfuse if no part_id supplied

 
 

+  # transdate madness.

   my $transdate = "";
   my $transdate = "";

-  if ($form->{type} eq "invoice") {
-    if (($form->{vc} eq "vendor") || !$form->{deliverydate}) {
+  if ($form->{type} eq "invoice" or $form->{type} eq "credit_note") {
+    # use deliverydate for sales and purchase invoice, if it exists
+    # also use deliverydate for credit notes
+    if (!$form->{deliverydate}) {
+      $transdate = $form->{invdate};
+    } else {
+      $transdate = $form->{deliverydate};
+    }
+  } elsif ($form->{script} eq 'ir.pl') {
+    # when a purchase invoice is opened from the report of purchase invoices
+    # $form->{type} isn't set, but $form->{script} is, not sure why this is or
+    # whether this distinction matters in some other scenario. Otherwise one
+    # could probably take out this elsif and add a
+    # " or $form->{script} eq 'ir.pl' "
+    # to the above if-statement
+    if (!$form->{deliverydate}) {

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

+  } elsif (($form->{type} eq "credit_note") and $form->{deliverydate}) {
+    # if credit_note has a deliverydate, use this instead of invdate
+    # useful for credit_notes of invoices from an old period with different tax
+    # if there is no deliverydate then invdate is used, old default (see next elsif)
+    # Falls hier der Stichtag für Steuern anders bestimmt wird,
+    # entsprechend auch bei Taxkeys.pm anpassen
+    $transdate = $form->{deliverydate};

   } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {
     $transdate = $form->{invdate};
   } else {
   } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {
     $transdate = $form->{invdate};
   } else {


@@ -1443,77 +1568,75 @@ sub retrieve_accounts {
   }
 
   if ($transdate eq "") {
   }
 
   if ($transdate eq "") {

-    $transdate = "current_date";
+    $transdate = DateTime->today_local->to_lxoffice;

   } else {
     $transdate = $dbh->quote($transdate);
   }
   } else {
     $transdate = $dbh->quote($transdate);
   }

+  #/transdate
+  my $inc_exp = $form->{"vc"} eq "customer" ? "income_accno_id" : "expense_accno_id";
+
+  my @part_ids = grep { $_ } values %args;
+  my $in       = join ',', ('?') x @part_ids;
+
+  my %accno_by_part = map { $_->{id} => $_ }
+    selectall_hashref_query($form, $dbh, <<SQL, @part_ids);
+    SELECT
+      p.id, p.inventory_accno_id AS is_part,
+      bg.inventory_accno_id,
+      tc.income_accno_id AS income_accno_id,
+      tc.expense_accno_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 taxzone_charts tc on bg.id = tc.buchungsgruppen_id
+    LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id
+    LEFT JOIN chart c2 ON tc.income_accno_id = c2.id
+    LEFT JOIN chart c3 ON tc.expense_accno_id = c3.id
+    WHERE
+    tc.taxzone_id = '$form->{taxzone_id}'
+    and
+    p.id IN ($in)
+SQL
+
+  my $sth_tax = prepare_query($::form, $dbh, <<SQL);
+    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 <= ?
+       ORDER BY startdate DESC LIMIT 1)
+SQL
+
+  while (my ($index => $part_id) = each %args) {
+    my $ref = $accno_by_part{$part_id} or next;
+
+    $ref->{"inventory_accno_id"} = undef unless $ref->{"is_part"};
+
+    my %accounts;
+    for my $type (qw(inventory income expense)) {
+      next unless $ref->{"${type}_accno_id"};
+      ($accounts{"${type}_accno_id"}, $accounts{"${type}_accno"}) =
+        $self->follow_account_chain($form, $dbh, $transdate, $ref->{"${type}_accno_id"}, $ref->{"${type}_accno"});
+    }

 
 

-  $query =
-    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"});
-
-  my %accounts;
-  foreach my $type (qw(inventory income expense)) {
-    next unless ($ref->{"${type}_accno_id"});
-    ($accounts{"${type}_accno_id"}, $accounts{"${type}_accno"}) =
-      $self->follow_account_chain($form, $dbh, $transdate,
-                                  $ref->{"${type}_accno_id"},
-                                  $ref->{"${type}_accno"});
-  }
-
-  map({ $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} }
-      qw(inventory income expense));
+    $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);

 
 

-  my $inc_exp = $form->{"vc"} eq "customer" ? "income" : "expense";
-  my $accno_id = $accounts{"${inc_exp}_accno_id"};
+    $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate));
+    $ref = $sth_tax->fetchrow_hashref or next;

 
 

-  $query =
-    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);
-    return;
-  }
+    $form->{"taxaccounts_$index"} = $ref->{"accno"};
+    $form->{"taxaccounts"} .= "$ref->{accno} "if $form->{"taxaccounts"} !~ /$ref->{accno}/;

 
 

-  $form->{"taxaccounts_$index"} = $ref->{"accno"};
-  if ($form->{"taxaccounts"} !~ /$ref->{accno}/) {
-    $form->{"taxaccounts"} .= "$ref->{accno} ";
+    $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber);

   }
   }

-  map({ $form->{"$ref->{accno}_${_}"} = $ref->{$_}; }
-      qw(rate description taxnumber));

 
 

-#   $main::lxdebug->message(0, "formvars: rate " . $form->{"$ref->{accno}_rate"} .
-#                           " description " . $form->{"$ref->{accno}_description"} .
-#                           " taxnumber " . $form->{"$ref->{accno}_taxnumber"} .
-#                           " || taxaccounts_$index " . $form->{"taxaccounts_$index"} .
-#                           " || taxaccounts " . $form->{"taxaccounts"});
+  $sth_tax->finish;

 
 

-  $main::lxdebug->leave_sub(2);
+  $::lxdebug->leave_sub;

 }
 
 sub get_basic_part_info {
 }
 
 sub get_basic_part_info {


@@ -1536,7 +1659,7 @@ sub get_basic_part_info {
 
   my $dbh      = $form->get_standard_dbh($myconfig);
 
 
   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 $query    = qq|SELECT * FROM parts WHERE id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)|;

 
   my $info     = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids);
 
 
   my $info     = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids);
 


@@ -1560,8 +1683,8 @@ sub prepare_parts_for_printing {
   my $self     = shift;
   my %params   = @_;
 
   my $self     = shift;
   my %params   = @_;
 

-  my $myconfig = \%main::myconfig;
-  my $form     = $main::form;
+  my $myconfig = $params{myconfig} || \%main::myconfig;
+  my $form     = $params{form}     || $main::form;

 
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 
 
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 


@@ -1576,9 +1699,9 @@ sub prepare_parts_for_printing {
   }
 
   my $placeholders = join ', ', ('?') x scalar(@part_ids);
   }
 
   my $placeholders = join ', ', ('?') x scalar(@part_ids);

-  my $query        = qq|SELECT mm.parts_id, mm.model, v.name AS make
+  my $query        = qq|SELECT mm.parts_id, mm.model, mm.lastcost, v.name AS make

                         FROM makemodel mm
                         FROM makemodel mm

-                        LEFT JOIN vendor v ON (mm.make = cast (v.id as text))
+                        LEFT JOIN vendor v ON (mm.make = v.id)

                         WHERE mm.parts_id IN ($placeholders)|;
 
   my %makemodel    = ();
                         WHERE mm.parts_id IN ($placeholders)|;
 
   my %makemodel    = ();


@@ -1592,7 +1715,7 @@ sub prepare_parts_for_printing {
 
   $sth->finish();
 
 
   $sth->finish();
 

-  my @columns = qw(ean image microfiche drawing weight);
+  my @columns = qw(ean image microfiche drawing);

 
   $query      = qq|SELECT id, | . join(', ', @columns) . qq|
                    FROM parts
 
   $query      = qq|SELECT id, | . join(', ', @columns) . qq|
                    FROM parts


@@ -1600,7 +1723,8 @@ sub prepare_parts_for_printing {
 
   my %data    = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
 
 
   my %data    = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
 

-  map { $form->{TEMPLATE_ARRAYS}{$_} = [] } (qw(make model), @columns);
+  my %template_arrays;
+  map { $template_arrays{$_} = [] } (qw(make model), @columns);

 
   foreach my $i (1 .. $rowcount) {
     my $id = $form->{"${prefix}${i}"};
 
   foreach my $i (1 .. $rowcount) {
     my $id = $form->{"${prefix}${i}"};


@@ -1608,21 +1732,51 @@ sub prepare_parts_for_printing {
     next if (!$id);
 
     foreach (@columns) {
     next if (!$id);
 
     foreach (@columns) {

-      push @{ $form->{TEMPLATE_ARRAYS}{$_} }, $data{$id}->{$_};
+      push @{ $template_arrays{$_} }, $data{$id}->{$_};

     }
 
     }
 

-    push @{ $form->{TEMPLATE_ARRAYS}{make} },  [];
-    push @{ $form->{TEMPLATE_ARRAYS}{model} }, [];
+    push @{ $template_arrays{make} },  [];
+    push @{ $template_arrays{model} }, [];

 
     next if (!$makemodel{$id});
 
     foreach my $ref (@{ $makemodel{$id} }) {
 
     next if (!$makemodel{$id});
 
     foreach my $ref (@{ $makemodel{$id} }) {

-      map { push @{ $form->{TEMPLATE_ARRAYS}{$_}->[-1] }, $ref->{$_} } qw(make model);
+      map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model);

     }
   }
 
     }
   }
 

+  my $parts = SL::DB::Manager::Part->get_all(query => [ id => \@part_ids ]);
+  my %parts_by_id = map { $_->id => $_ } @$parts;
+
+  for my $i (1..$rowcount) {
+    my $id = $form->{"${prefix}${i}"};
+    next unless $id;
+
+    push @{ $template_arrays{part_type} },  $parts_by_id{$id}->type;
+  }
+
+  return %template_arrays;

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

+sub normalize_text_blocks {
+  $main::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  my $form     = $params{form}     || $main::form;
+
+  # check if feature is enabled (select normalize_part_descriptions from defaults)
+  return unless ($::instance_conf->get_normalize_part_descriptions);
+
+  foreach (qw(description notes)) {
+    $form->{$_} =~ s/\s+$//s;
+    $form->{$_} =~ s/^\s+//s;
+    $form->{$_} =~ s/ {2,}/ /g;
+  }
+   $main::lxdebug->leave_sub();
+}
+

 
 1;
 
 1;