Aenderung von write_trigger zusammen mit einem Aufruf im alten Format

[kivitendo-erp.git] / SL / USTVA.pm

diff --git a/SL/USTVA.pm b/SL/USTVA.pm
index 4777c35..af18966 100644 (file)
--- a/SL/USTVA.pm
+++ b/SL/USTVA.pm
@@ -638,6 +638,7 @@ sub get_accounts_ustva {
   my $glwhere  = "";
   my $subwhere = "";
   my $ARwhere = "";
+  my $arwhere = "";
   my $item;
 
   if ($fromdate) {
@@ -646,13 +647,13 @@ sub get_accounts_ustva {
       $glwhere = " AND ac.transdate >= '$fromdate'";
       $ARwhere .= " AND acc.transdate >= '$fromdate'";
       $where .= " AND ac.transdate >= '$fromdate'";
+      
     }
   }
 
   if ($todate) {
     $where    .= " AND ac.transdate <= '$todate'";
     $ARwhere    .= " AND acc.transdate <= '$todate'";
-    $arwhere    .= " AND ac.transdate <= '$todate'";    
     $subwhere .= " AND transdate <= '$todate'";
   }
 
@@ -695,10 +696,11 @@ sub get_accounts_ustva {
    c.pos_ustva
    FROM acc_trans ac
    JOIN chart c ON (c.id = ac.chart_id)
-   JOIN ar ON (ar.id = ac.trans_id)
+   --JOIN ar ON (ar.id = ac.trans_id)
    where 
      1=1 
-     $arwhere
+     -- Here no where, please. All Transactions ever should be
+     -- testet if they are paied in the USTVA report period.
    GROUP BY c.pos_ustva
        UNION
 
@@ -715,7 +717,7 @@ sub get_accounts_ustva {
                     SELECT trans_id
                     FROM acc_trans
                     JOIN chart ON (chart_id = id)
-                    WHERE link LIKE '%AP_paid%'
+                    WHERE link LIKE '%AP_amount%'
                     $subwhere
                   )