X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIC.pm;h=c710af9fc6651df2198fab18d4e5afaf30fc0f9a;hb=bb55aa5910a0faa71d6cfc0a215a352dcc115f76;hp=6fa45dc10a7a37491ca2b8f00102e1e6e4d8261d;hpb=550a75a67c8cd48abdb0e92dc4b2f49c6a1d0879;p=kivitendo-erp.git diff --git a/SL/IC.pm b/SL/IC.pm index 6fa45dc10..c710af9fc 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -35,8 +35,10 @@ package IC; use Data::Dumper; +use List::MoreUtils qw(all any); use YAML; +use SL::CVar; use SL::DBUtils; sub get_part { @@ -68,9 +70,6 @@ sub get_part { $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}) { @@ -79,17 +78,18 @@ 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, - pg.partsgroup + 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}}|; + ORDER BY a.oid|; $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id})); $form->{assembly_rows} = 0; - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { $form->{assembly_rows}++; foreach my $key (keys %{$ref}) { $form->{"${key}_$form->{assembly_rows}"} = $ref->{$key}; @@ -125,8 +125,6 @@ sub get_part { while (($form->{"klass_$i"}, $form->{"pricegroup_id_$i"}, $form->{"price_$i"}, $form->{"pricegroup_$i"}) = $sth->fetchrow_array()) { - $form->{"price_$i"} = $form->round_amount($form->{"price_$i"}, 5); - $form->{"price_$i"} = $form->format_amount($myconfig, $form->{"price_$i"}, -2); push @pricegroups, $form->{"pricegroup_id_$i"}; $i++; } @@ -138,7 +136,7 @@ sub get_part { $form->{PRICEGROUPS} = selectall_hashref_query($form, $dbh, $query); #find not used pricegroups - while ($tmp = pop(@{ $form->{PRICEGROUPS} })) { + while (my $tmp = pop(@{ $form->{PRICEGROUPS} })) { my $in_use = 0; foreach my $item (@pricegroups) { if ($item eq $tmp->{id}) { @@ -152,10 +150,8 @@ sub get_part { # if not used pricegroups are avaible if (@pricegroups_not_used) { - foreach $name (@pricegroups_not_used) { + foreach my $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"}, -2); $form->{"pricegroup_id_$i"} = "$name->{id}"; $form->{"pricegroup_$i"} = "$name->{pricegroup}"; $i++; @@ -171,7 +167,7 @@ sub get_part { if ($form->{makemodel}) { $query = qq|SELECT m.make, m.model FROM makemodel m | . qq|WHERE m.parts_id = ?|; - @values = ($form->{id}); + my @values = ($form->{id}); $sth = $dbh->prepare($query); $sth->execute(@values) || $form->dberror("$query (" . join(', ', @values) . ")"); @@ -192,7 +188,7 @@ sub get_part { 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)) { + while (my $tr = $trq->fetchrow_hashref("NAME_lc")) { $form->{language_values} .= "---+++---" . join('--++--', @{$tr}{qw(language_id translation longdescription)}); } $trq->finish; @@ -203,7 +199,7 @@ sub get_part { 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) { + while (my ($key) = $sth->fetchrow_array) { $form->{amount}{$key} = $key; } @@ -246,7 +242,7 @@ sub get_pricegroups { my $pricegroups = selectall_hashref_query($form, $dbh, $query); my $i = 1; - foreach $pg (@{ $pricegroups }) { + foreach my $pg (@{ $pricegroups }) { $form->{"klass_$i"} = "$pg->{id}"; $form->{"price_$i"} = $form->format_amount($myconfig, $form->{"price_$i"}, -2); $form->{"pricegroup_id_$i"} = "$pg->{id}"; @@ -307,6 +303,8 @@ sub save { my ($query, $sth); + my $priceupdate = ', priceupdate = current_date'; + if ($form->{id}) { # get old price @@ -337,6 +335,11 @@ sub save { # delete translations do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id})); + # 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)); + } else { my ($count) = selectrow_query($form, $dbh, qq|SELECT COUNT(*) FROM parts WHERE partnumber = ?|, $form->{partnumber}); if ($count) { @@ -359,7 +362,7 @@ sub save { my $partsgroup_id = 0; if ($form->{partsgroup}) { - ($partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup}); + (my $partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup}); } my ($subq_inventory, $subq_expense, $subq_income); @@ -392,7 +395,6 @@ sub save { sellprice = ?, lastcost = ?, weight = ?, - priceupdate = ?, unit = ?, notes = ?, formel = ?, @@ -410,10 +412,12 @@ sub save { ve = ?, gv = ?, ean = ?, + has_sernumber = ?, not_discountable = ?, microfiche = ?, partsgroup_id = ?, price_factor_id = ? + $priceupdate WHERE id = ?|; @values = ($form->{partnumber}, $form->{description}, @@ -423,7 +427,6 @@ sub save { $form->{sellprice}, $form->{lastcost}, $form->{weight}, - conv_date($form->{priceupdate}), $form->{unit}, $form->{notes}, $form->{formel}, @@ -439,6 +442,7 @@ sub save { 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), @@ -451,7 +455,7 @@ sub save { do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id})); if ($form->{language_values} ne "") { - foreach $item (split(/---\+\+\+---/, $form->{language_values})) { + 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) @@ -467,22 +471,20 @@ sub save { # insert price records only if different to sellprice for my $i (1 .. $form->{price_rows}) { - if ($form->{"price_$i"} eq "0") { + my $price = $form->parse_amount($myconfig, $form->{"price_$i"}); + if ($price == 0) { $form->{"price_$i"} = $form->{sellprice}; } if ( - ( $form->{"price_$i"} + ( $price || $form->{"klass_$i"} || $form->{"pricegroup_id_$i"}) - and $form->{"price_$i"} != $form->{sellprice} + and $price != $form->{sellprice} ) { #$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"}); $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) | . qq|VALUES(?, ?, ?)|; - @values = (conv_i($form->{id}), conv_i($pricegroup_id), $price); + @values = (conv_i($form->{id}), conv_i($form->{"pricegroup_id_$i"}), $price); do_query($form, $dbh, $query, @values); } } @@ -491,18 +493,18 @@ 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); } } } # insert taxes - foreach $item (split(/ /, $form->{taxaccounts})) { + foreach my $item (split(/ /, $form->{taxaccounts})) { if ($form->{"IC_tax_$item"}) { $query = qq|INSERT INTO partstax (parts_id, chart_id) @@ -527,7 +529,7 @@ sub save { } } - @a = localtime; + my @a = localtime; $a[5] += 1900; $a[4]++; my $shippingdate = "$a[5]-$a[4]-$a[3]"; @@ -537,23 +539,23 @@ sub save { } #set expense_accno=inventory_accno if they are different => bilanz - $vendor_accno = + my $vendor_accno = ($form->{expense_accno} != $form->{inventory_accno}) ? $form->{inventory_accno} : $form->{expense_accno}; # get tax rates and description - $accno_id = + my $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 = ?)) ORDER BY c.accno|; - $stw = prepare_execute_query($form, $dbh, $query, $accno_id); + my $stw = prepare_execute_query($form, $dbh, $query, $accno_id); $form->{taxaccount} = ""; - while ($ptr = $stw->fetchrow_hashref(NAME_lc)) { + while (my $ptr = $stw->fetchrow_hashref("NAME_lc")) { $form->{taxaccount} .= "$ptr->{accno} "; if (!($form->{taxaccount2} =~ /\Q$ptr->{accno}\E/)) { $form->{"$ptr->{accno}_rate"} = $ptr->{rate}; @@ -563,6 +565,11 @@ sub save { } } + CVar->save_custom_variables('dbh' => $dbh, + 'module' => 'IC', + 'trans_id' => $form->{id}, + 'variables' => $form); + # commit my $rc = $dbh->commit; $dbh->disconnect; @@ -588,7 +595,7 @@ sub update_assembly { $query = qq|UPDATE parts SET sellprice = sellprice + ?, weight = weight + ? WHERE id = ?|; - @values = ($qty * ($form->{sellprice} - $sellprice), + my @values = ($qty * ($form->{sellprice} - $sellprice), $qty * ($form->{weight} - $weight), conv_i($id)); do_query($form, $dbh, $query, @values); @@ -680,7 +687,7 @@ sub assembly_item { push(@values, conv_i($form->{id})); } - if ($partnumber) { + if ($form->{partnumber}) { $where .= qq| ORDER BY p.partnumber|; } else { $where .= qq| ORDER BY p.description|; @@ -690,9 +697,12 @@ sub assembly_item { 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 + qq|SELECT p.id, p.partnumber, p.description, p.sellprice, + p.weight, p.onhand, p.unit, pg.partsgroup, p.lastcost, + 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); @@ -736,16 +746,16 @@ sub assembly_item { # # not working: # onhand - as above, but masking the simple itemstatus results (doh!) -# masking of onhand in bsooqr mode - ToDO: fixme +# warehouse onhand +# search by overrides of description # # 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 -# - 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 { @@ -761,22 +771,29 @@ sub all_parts { my @makemodel_filters = qw(make model); my @invoice_oi_filters = qw(serialnumber soldtotal); my @apoe_filters = qw(transdate); + my @like_filters = (@simple_filters, @makemodel_filters, @invoice_oi_filters); 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 @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 ( - 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 FROM invoice UNION + SELECT parts_id, description, serialnumber, trans_id, unit, sellprice, qty, FALSE AS assemblyitem, NULL AS deliverydate, 'orderitems' AS ioi FROM orderitems ) AS ioi ON ioi.parts_id = p.id|, apoe => q|LEFT JOIN ( @@ -791,13 +808,66 @@ sub all_parts { ) 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; - #===== switches and simple filters ========# + my %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)' => ' ', + description => 'p.', + qty => 'ioi.', + serialnumber => 'ioi.', + quotation => 'apoe.', + cv => 'cv.', + ); - my @select_tokens = qw(id factor); - my @where_tokens = qw(1=1); - my @group_tokens = (); + # 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 + [ 'description', 'ioi.', 'invoice_oi' ], + [ 'deliverydate', 'ioi.', 'invoice_oi' ], + [ 'transdate', 'apoe.', 'apoe' ], + [ 'unit', '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', + ); + + if (($form->{searchitems} eq 'assembly') && $form->{l_lastcost}) { + @simple_l_switches = grep { $_ ne 'lastcost' } @simple_l_switches; + } + + my $make_token_builder = sub { + my $joins_needed = shift; + sub { + my ($col, $alias) = @_; + my @coalesce_tokens = + map { ($_->[1] || 'p.') . $_->[0] } + grep { !$_->[2] || $joins_needed->{$_->[2]} } + grep { $_->[0] eq $col } + @column_override, [ $col, $table_prefix{$col} ]; + + my $coalesce = scalar @coalesce_tokens > 1; + return ($coalesce + ? sprintf 'COALESCE(%s)', join ', ', @coalesce_tokens + : shift @coalesce_tokens) + . ($alias && ($coalesce || $renamed_columns{$col}) + ? " AS " . ($renamed_columns{$col} || $col) + : ''); + } + }; + + #===== switches and simple filters ========# # special case transdate if (grep { $form->{$_} } qw(transdatefrom transdateto)) { @@ -810,14 +880,10 @@ sub all_parts { } } - my %simple_filter_table_prefix = ( - description => 'p.', - ); - - foreach (@simple_filters, @makemodel_filters, @invoice_oi_filters) { + foreach (@like_filters) { 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->{$_}%"; } @@ -845,32 +911,35 @@ sub all_parts { push @where_tokens, 'p.onhand < p.rop', if /short/; } - - 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 $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|; + $table_prefix{$q_assembly_lastcost} = ' '; # 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'; + # Nette Idee von Sven, gibt aber Probleme wenn die Artikelnummern groesser als 32bit sind. Korrekt waere es, dass Sort-Natural-Modul zu nehmen + # Ich lass das mal hier drin, damit die Idee erhalten bleibt jb 28.5.2009 bug 1018 + #$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 $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 = any { $form->{$_} } @oe_flags; + my @bsooqr_tokens = (); - my @bsooqr; - push @select_tokens, @qsooqr_flags if $bsooqr; + push @select_tokens, @qsooqr_flags, 'quotation', 'cv' 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}; @@ -886,13 +955,19 @@ sub all_parts { $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; + # in bsoorq, use qtys instead of onhand + if ($joins_needed{invoice_oi}) { + $renamed_columns{onhand} = 'onhand_before_bsooqr'; + $renamed_columns{qty} = 'onhand'; + } + # 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/; + 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; @@ -903,35 +978,32 @@ 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)'; } #============= 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.', - factor => 'pfac.', - 'SUM(ioi.qty)' => ' ', - ); - - my %renamed_columns = ( - 'factor' => 'price_factor', - 'SUM(ioi.qty)' => 'soldtotal', - ); + 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 bin priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate)); + $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 $group_clause = ' GROUP BY ' . join ', ', map { ($table_prefix{$_} || "p.") . $_ } @group_tokens if scalar @group_tokens; + my $group_clause = ' GROUP BY ' . join ', ', map { $token_builder->($_) } @group_tokens if scalar @group_tokens; + + my ($cvar_where, @cvar_values) = CVar->build_filter_query('module' => 'IC', + 'trans_id_field' => 'p.id', + 'filter' => $form); + + 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|; @@ -939,369 +1011,30 @@ 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); -# + # post processing for assembly parts lists (bom) + # for each part get the assembly parts and add them into the partlist. my @assemblies; - # include individual items for 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.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); + p.image, p.drawing, p.microfiche, + pfac.factor + FROM parts p + INNER JOIN assembly a ON (p.id = a.parts_id) + $joins{pfac} + WHERE a.id = ?|; + my $sth = prepare_query($form, $dbh, $query); - foreach $item (@{ $form->{parts} }) { + foreach my $item (@{ $form->{parts} }) { push(@assemblies, $item); do_statement($form, $sth, $query, conv_i($item->{id})); - while ($ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { $ref->{assemblyitem} = 1; + map { $ref->{$_} /= $ref->{factor} || 1 } qw(sellprice listprice lastcost); push(@assemblies, $ref); } $sth->finish; @@ -1314,51 +1047,35 @@ sub all_parts { $main::lxdebug->leave_sub(); } -sub update_prices { +sub _create_filter_for_priceupdate { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; + my $self = shift; + my $myconfig = \%main::myconfig; + my $form = $main::form; + my @where_values; my $where = '1 = 1'; - my $var; - my $group; - my $limit; + foreach my $item (qw(partnumber drawing microfiche make model pg.partsgroup)) { + my $column = $item; + $column =~ s/.*\.//; + next unless ($form->{$column}); - 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} . '%'); - } + $where .= qq| AND $item ILIKE ?|; + push(@where_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(@where_values, '%' . $form->{description} . '%'); - } + foreach my $item (qw(description serialnumber)) { + next unless ($form->{$item}); - # special case for serialnumber - if ($form->{l_serialnumber} && $form->{serialnumber}) { - $where .= qq| AND serialnumber ILIKE ?|; - push(@where_values, '%' . $form->{serialnumber} . '%'); + $where .= qq| AND (${item} ILIKE ?)|; + push(@where_values, '%' . $form->{$item} . '%'); } # 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 .= qq| AND (p.onhand = 0) AND p.id NOT IN @@ -1369,31 +1086,93 @@ sub update_prices { UNION SELECT DISTINCT parts_id FROM orderitems )|; - } - if ($form->{itemstatus} eq 'active') { + } elsif ($form->{itemstatus} eq 'active') { $where .= qq| AND p.obsolete = '0'|; - } - if ($form->{itemstatus} eq 'obsolete') { + } elsif ($form->{itemstatus} eq 'obsolete') { $where .= qq| AND p.obsolete = '1'|; - $form->{onhand} = $form->{short} = 0; - } - if ($form->{itemstatus} eq 'onhand') { + } elsif ($form->{itemstatus} eq 'onhand') { $where .= qq| AND p.onhand > 0|; - } - if ($form->{itemstatus} eq 'short') { + } elsif ($form->{itemstatus} eq 'short') { $where .= qq| AND p.onhand < p.rop|; + } foreach my $column (qw(make model)) { - next unless ($form->{$colum}); + next unless ($form->{$column}); $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|; push(@where_values, '%' . $form->{$column} . '%'); } + $main::lxdebug->leave_sub(); + + return ($where, @where_values); +} + +sub get_num_matches_for_priceupdate { + $main::lxdebug->enter_sub(); + + my $self = shift; + + my $myconfig = \%main::myconfig; + my $form = $main::form; + + my $dbh = $form->get_standard_dbh($myconfig); + + my ($where, @where_values) = $self->_create_filter_for_priceupdate(); + + my $num_updated = 0; + my $query; + + for my $column (qw(sellprice listprice)) { + next if ($form->{$column} eq ""); + + $query = + qq|SELECT COUNT(*) + FROM parts + WHERE id IN + (SELECT p.id + FROM parts p + LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) + WHERE $where)|; + my ($result) = selectfirst_array_query($form, $dbh, $query, @where_values); + $num_updated += $result if (0 <= $result); + } + + $query = + qq|SELECT COUNT(*) + FROM prices + 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 = prepare_query($form, $dbh, $query); + + for my $i (1 .. $form->{price_rows}) { + next if ($form->{"price_$i"} eq ""); + + my ($result) = do_statement($form, $sth, $query, @where_values, conv_i($form->{"pricegroup_id_$i"})); + $num_updated += $result if (0 <= $result); + } + $sth->finish(); + + $main::lxdebug->leave_sub(); + + return $num_updated; +} + +sub update_prices { + $main::lxdebug->enter_sub(); + + my ($self, $myconfig, $form) = @_; + + my ($where, @where_values) = $self->_create_filter_for_priceupdate(); + my $num_updated = 0; + # connect to database my $dbh = $form->dbconnect_noauto($myconfig); @@ -1408,14 +1187,15 @@ sub update_prices { $operator = '*'; } - $query = + my $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 $result = do_query($form, $dbh, $query, $value, @where_values); + $num_updated += $result if (0 <= $result); } my $q_add = @@ -1440,12 +1220,15 @@ sub update_prices { next if ($form->{"price_$i"} eq ""); my $value = $form->parse_amount($myconfig, $form->{"price_$i"}); + my $result; 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"})); + $result = 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"})); + $result = do_statement($form, $sth_add, $q_add, $value, @where_values, conv_i($form->{"pricegroup_id_$i"})); } + + $num_updated += $result if (0 <= $result); } $sth_add->finish(); @@ -1456,7 +1239,7 @@ sub update_prices { $main::lxdebug->leave_sub(); - return $rc; + return $num_updated; } sub create_links { @@ -1468,6 +1251,7 @@ sub create_links { my $dbh = $form->dbconnect($myconfig); my @values = ('%' . $module . '%'); + my $query; if ($form->{id}) { $query = @@ -1488,7 +1272,7 @@ sub create_links { } 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 =~ /\Q$module\E/) { if ( ($ref->{id} eq $ref->{inventory_accno_id}) @@ -1557,7 +1341,7 @@ sub get_parts { my $sth = prepare_execute_query($form, $dbh, $query, @values); my $j = 0; - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { if (($ref->{partnumber} eq "*") && ($ref->{description} eq "")) { next; } @@ -1586,7 +1370,7 @@ sub get_soldtotal { my ($dbh, $id) = @_; my $query = qq|SELECT sum(qty) FROM invoice WHERE parts_id = ?|; - my ($sum) = selectrow_query($form, $dbh, $query, conv_i($id)); + my ($sum) = selectrow_query($main::form, $dbh, $query, conv_i($id)); $sum ||= 0; $main::lxdebug->leave_sub(); @@ -1604,6 +1388,7 @@ sub retrieve_languages { my @values; my $where; + my $query; if ($form->{language_values} ne "") { $query = @@ -1647,7 +1432,7 @@ sub follow_account_chain { while (1) { do_statement($form, $sth, $query, $accno_id); - $ref = $sth->fetchrow_hashref(); + my $ref = $sth->fetchrow_hashref(); last unless ($ref && $ref->{"is_valid"} && !grep({ $_ == $ref->{"new_chart_id"} } @visited_accno_ids)); $accno_id = $ref->{"new_chart_id"}; @@ -1778,7 +1563,7 @@ sub get_basic_part_info { 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); @@ -1818,9 +1603,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); @@ -1832,7 +1619,7 @@ sub prepare_parts_for_printing { $sth->finish(); - my @columns = qw(ean); + my @columns = qw(ean image microfiche drawing weight); $query = qq|SELECT id, | . join(', ', @columns) . qq| FROM parts @@ -1840,7 +1627,7 @@ sub prepare_parts_for_printing { my %data = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids); - map { $form->{$_} = [] } (qw(make model), @columns); + map { $form->{TEMPLATE_ARRAYS}{$_} = [] } (qw(make model), @columns); foreach my $i (1 .. $rowcount) { my $id = $form->{"${prefix}${i}"}; @@ -1848,16 +1635,16 @@ sub prepare_parts_for_printing { next if (!$id); foreach (@columns) { - push @{ $form->{$_} }, $data{$id}->{$_}; + push @{ $form->{TEMPLATE_ARRAYS}{$_} }, $data{$id}->{$_}; } - push @{ $form->{make} }, []; - push @{ $form->{model} }, []; + push @{ $form->{TEMPLATE_ARRAYS}{make} }, []; + push @{ $form->{TEMPLATE_ARRAYS}{model} }, []; next if (!$makemodel{$id}); foreach my $ref (@{ $makemodel{$id} }) { - map { push @{ $form->{$_}->[-1] }, $ref->{$_} } qw(make model); + map { push @{ $form->{TEMPLATE_ARRAYS}{$_}->[-1] }, $ref->{$_} } qw(make model); } }