is.pl: unnötige parse_amounts

[mfinanz.git] / SL / RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 2aa1e8d980533a6f51c815ee1ad74b08d6c5326b..80bd7891f273fb5388781806e4825705c34bcb41 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -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
 
@@ -573,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