projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verbesserung der Suchfunktionen der Historie und Visualisierung der Sortierreihenfolge.
[kivitendo-erp.git]
/
SL
/
DN.pm
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
5ffb4ba
..
95ff16a
100644
(file)
--- a/
SL/DN.pm
+++ b/
SL/DN.pm
@@
-418,8
+418,6
@@
sub get_dunning {
my @values;
my @values;
- $form->{customer_id} = $1 if ($form->{customer} =~ /--(\d+)$/);
-
if ($form->{customer_id}) {
$where .= qq| AND (a.customer_id = ?)|;
push(@values, $form->{customer_id});
if ($form->{customer_id}) {
$where .= qq| AND (a.customer_id = ?)|;
push(@values, $form->{customer_id});
@@
-429,7
+427,6
@@
sub get_dunning {
push(@values, '%' . $form->{customer} . '%');
}
push(@values, '%' . $form->{customer} . '%');
}
-
my %columns = (
"ordnumber" => "a.ordnumber",
"invnumber" => "a.invnumber",
my %columns = (
"ordnumber" => "a.ordnumber",
"invnumber" => "a.invnumber",
@@
-446,7
+443,12
@@
sub get_dunning {
push(@values, conv_i($form->{dunning_level}));
}
push(@values, conv_i($form->{dunning_level}));
}
- $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
+ if ($form->{department_id}) {
+ $where .= qq| AND a.department_id = ?|;
+ push @values, conv_i($form->{department_id});
+ }
+
+ $form->{minamount} = $form->parse_amount($myconfig, $form->{minamount});
if ($form->{minamount}) {
$where .= qq| AND ((a.amount - a.paid) > ?) |;
push(@values, $form->{minamount});
if ($form->{minamount}) {
$where .= qq| AND ((a.amount - a.paid) > ?) |;
push(@values, $form->{minamount});