projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811
[kivitendo-erp.git]
/
sql
/
Pg-upgrade2
/
erzeugnisnummern.pl
diff --git
a/sql/Pg-upgrade2/erzeugnisnummern.pl
b/sql/Pg-upgrade2/erzeugnisnummern.pl
index
a6e9593
..
8468e69
100644
(file)
--- a/
sql/Pg-upgrade2/erzeugnisnummern.pl
+++ b/
sql/Pg-upgrade2/erzeugnisnummern.pl
@@
-13,7
+13,7
@@
use SL::DBUtils;
sub run {
my ($self) = @_;
sub run {
my ($self) = @_;
- if ($::form->{upgrade_action} eq 'filter_parts') {
+ if (
defined $::form->{upgrade_action} &&
$::form->{upgrade_action} eq 'filter_parts') {
return $self->filter_parts($self);
}
return $self->filter_parts($self);
}
@@
-22,9
+22,7
@@
sub run {
foreach my $i (1 .. $::form->{rowcount}) {
$update_query = qq|UPDATE parts SET partnumber = '| . $::form->{"partnumber_$i"} . qq|' WHERE id = | . $::form->{"partid_$i"};
$self->db_query($update_query);
foreach my $i (1 .. $::form->{rowcount}) {
$update_query = qq|UPDATE parts SET partnumber = '| . $::form->{"partnumber_$i"} . qq|' WHERE id = | . $::form->{"partid_$i"};
$self->db_query($update_query);
- print FH $i;
}
}
- $self->dbh->commit();
}
my $query = qq|SELECT id, partnumber, description, unit, notes, assembly, ean, inventory_accno_id, obsolete
}
my $query = qq|SELECT id, partnumber, description, unit, notes, assembly, ean, inventory_accno_id, obsolete
@@
-62,35
+60,34
@@
sub filter_parts {
if ( $::form->{filter_partnumber} ) {
$where .= ' AND partnumber ILIKE ?';
if ( $::form->{filter_partnumber} ) {
$where .= ' AND partnumber ILIKE ?';
- push(@values,
$::form->
like( $::form->{filter_partnumber} ));
+ push(@values, like( $::form->{filter_partnumber} ));
}
if ($::form->{filter_description}) {
$where .= ' AND description ILIKE ?';
}
if ($::form->{filter_description}) {
$where .= ' AND description ILIKE ?';
- push(@values,
$::form->
like($::form->{filter_description}));
+ push(@values, like($::form->{filter_description}));
}
if ($::form->{filter_notes}) {
$where .= ' AND notes ILIKE ?';
}
if ($::form->{filter_notes}) {
$where .= ' AND notes ILIKE ?';
- push(@values,
$::form->
like($::form->{filter_notes}));
+ push(@values, like($::form->{filter_notes}));
}
if ($::form->{filter_ean}) {
$where .= ' AND ean ILIKE ?';
}
if ($::form->{filter_ean}) {
$where .= ' AND ean ILIKE ?';
- push(@values,
$::form->
like($::form->{filter_ean}));
+ push(@values, like($::form->{filter_ean}));
}
if ($::form->{filter_type} eq 'assembly') {
}
if ($::form->{filter_type} eq 'assembly') {
- $where .=
' AND assembly'
;
+ $where .=
" AND part_type = 'assembly'"
;
}
if ($::form->{filter_type} eq 'service') {
}
if ($::form->{filter_type} eq 'service') {
- $where .=
' AND inventory_accno_id IS NULL AND NOT assembly'
;
+ $where .=
" AND part_type = 'service'"
;
}
if ($::form->{filter_type} eq 'part') {
}
if ($::form->{filter_type} eq 'part') {
- $where .= ' AND inventory_accno_id IS NOT NULL';
- $where .= ' AND NOT assembly';
+ $where .= " AND part_type = 'part'";
}
if ($::form->{filter_obsolete} eq 'obsolete') {
}
if ($::form->{filter_obsolete} eq 'obsolete') {