X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIC.pm;h=b6007d9dce3e3aff60068730dd9e28b9b2466789;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=09741963a909316e71c4261ac66e3eb466d99e79;hpb=1cf7af35bbd40e41d819739f8837fbd05b71be44;p=kivitendo-erp.git diff --git a/SL/IC.pm b/SL/IC.pm index 09741963a..b6007d9dc 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -35,12 +35,14 @@ 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 strict; + sub get_part { $main::lxdebug->enter_sub(); @@ -70,9 +72,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}) { @@ -88,11 +87,11 @@ 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 = ?) - 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}; @@ -168,14 +167,17 @@ sub get_part { # get makes if ($form->{makemodel}) { - $query = qq|SELECT m.make, m.model FROM makemodel m | . - qq|WHERE m.parts_id = ?|; + #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"}) = $sth->fetchrow_array) + + while (($form->{"make_$i"}, $form->{"model_$i"}, $form->{"old_lastcost_$i"}, + $form->{"lastcost_$i"}, $form->{"lastupdate_$i"}, $form->{"sortorder_$i"}) = $sth->fetchrow_array) { $i++; } @@ -191,7 +193,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; @@ -351,7 +353,7 @@ sub save { } ($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->{orphaned} = 1; if ($form->{partnumber} eq "" && $form->{"item"} eq "service") { @@ -415,6 +417,7 @@ sub save { ve = ?, gv = ?, ean = ?, + has_sernumber = ?, not_discountable = ?, microfiche = ?, partsgroup_id = ?, @@ -444,6 +447,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), @@ -492,12 +496,25 @@ sub save { # 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"})) { - - $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->{"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); } @@ -510,7 +527,7 @@ sub save { $query = qq|INSERT INTO partstax (parts_id, chart_id) VALUES (?, (SELECT id FROM chart WHERE accno = ?))|; - @values = (conv_i($form->{id}), $item); + @values = (conv_i($form->{id}), $item); do_query($form, $dbh, $query, @values); } } @@ -524,8 +541,8 @@ sub save { 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); } } @@ -540,13 +557,13 @@ 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 @@ -556,7 +573,7 @@ sub save { my $stw = prepare_execute_query($form, $dbh, $query, $accno_id); $form->{taxaccount} = ""; - while (my $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}; @@ -566,10 +583,11 @@ 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); # commit my $rc = $dbh->commit; @@ -596,7 +614,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); @@ -688,7 +706,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|; @@ -747,16 +765,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 { @@ -772,48 +790,109 @@ 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, @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, id FROM invoice UNION + SELECT parts_id, description, serialnumber, trans_id, unit, sellprice, qty, FALSE AS assemblyitem, NULL AS deliverydate, 'orderitems' AS ioi, id FROM orderitems ) AS ioi ON ioi.parts_id = p.id|, apoe => q|LEFT JOIN ( - SELECT id, transdate, 'ir' AS module, ordnumber, quonumber, invnumber, FALSE AS quotation, NULL AS customer_id, vendor_id, NULL AS deliverydate, 'invoice' AS ioi FROM ap UNION - SELECT id, transdate, 'is' AS module, ordnumber, quonumber, invnumber, FALSE AS quotation, customer_id, NULL AS vendor_id, deliverydate, 'invoice' AS ioi FROM ar UNION - SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber, quotation, customer_id, vendor_id, NULL AS deliverydate, 'orderitems' AS ioi FROM oe + 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, reqdate AS deliverydate, 'orderitems' AS ioi FROM oe ) AS apoe ON ((ioi.trans_id = apoe.id) AND (ioi.ioi = apoe.ioi))|, cv => q|LEFT JOIN ( SELECT id, name, 'customer' AS cv FROM customer UNION SELECT id, name, 'vendor' AS cv FROM vendor ) AS cv ON cv.id = apoe.customer_id OR cv.id = apoe.vendor_id|, + mv => 'LEFT JOIN vendor AS mv ON mv.id = mm.make', + ); + my @join_order = qw(partsgroup makemodel mv invoice_oi apoe cv pfac); + + 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 => 'p.', , soldtotal => ' ', + factor => 'pfac.', + 'SUM(ioi.qty)' => ' ', + 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 + [ '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', + 'ioi.id' => 'ioi_id', + 'ioi.ioi' => 'ioi', ); - 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 $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) + : ''); + } + }; - 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)) { @@ -826,14 +905,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->{$_}%"; } @@ -867,13 +942,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|; + $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. @@ -886,17 +968,16 @@ sub all_parts { #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 ========# - 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 = (); - 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}; @@ -910,17 +991,24 @@ sub all_parts { $joins_needed{partsgroup} = 1; $joins_needed{pfac} = 1; $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{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; @@ -929,7 +1017,7 @@ sub all_parts { # 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)'; @@ -937,45 +1025,48 @@ sub all_parts { #============= build query ================# - my %table_prefix; - %table_prefix = ( - %table_prefix, - deliverydate => 'apoe.', serialnumber => 'ioi.', - transdate => 'apoe.', trans_id => 'ioi.', - module => 'apoe.', name => 'cv.', - ordnumber => 'apoe.', make => 'mm.', - quonumber => 'apoe.', model => 'mm.', - invnumber => 'apoe.', partsgroup => 'pg.', - lastcost => ' ', - factor => 'pfac.', - 'SUM(ioi.qty)' => ' ', - ); - - $table_prefix{$q_assembly_lastcost} = ' '; - - 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 %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; } - 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); @@ -1002,7 +1093,7 @@ sub all_parts { push(@assemblies, $item); do_statement($form, $sth, $query, conv_i($item->{id})); - while (my $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); @@ -1015,6 +1106,8 @@ sub all_parts { } $main::lxdebug->leave_sub(); + + return wantarray ? @{ $form->{parts} } : $form->{parts}; } sub _create_filter_for_priceupdate { @@ -1242,7 +1335,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}) @@ -1311,7 +1404,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; } @@ -1340,7 +1433,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(); @@ -1392,17 +1485,17 @@ sub follow_account_chain { 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, <= 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) { - 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"}; @@ -1416,16 +1509,19 @@ sub follow_account_chain { } sub retrieve_accounts { - $main::lxdebug->enter_sub(2); + $main::lxdebug->enter_sub; - my ($self, $myconfig, $form, $parts_id, $index) = @_; - - 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 = ""; if ($form->{type} eq "invoice") { if (($form->{vc} eq "vendor") || !$form->{deliverydate}) { @@ -1440,77 +1536,71 @@ sub retrieve_accounts { } if ($transdate eq "") { - $transdate = "current_date"; + $transdate = DateTime->today_local->to_lxoffice; } 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, <{taxzone_id} AS income_accno_id, + bg.expense_accno_id_$form->{taxzone_id} AS expense_accno_id, + c1.accno AS inventory_accno, + c2.accno AS income_accno, + c3.accno AS expense_accno + FROM parts p + LEFT JOIN buchungsgruppen bg ON p.buchungsgruppen_id = bg.id + LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id + LEFT JOIN chart c2 ON bg.income_accno_id_$form->{taxzone_id} = c2.id + LEFT JOIN chart c3 ON bg.expense_accno_id_$form->{taxzone_id} = c3.id + WHERE p.id IN ($in) +SQL + + my $sth_tax = prepare_query($::form, $dbh, < $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 { @@ -1533,7 +1623,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); @@ -1575,7 +1665,7 @@ sub prepare_parts_for_printing { my $placeholders = join ', ', ('?') x scalar(@part_ids); my $query = qq|SELECT mm.parts_id, mm.model, v.name AS make FROM makemodel mm - LEFT JOIN vendor v ON (mm.make = cast (v.id as text)) + LEFT JOIN vendor v ON (mm.make = v.id) WHERE mm.parts_id IN ($placeholders)|; my %makemodel = ();