X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDN.pm;h=95ff16ac3714c271ca1db0878898adc10ab1daa3;hb=41a039692bf1d655df629fd833fd6d6d428eb29b;hp=5ffb4ba6629374be03d58c791a031599577ed65c;hpb=f3d322cfd7776bebb922f3cd390bd62e4f5baf09;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index 5ffb4ba66..95ff16ac3 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -418,8 +418,6 @@ sub get_dunning { my @values; - $form->{customer_id} = $1 if ($form->{customer} =~ /--(\d+)$/); - if ($form->{customer_id}) { $where .= qq| AND (a.customer_id = ?)|; push(@values, $form->{customer_id}); @@ -429,7 +427,6 @@ sub get_dunning { push(@values, '%' . $form->{customer} . '%'); } - my %columns = ( "ordnumber" => "a.ordnumber", "invnumber" => "a.invnumber", @@ -446,7 +443,12 @@ sub get_dunning { push(@values, conv_i($form->{dunning_level})); } - $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount}); + if ($form->{department_id}) { + $where .= qq| AND a.department_id = ?|; + push @values, conv_i($form->{department_id}); + } + + $form->{minamount} = $form->parse_amount($myconfig, $form->{minamount}); if ($form->{minamount}) { $where .= qq| AND ((a.amount - a.paid) > ?) |; push(@values, $form->{minamount});