projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
history_erp Eintrag für Verkaufsrechnung, die storniert wird
[kivitendo-erp.git]
/
SL
/
AR.pm
diff --git
a/SL/AR.pm
b/SL/AR.pm
index
af78117
..
692967f
100644
(file)
--- a/
SL/AR.pm
+++ b/
SL/AR.pm
@@
-480,6
+480,7
@@
sub ar_transactions {
) AS charts } .
qq|FROM ar a | .
qq|JOIN customer c ON (a.customer_id = c.id) | .
) AS charts } .
qq|FROM ar a | .
qq|JOIN customer c ON (a.customer_id = c.id) | .
+ qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
@@
-505,6
+506,10
@@
sub ar_transactions {
$where .= " AND c.name ILIKE ?";
push(@values, $form->like($form->{customer}));
}
$where .= " AND c.name ILIKE ?";
push(@values, $form->like($form->{customer}));
}
+ if ($form->{"cp_name"}) {
+ $where .= " AND (cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
+ push(@values, ('%' . $form->{"cp_name"} . '%')x2);
+ }
if ($form->{business_id}) {
my $business_id = $form->{business_id};
$where .= " AND c.business_id = ?";
if ($form->{business_id}) {
my $business_id = $form->{business_id};
$where .= " AND c.business_id = ?";