Solved Bug 365: Falsche UStVA bei negativem Vorsteuer-Betrag (Teil 2)

[mfinanz.git] / SL / USTVA.pm

diff --git a/SL/USTVA.pm b/SL/USTVA.pm
index f1bd2a0340e2f9cbaa0474002e3251198fbdc75c..3cb7ff816c0d3b5f245c0cb20d940f92f235ca71 100644 (file)
--- a/SL/USTVA.pm
+++ b/SL/USTVA.pm
@@ -724,14 +724,17 @@ sub get_accounts_ustva {
 
         UNION
 
-                SELECT sum(ac.amount) AS amount,
+                SELECT sum(
+                  CASE WHEN c.link LIKE '%AR%' THEN ac.amount * -1
+                       WHEN c.link LIKE '%AP%' THEN ac.amount * 1
+                   END
+                ) AS amount,
                 c.$category
                 FROM acc_trans ac
                 JOIN chart c ON (c.id = ac.chart_id)
                 JOIN gl a ON (a.id = ac.trans_id)
                 $dpt_join
                 WHERE $where
-                $glwhere
                 $dpt_from
                 AND NOT (c.link = 'AR' OR c.link = 'AP')
                 $project