projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rechnungen: Sicherheitsnachfrage vor Stornierung
[kivitendo-erp.git]
/
SL
/
SEPA.pm
diff --git
a/SL/SEPA.pm
b/SL/SEPA.pm
index
8e7306e
..
2b5738d
100644
(file)
--- a/
SL/SEPA.pm
+++ b/
SL/SEPA.pm
@@
-49,13
+49,13
@@
sub retrieve_open_invoices {
FROM ${arap}
LEFT JOIN ${vc} vc ON (${arap}.${vc}_id = vc.id)
FROM ${arap}
LEFT JOIN ${vc} vc ON (${arap}.${vc}_id = vc.id)
- LEFT JOIN (SELECT sei.
ap_id, SUM(sei.amount
) AS amount
+ LEFT JOIN (SELECT sei.
${arap}_id, SUM(sei.amount) + SUM(COALESCE(sei.skonto_amount,0)
) AS amount
FROM sepa_export_items sei
LEFT JOIN sepa_export se ON (sei.sepa_export_id = se.id)
WHERE NOT se.closed
AND (se.vc = '${vc}')
FROM sepa_export_items sei
LEFT JOIN sepa_export se ON (sei.sepa_export_id = se.id)
WHERE NOT se.closed
AND (se.vc = '${vc}')
- GROUP BY sei.
ap
_id)
- AS open_transfers ON (${arap}.id = open_transfers.
ap
_id)
+ GROUP BY sei.
${arap}
_id)
+ AS open_transfers ON (${arap}.id = open_transfers.
${arap}
_id)
LEFT JOIN payment_terms pt ON (${payment_term_type}.payment_id = pt.id)
LEFT JOIN payment_terms pt ON (${payment_term_type}.payment_id = pt.id)
@@
-326,6
+326,17
@@
sub list_exports {
$joins_sub{$arap} = 1;
}
$joins_sub{$arap} = 1;
}
+ if ($filter->{message_id}) {
+ push @values, '%' . $filter->{message_id} . '%';
+ push @where, <<SQL;
+ se.id IN (
+ SELECT sepa_export_id
+ FROM sepa_export_message_ids
+ WHERE message_id ILIKE ?
+ )
+SQL
+ }
+
if ($filter->{vc}) {
push @where_sub, "vc.name ILIKE ?";
push @values_sub, '%' . $filter->{vc} . '%';
if ($filter->{vc}) {
push @where_sub, "vc.name ILIKE ?";
push @values_sub, '%' . $filter->{vc} . '%';
@@
-370,6
+381,9
@@
sub list_exports {
(SELECT SUM(sei.amount)
FROM sepa_export_items sei
WHERE (sei.sepa_export_id = se.id)) AS sum_amounts,
(SELECT SUM(sei.amount)
FROM sepa_export_items sei
WHERE (sei.sepa_export_id = se.id)) AS sum_amounts,
+ (SELECT string_agg(semi.message_id, ', ')
+ FROM sepa_export_message_ids semi
+ WHERE semi.sepa_export_id = se.id) AS message_ids,
e.name AS employee
FROM sepa_export se
LEFT JOIN (
e.name AS employee
FROM sepa_export se
LEFT JOIN (