my (@filter_values, $filter);
- foreach (qw(partnumber description)) {
+ foreach (qw(partnumber description ean)) {
next unless $form->{$_};
$filter .= qq| AND ($_ ILIKE ?)|;
}
if ($form->{no_assemblies}) {
- $filter .= qq| AND (NOT COALESCE(assembly, 'f'))|;
+ $filter .= qq| AND (NOT COALESCE(assembly, FALSE))|;
}
if ($form->{assemblies}) {
- $filter .= qq| AND assembly='t'|; # alles was assembly ist rausgeben erweiterung für bin/mozilla/wh.pl -> transfer_assembly_update_part
-# eigentlich möchte ich diesen filter abbilden:
-# select distinct partnumber from parts inner join assembly on (parts.id = assembly.id) where assembly='t';
-# und so common ist die anweisung gar nicht. wie wäre es mit auslagern in WH.pm? -> get_all_working_assemblies? jb 21.2.2009
+ $filter .= qq| AND assembly=TRUE|;
}
if ($form->{no_services}) {
- $filter .= qq| AND (COALESCE(inventory_accno_id, 0) > 0)|;
+ $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o.
}
substr($filter, 1, 3) = "WHERE" if ($filter);
$order_dir = $order_dir ? "ASC" : "DESC";
my $query =
- qq|SELECT id, partnumber, description | .
+ qq|SELECT id, partnumber, description, ean | .
qq|FROM parts $filter | .
qq|ORDER BY $order_by $order_dir|;
my $sth = $dbh->prepare($query);
push(@queries, qq|SELECT
c.id, c.name, 0 AS customer_is_vendor,
c.street, c.zipcode, c.city,
- ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+ ct.cp_gender, ct.cp_title, ct.cp_givenname, ct.cp_name
FROM customer c
LEFT JOIN contacts ct ON (c.id = ct.cp_cv_id)
$c_filter|);
push(@queries, qq|SELECT
v.id, v.name, 1 AS customer_is_vendor,
v.street, v.zipcode, v.city,
- ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+ ct.cp_gender, ct.cp_title, ct.cp_givenname, ct.cp_name
FROM vendor v
LEFT JOIN contacts ct ON (v.id = ct.cp_cv_id)
$v_filter|);