projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Einkaufsrechnungen: Suche nach Artikelnummer/-beschreibung in Positionen
[kivitendo-erp.git]
/
SL
/
DN.pm
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
0ada08c
..
1804959
100644
(file)
--- a/
SL/DN.pm
+++ b/
SL/DN.pm
@@
-45,6
+45,7
@@
use SL::Template;
use SL::DB::Printer;
use SL::DB::Language;
use SL::TransNumber;
use SL::DB::Printer;
use SL::DB::Language;
use SL::TransNumber;
+use SL::Util qw(trim);
use strict;
use strict;
@@
-491,7
+492,7
@@
sub get_invoices {
} elsif ($form->{customer}) {
$where .= qq| AND (ct.name ILIKE ?)|;
} elsif ($form->{customer}) {
$where .= qq| AND (ct.name ILIKE ?)|;
- push(@values,
'%' . $form->{customer} . '%'
);
+ push(@values,
like($form->{customer})
);
}
my %columns = (
}
my %columns = (
@@
-503,7
+504,7
@@
sub get_invoices {
foreach my $key (keys(%columns)) {
next unless ($form->{$key});
$where .= qq| AND $columns{$key} ILIKE ?|;
foreach my $key (keys(%columns)) {
next unless ($form->{$key});
$where .= qq| AND $columns{$key} ILIKE ?|;
- push(@values,
'%' . $form->{$key} . '%'
);
+ push(@values,
like($form->{$key})
);
}
if ($form->{dunning_level}) {
}
if ($form->{dunning_level}) {
@@
-514,7
+515,7
@@
sub get_invoices {
$form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
if ($form->{minamount}) {
$where .= qq| AND ((a.amount - a.paid) > ?) |;
$form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
if ($form->{minamount}) {
$where .= qq| AND ((a.amount - a.paid) > ?) |;
- push(@values,
$form->{minamount}
);
+ push(@values,
trim($form->{minamount})
);
}
my $query =
}
my $query =
@@
-529,7
+530,7
@@
sub get_invoices {
$query =
qq|SELECT
$query =
qq|SELECT
- a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, a.language_id,
+ a.id, a.
invoice, a.
ordnumber, a.transdate, a.invnumber, a.amount, a.language_id,
ct.name AS customername, a.customer_id, a.duedate,
a.amount - a.paid AS open_amount,
a.direct_debit,
ct.name AS customername, a.customer_id, a.duedate,
a.amount - a.paid AS open_amount,
a.direct_debit,
@@
-618,7
+619,7
@@
sub get_dunning {
} elsif ($form->{customer}) {
$where .= qq| AND (ct.name ILIKE ?)|;
} elsif ($form->{customer}) {
$where .= qq| AND (ct.name ILIKE ?)|;
- push(@values,
'%' . $form->{customer} . '%'
);
+ push(@values,
like($form->{customer})
);
}
my %columns = (
}
my %columns = (
@@
-629,7
+630,7
@@
sub get_dunning {
foreach my $key (keys(%columns)) {
next unless ($form->{$key});
$where .= qq| AND $columns{$key} ILIKE ?|;
foreach my $key (keys(%columns)) {
next unless ($form->{$key});
$where .= qq| AND $columns{$key} ILIKE ?|;
- push(@values,
'%' . $form->{$key} . '%'
);
+ push(@values,
like($form->{$key})
);
}
if ($form->{dunning_level}) {
}
if ($form->{dunning_level}) {