projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DBUtils: doku
[kivitendo-erp.git]
/
SL
/
RP.pm
diff --git
a/SL/RP.pm
b/SL/RP.pm
index
1875e0c
..
a18452e
100644
(file)
--- a/
SL/RP.pm
+++ b/
SL/RP.pm
@@
-473,6
+473,9
@@
sub get_accounts_g {
$inwhere = " AND (acc.transdate >= $fromdate)";
} else {
$where .= " AND (ac.transdate >= $fromdate)";
$inwhere = " AND (acc.transdate >= $fromdate)";
} else {
$where .= " AND (ac.transdate >= $fromdate)";
+ # hotfix for projectfilter in guv and bwa
+ # fromdate is otherwise ignored if project is selected
+ $prwhere = " AND (a.transdate >= $fromdate)";
}
}
}
}
@@
-1263,7
+1266,7
@@
sub aging {
if ($form->{$ct_id}) {
$where .= qq| AND (ct.id = | . conv_i($form->{$ct_id}) . qq|)|;
} elsif ($form->{ $form->{ct} }) {
if ($form->{$ct_id}) {
$where .= qq| AND (ct.id = | . conv_i($form->{$ct_id}) . qq|)|;
} elsif ($form->{ $form->{ct} }) {
- $where .= qq| AND (ct.name ILIKE | . $dbh->quote(
'%' . $form->{$ct} . '%'
) . qq|)|;
+ $where .= qq| AND (ct.name ILIKE | . $dbh->quote(
like($form->{$ct})
) . qq|)|;
}
my $dpt_join;
}
my $dpt_join;
@@
-1518,15
+1521,15
@@
sub payments {
my $invnumber;
my $reference;
if ($form->{reference}) {
my $invnumber;
my $reference;
if ($form->{reference}) {
- $reference = $dbh->quote(
'%' . $form->{reference} . '%'
);
+ $reference = $dbh->quote(
like($form->{reference})
);
$invnumber = " AND (a.invnumber LIKE $reference)";
$reference = " AND (a.reference LIKE $reference)";
}
if ($form->{source}) {
$invnumber = " AND (a.invnumber LIKE $reference)";
$reference = " AND (a.reference LIKE $reference)";
}
if ($form->{source}) {
- $where .= " AND (ac.source ILIKE " . $dbh->quote(
'%' . $form->{source} . '%'
) . ") ";
+ $where .= " AND (ac.source ILIKE " . $dbh->quote(
like($form->{source})
) . ") ";
}
if ($form->{memo}) {
}
if ($form->{memo}) {
- $where .= " AND (ac.memo ILIKE " . $dbh->quote(
'%' . $form->{memo} . '%'
) . ") ";
+ $where .= " AND (ac.memo ILIKE " . $dbh->quote(
like($form->{memo})
) . ") ";
}
my %sort_columns = (
}
my %sort_columns = (