From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 5 Jan 2016 16:08:18 +0000 (+0100)
Subject: SEPA: bei Liste noch zu erledigender Rechnungen Skonto berücksichtigen
X-Git-Tag: release-3.4.1~477
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=003d4959b86170552ee07fd964baedd150165b35;p=kivitendo-erp.git

SEPA: bei Liste noch zu erledigender Rechnungen Skonto berücksichtigen
---

diff --git a/SL/SEPA.pm b/SL/SEPA.pm
index 94579179b..2b5738d6e 100644
--- a/SL/SEPA.pm
+++ b/SL/SEPA.pm
@@ -49,7 +49,7 @@ sub retrieve_open_invoices {
 
        FROM ${arap}
        LEFT JOIN ${vc} vc ON (${arap}.${vc}_id = vc.id)
-       LEFT JOIN (SELECT sei.${arap}_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