package IC;
use Data::Dumper;
-use List::MoreUtils qw(all);
+use List::MoreUtils qw(all any);
use YAML;
use SL::CVar;
$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}) {
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};
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;
ve = ?,
gv = ?,
ean = ?,
+ has_sernumber = ?,
not_discountable = ?,
microfiche = ?,
partsgroup_id = ?,
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),
}
#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
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};
$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);
push(@values, conv_i($form->{id}));
}
- if ($partnumber) {
+ if ($form->{partnumber}) {
$where .= qq| ORDER BY p.partnumber|;
} else {
$where .= qq| ORDER BY p.description|;
#
# 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 {
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 (
) 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;
+
+ 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.',
+ );
+
+ # 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;
}
- #===== 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)) {
}
}
- 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->{$_}%";
}
LEFT JOIN parts p_lc ON (a_lc.parts_id = p_lc.id)
LEFT JOIN price_factors pfac_lc ON (p_lc.price_factor_id = pfac_lc.id)
WHERE (a_lc.id = p.id)) AS lastcost|;
-
- my @sort_cols = (@simple_filters, qw(id bin priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate));
- $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols;
-
- my $sort_order = ($form->{revers} ? ' DESC' : ' ASC');
-
- my $order_clause = " ORDER BY $form->{sort} " . ($form->{revers} ? 'DESC' : 'ASC');
+ $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.
#=== 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' 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};
$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;
#============= 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 ($cvar_where, @cvar_values) = CVar->build_filter_query('module' => 'IC',
'trans_id_field' => 'p.id',
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);
}
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})
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;
}
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();
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);
projects / kivitendo-erp.git / blobdiff