X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=d875fb162c97ace9205522d3a9d7c0294de8114e;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=607eb389e445bf6a04f9ea96fb636b8babfba193;hpb=70081eba44edcef56e0344824b7feaa6d2035e77;p=kivitendo-erp.git

diff --git a/SL/RP.pm b/SL/RP.pm
index 607eb389e..d875fb162 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -53,6 +53,8 @@ use strict;
 sub get_openbalance_date {
   my ($closedto, $target) = map { $::locale->parse_date_to_object(\%::myconfig, $_) } @_;
 
+  return unless $closedto;
+
   $closedto->subtract(years => 1) while ($target - $closedto)->is_negative;
   $closedto->add(days => 1);
   return $::locale->format_date(\%::myconfig, $closedto);
@@ -344,12 +346,10 @@ sub get_accounts {
     }
 
   } else {                      # if ($form->{method} eq 'cash')
-    # 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 |;
-  #  }
+    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);
+    }
 
     $query = qq|
       SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category
@@ -595,10 +595,10 @@ sub get_accounts_g {
     }
 
   } else {                      # if ($form->{method} eq 'cash')
-    # s.o. jan 15.11.2009
-#    if ($department_id) {
-#      ($dpt_join, $dpt_where) = sql_department($department_id);
-#    }
+    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|) |;
+    }
 
     $query = qq|
         SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category