X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/550a75a67c8cd48abdb0e92dc4b2f49c6a1d0879..9d2ac13b7b318be0540c6fc5d96b412e8c7bab02:/SL/IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index 6fa45dc10..f691a354f 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -79,7 +79,7 @@ sub get_part {
     # retrieve assembly items
     $query =
       qq|SELECT p.id, p.partnumber, p.description,
-           p.sellprice, p.weight, a.qty, a.bom, p.unit,
+           p.sellprice, p.lastcost, p.weight, a.qty, a.bom, p.unit,
            pg.partsgroup
          FROM parts p
          JOIN assembly a ON (a.parts_id = p.id)
@@ -491,11 +491,11 @@ sub save {
   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) | .
 		             qq|VALUES (?, ?, ?)|;
-		    @values = (conv_i($form->{id}), $form->{"make_$i"}, $form->{"model_$i"});
+		    @values = (conv_i($form->{id}), conv_i($form->{"make_$i"}), $form->{"model_$i"});
+
         do_query($form, $dbh, $query, @values);
       }
     }
@@ -793,6 +793,10 @@ sub all_parts {
   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);
@@ -845,6 +849,12 @@ sub all_parts {
     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;
@@ -871,6 +881,7 @@ sub all_parts {
   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};
@@ -903,6 +914,7 @@ sub all_parts {
   if ($form->{l_soldtotal}) {
     push @where_tokens, 'ioi.qty >= 0';
     push @group_tokens, @select_tokens;
+     map { s/.*\sAS\s+//si } @group_tokens;
     push @select_tokens, 'SUM(ioi.qty)';
   }
 
@@ -916,10 +928,13 @@ sub all_parts {
      ordnumber    => 'apoe.', make         => 'mm.',
      quonumber    => 'apoe.', model        => 'mm.',
      invnumber    => 'apoe.', partsgroup   => 'pg.',
+     lastcost     => ' ',
      factor       => 'pfac.',
      'SUM(ioi.qty)' => ' ',
   );
 
+  $table_prefix{$q_assembly_lastcost} = ' ';
+
   my %renamed_columns = (
     'factor'       => 'price_factor',
     'SUM(ioi.qty)' => 'soldtotal',
@@ -939,350 +954,6 @@ sub all_parts {
 
   map { $_->{onhand} *= 1 } @{ $form->{parts} };
 
-##  my $where = qq|1 = 1|;
-##  my (@values, $var, $flds, $group, $limit);
-##
-##  foreach my $item (qw(partnumber drawing microfiche ean pg.partsgroup)) {
-##    my $column = $item;
-##    $column =~ s/.*\.//; # get rid of table prefixes
-##    if ($form->{$column}) {
-##      $where .= qq| AND ($item ILIKE ?)|;
-##      push(@values, "%$form->{$column}%");
-##    }
-##  }
-##
-##  # special case for description
-##  if ($form->{description}
-##      && !(   $form->{bought}  || $form->{sold} || $form->{onorder}
-##           || $form->{ordered} || $form->{rfq} || $form->{quoted})) {
-##    $where .= qq| AND (p.description ILIKE ?)|;
-##    push(@values, "%$form->{description}%");
-##  }
-##
-##  # special case for serialnumber
-##  if ($form->{l_serialnumber} && $form->{serialnumber}) {
-##    $where .= qq| AND (serialnumber ILIKE ?)|;
-##    push(@values, "%$form->{serialnumber}%");
-##  }
-##
-##  if ($form->{searchitems} eq 'part') {
-##    $where .= qq| AND (p.inventory_accno_id > 0) |;
-##  }
-##
-##  if ($form->{searchitems} eq 'assembly') {
-##    $form->{bought} = "";
-##    $where .= qq| AND p.assembly|;
-##  }
-##
-##  if ($form->{searchitems} eq 'service') {
-##    $where .= qq| AND (p.inventory_accno_id IS NULL) AND NOT (p.assembly = '1')|;
-##    # irrelevant for services
-##    map { $form->{$_} = '' } qw(make model);
-##  }
-##
-##  # items which were never bought, sold or on an order
-##  if ($form->{itemstatus} eq 'orphaned') {
-##    map { $form->{$_} = 0  } qw(onhand short bought sold onorder ordered rfq quoted);
-##    map { $form->{$_} = '' } qw(transdatefrom transdateto);
-##
-##    $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
-##            )|;
-##  }
-##
-##  my %status2condition = (
-##    active   => " AND (p.obsolete = '0')",
-##    obsolete => " AND (p.obsolete = '1')",
-##    onhand   => " AND (p.onhand > 0)",
-##    short    => " AND (p.onhand < p.rop)",
-##  );
-##  $where .= $status2condition{$form->{itemstatus}};
-##
-##  $form->{onhand} = $form->{short} = 0 if ($form->{itemstatus} eq 'obsolete');
-##
-##  my @subcolumns;
-##  foreach my $column (qw(make model)) {
-##    push @subcolumns, $column if $form->{$column};
-##  }
-##  if (@subcolumns) {
-##    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE | . (join " AND ", map { "($_ ILIKE ?)"; } @subcolumns) . ")";
-##    push @values, map { '%' . $form->{$_} . '%' } @subcolumns;
-##  }
-##
-##  if ($form->{l_soldtotal}) {
-##    $where .= qq| AND (p.id = i.parts_id) AND (i.qty >= 0)|;
-##    $group = qq| GROUP BY p.id, p.partnumber, p.description, p.onhand, p.unit, p.bin, p.sellprice, p.listprice, p.lastcost, p.priceupdate, pg.partsgroup|;
-##  }
-##
-##  $limit = qq| LIMIT 100| if ($form->{top100});
-##
-##  # connect to database
-##  my $dbh = $form->dbconnect($myconfig);
-##
-##  my @sort_cols = qw(id partnumber description partsgroup bin priceupdate onhand
-##                     invnumber ordnumber quonumber name drawing microfiche
-##                     serialnumber soldtotal deliverydate);
-##
-##  my $sortorder = "partnumber";
-##  $sortorder = $form->{sort} if ($form->{sort} && grep({ $_ eq $form->{sort} } @sort_cols));
-##  $sortorder .= " DESC" if ($form->{revers});
-##
-##  my $query = "";
-##
-##  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 $limit|;
-##  }
-##
-##  my @all_values = @values;
-##
-##  # rebuild query for bought and sold items
-##  if (   $form->{bought}
-##      || $form->{sold}
-##      || $form->{onorder}
-##      || $form->{ordered}
-##      || $form->{rfq}
-##      || $form->{quoted}) {
-##    my $union = "";
-##    $query = "";
-##    @all_values = ();
-##
-##    if ($form->{bought} || $form->{sold}) {
-##
-##      my @invvalues = @values;
-##      my $invwhere = "$where";
-#      $invwhere .= qq| AND i.assemblyitem = '0'|;
-##
-##      if ($form->{transdatefrom}) {
-##        $invwhere .= qq| AND a.transdate >= ?|;
-##        push(@invvalues, $form->{transdatefrom});
-##      }
-##
-##      if ($form->{transdateto}) {
-##        $invwhere .= qq| AND a.transdate <= ?|;
-##        push(@invvalues, $form->{transdateto});
-##      }
-##
-##      if ($form->{description}) {
-##        $invwhere .= qq| AND i.description ILIKE ?|;
-##        push(@invvalues, '%' . $form->{description} . '%');
-##      }
-##
-##      $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 = qq| UNION |;
-##
-##        push(@all_values, @invvalues);
-##      }
-##
-##      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 = qq| UNION |;
-##
-##        push(@all_values, @invvalues);
-##      }
-##    }
-##
-##    if ($form->{onorder} || $form->{ordered}) {
-##      my @ordvalues = @values;
-##      my $ordwhere = $where . qq| AND o.quotation = '0'|;
-##
-##      if ($form->{transdatefrom}) {
-##        $ordwhere .= qq| AND o.transdate >= ?|;
-##        push(@ordvalues, $form->{transdatefrom});
-##      }
-##
-##      if ($form->{transdateto}) {
-##        $ordwhere .= qq| AND o.transdate <= ?|;
-##        push(@ordvalues, $form->{transdateto});
-##      }
-##
-##      if ($form->{description}) {
-##        $ordwhere .= qq| AND oi.description ILIKE ?|;
-##        push(@ordvalues, '%' . $form->{description} . '%');
-##      }
-##
-##      if ($form->{ordered}) {
-##        $query .=
-##          qq|$union
-##
-##             SELECT 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,
-##               '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 = qq| UNION |;
-##
-##        push(@all_values, @ordvalues);
-##      }
-##
-##      if ($form->{onorder}) {
-##        $query .=
-##          qq|$union
-##
-##             SELECT 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,
-##               '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)|;
-##        $union = qq| UNION |;
-##
-##        push(@all_values, @ordvalues);
-##      }
-##
-##    }
-##
-##    if ($form->{rfq} || $form->{quoted}) {
-##      my $quowhere = $where . qq| AND o.quotation = '1'|;
-##      my @quovalues = @values;
-##
-##      if ($form->{transdatefrom}) {
-##        $quowhere .= qq| AND o.transdate >= ?|;
-##        push(@quovalues, $form->{transdatefrom});
-##      }
-##
-##      if ($form->{transdateto}) {
-##        $quowhere .= qq| AND o.transdate <= ?|;
-##        push(@quovalues, $form->{transdateto});
-##      }
-##
-##      if ($form->{description}) {
-##        $quowhere .= qq| AND oi.description ILIKE ?|;
-##        push(@quovalues, '%' . $form->{description} . '%');
-##      }
-##
-##      if ($form->{quoted}) {
-##        $query .=
-##          qq|$union
-##
-##             SELECT
-##               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, '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 = qq| UNION |;
-##
-##        push(@all_values, @quovalues);
-##      }
-##
-##      if ($form->{rfq}) {
-##        $query .=
-##          qq|$union
-##
-##             SELECT 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,
-##               '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|;
-##
-##        push(@all_values, @quovalues);
-##      }
-##
-##    }
-##    $query .= qq| ORDER BY  | . $sortorder;
-##
-##  }
-##
-##  $form->{parts} = selectall_hashref_query($form, $dbh, $query, @all_values);
-#
   my @assemblies;
   # include individual items for assemblies
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
@@ -1818,9 +1489,11 @@ sub prepare_parts_for_printing {
   }
 
   my $placeholders = join ', ', ('?') x scalar(@part_ids);
-  my $query        = qq|SELECT parts_id, make, model
-                        FROM makemodel
-                        WHERE parts_id IN ($placeholders)|;
+  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);