projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c853dd6
)
Kunden Lieferungen-Tab: bei "Alle" nach der Kundenid suchen
author
Thomas Heck
<theck@linet-services.de>
Tue, 26 Nov 2013 16:22:43 +0000
(17:22 +0100)
committer
Thomas Heck
<theck@linet-services.de>
Tue, 26 Nov 2013 16:22:43 +0000
(17:22 +0100)
fixt #2393
SL/Controller/CustomerVendor.pm
patch
|
blob
|
history
diff --git
a/SL/Controller/CustomerVendor.pm
b/SL/Controller/CustomerVendor.pm
index
f2e4ff6
..
0ffa2f5
100644
(file)
--- a/
SL/Controller/CustomerVendor.pm
+++ b/
SL/Controller/CustomerVendor.pm
@@
-407,21
+407,24
@@
sub action_get_delivery {
$qty_sign = '';
}
$qty_sign = '';
}
- my $where = ' WHERE 1=1
';
+ my $where = ' WHERE 1=1';
my @values;
if ( !$self->is_vendor() && $::form->{shipto_id} && $::form->{shipto_id} ne 'all' ) {
my @values;
if ( !$self->is_vendor() && $::form->{shipto_id} && $::form->{shipto_id} ne 'all' ) {
- $where .= "AND ${arap}.shipto_id = ?";
+ $where .= "
AND ${arap}.shipto_id = ?";
push(@values, $::form->{shipto_id});
push(@values, $::form->{shipto_id});
+ } else {
+ $where .= " AND ${arap}.${db}_id = ?";
+ push(@values, $::form->{id});
}
if ( $::form->{delivery_from} ) {
}
if ( $::form->{delivery_from} ) {
- $where .= "AND ${arap}.transdate >= ?";
+ $where .= "
AND ${arap}.transdate >= ?";
push(@values, conv_date($::form->{delivery_from}));
}
if ( $::form->{delivery_to} ) {
push(@values, conv_date($::form->{delivery_from}));
}
if ( $::form->{delivery_to} ) {
- $where .= "AND ${arap}.transdate <= ?";
+ $where .= "
AND ${arap}.transdate <= ?";
push(@values, conv_date($::form->{delivery_to}));
}
push(@values, conv_date($::form->{delivery_to}));
}