X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=113e9dd42b389dd43fee56e2993902b6a3348c51;hb=1c385c602908735c3be266b1470b301050650fd3;hp=d875fb162c97ace9205522d3a9d7c0294de8114e;hpb=5536f72295081df4c6b227855cfa22745fcc6039;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index d875fb162..113e9dd42 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -1193,10 +1193,12 @@ sub aging { } my $dpt_join; + my $where_dpt; if ($form->{department}) { my ($null, $department_id) = split /--/, $form->{department}; $dpt_join = qq| JOIN department d ON (a.department_id = d.id) |; $where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|; + $where_dpt = qq| AND (${arap}.department_id = | . conv_i($department_id, 'NULL') . qq|)|; } my $review_of_aging_list; if ($form->{review_of_aging_list}) { @@ -1226,6 +1228,7 @@ sub aging { WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null)) AND NOT COALESCE (${arap}.storno, 'f') AND (${arap}.${ct}_id = ${ct}.id) + $where_dpt AND (${ct}.id = ?) AND (transdate <= (date $todate) $fromwhere ) $review_of_aging_list