RP->aging: storno kann auch NULL sein

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

diff --git a/SL/RP.pm b/SL/RP.pm
index e4fb848..88f4ebe 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -37,9 +37,9 @@ package RP;
 use SL::DBUtils;
 use Data::Dumper;
 use List::Util qw(sum);
-# use strict;
-# use warnings;
 
+# use warnings;
+use strict;
 
 # new implementation of balance sheet
 # readme!
@@ -215,6 +215,8 @@ sub get_accounts {
   }
 
   if ($form->{project_id}) {
+    # Diese Bedingung wird derzeit niemals wahr sein, da man in Bericht->Bilanz keine
+    # Projekte auswählen kann
     $project = qq| AND (ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |;
   }
 
@@ -276,6 +278,7 @@ sub get_accounts {
          GROUP BY c.accno, c.description, c.category |;
 
     if ($form->{project_id}) {
+      # s.o. keine Projektauswahl in Bilanz
       $query .=
         qq|
          UNION ALL
@@ -325,10 +328,12 @@ sub get_accounts {
     }
 
   } else {                      # if ($form->{method} eq 'cash')
-    if ($department_id) {
-      $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
-      $dpt_where = qq| AND t.department_id = $department_id |;
-    }
+    # ich sehe keinen sinn das nochmal explizit ohne conv_i aufzurufen
+    # bitte prüfen und löschen jan 15.11.2009
+  #  if ($department_id) {
+  #    $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
+  #    $dpt_where = qq| AND t.department_id = $department_id |;
+  #  }
 
     $query = qq|
       SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category
@@ -342,6 +347,7 @@ sub get_accounts {
       GROUP BY c.accno, c.description, c.category |;
 
     if ($form->{project_id}) {
+      # s.o. keine Projektauswahl in Bilanz
       $query .= qq|
       UNION ALL
 
@@ -439,6 +445,7 @@ sub get_accounts_g {
   my $glwhere  = "";
   my $prwhere  = "";
   my $subwhere = "";
+  my $inwhere = "";
   my $item;
 
   if ($fromdate) {
@@ -572,10 +579,10 @@ sub get_accounts_g {
     }
 
   } else {                      # if ($form->{method} eq 'cash')
-    if ($department_id) {
-      $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
-      $dpt_where = qq| AND (t.department_id = | . conv_i($department_id, 'NULL') . qq|) |;
-    }
+    # s.o. jan 15.11.2009
+#    if ($department_id) {
+#      ($dpt_join, $dpt_where) = sql_department($department_id);
+#    }
 
     $query = qq|
         SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category
@@ -776,6 +783,7 @@ sub trial_balance {
   my $glwhere       = '';
   my $glsumwhere    = '';
   my $tofrom;
+  my ($fromdate, $todate);
 
   if ($form->{fromdate} || $form->{todate}) {
     if ($form->{fromdate}) {
@@ -1190,7 +1198,7 @@ sub aging {
          AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
     FROM ${arap}, ${ct}
     WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))
-      AND (${arap}.storno IS FALSE)
+      AND NOT COALESCE (${arap}.storno, 'f')
       AND (${arap}.${ct}_id = ${ct}.id)
       AND (${ct}.id = ?)
       AND (transdate <= (date $todate) $fromwhere )
@@ -1804,26 +1812,26 @@ sub ustva {
   &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, "pos_ustva");
 
   #   foreach $item (@categories_cent) {
-  #    if ($form->{$item}{"jetzt"} > 0) {
-  #            $form->{$item} = $form->{$item}{"jetzt"};
-  #            delete $form->{$item}{"jetzt"};
-  #    }
+  #     if ($form->{$item}{"jetzt"} > 0) {
+  #       $form->{$item} = $form->{$item}{"jetzt"};
+  #       delete $form->{$item}{"jetzt"};
+  #     }
   #   }
   #   foreach $item (@categories_euro) {
-  #    if ($form->{$item}{"jetzt"} > 0) {
-  #            $form->{$item} = $form->{$item}{"jetzt"};
-  #            delete $form->{$item}{"jetzt"};
-  #    }  foreach $item (@categories_cent) {
-  #    if ($form->{$item}{"jetzt"} > 0) {
-  #            $form->{$item} = $form->{$item}{"jetzt"};
-  #            delete $form->{$item}{"jetzt"};
-  #    }
+  #     if ($form->{$item}{"jetzt"} > 0) {
+  #       $form->{$item} = $form->{$item}{"jetzt"};
+  #       delete $form->{$item}{"jetzt"};
+  #     }  foreach $item (@categories_cent) {
+  #     if ($form->{$item}{"jetzt"} > 0) {
+  #       $form->{$item} = $form->{$item}{"jetzt"};
+  #       delete $form->{$item}{"jetzt"};
+  #     }
   #   }
   #   foreach $item (@categories_euro) {
-  #    if ($form->{$item}{"jetzt"} > 0) {
-  #            $form->{$item} = $form->{$item}{"jetzt"};
-  #            delete $form->{$item}{"jetzt"};
-  #    }
+  #     if ($form->{$item}{"jetzt"} > 0) {
+  #       $form->{$item} = $form->{$item}{"jetzt"};
+  #       delete $form->{$item}{"jetzt"};
+  #     }
   #   }
   #
   #    }