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 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
Common.pm
diff --git
a/SL/Common.pm
b/SL/Common.pm
index
ff6c721
..
dc1cc04
100644
(file)
--- a/
SL/Common.pm
+++ b/
SL/Common.pm
@@
-85,7
+85,7
@@
sub retrieve_parts {
}
if ($form->{no_services}) {
}
if ($form->{no_services}) {
- $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|;
# @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o.
+ $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|;
}
substr($filter, 1, 3) = "WHERE" if ($filter);
}
substr($filter, 1, 3) = "WHERE" if ($filter);
@@
-94,7
+94,8
@@
sub retrieve_parts {
$order_dir = $order_dir ? "ASC" : "DESC";
my $query =
$order_dir = $order_dir ? "ASC" : "DESC";
my $query =
- qq|SELECT id, partnumber, description, ean | .
+ qq|SELECT id, partnumber, description, ean, | .
+ qq| warehouse_id, bin_id | .
qq|FROM parts $filter | .
qq|ORDER BY $order_by $order_dir|;
my $sth = $dbh->prepare($query);
qq|FROM parts $filter | .
qq|ORDER BY $order_by $order_dir|;
my $sth = $dbh->prepare($query);
@@
-501,6
+502,8
@@
sub save_email_status {
} elsif ($form->{script} eq 'ir.pl') {
$table = 'ap';
} elsif ($form->{script} eq 'ir.pl') {
$table = 'ap';
+ } elsif ($form->{script} eq 'do.pl') {
+ $table = 'delivery_orders';
}
return $main::lxdebug->leave_sub() if (!$form->{id} || !$table || !$form->{formname});
}
return $main::lxdebug->leave_sub() if (!$form->{id} || !$table || !$form->{formname});