X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=0e378d69db07330d42f1516ab07ab59f5a2c639c;hb=edd7f7c059e822ad21eafe3b44e2048aa32f432b;hp=a325766cd1a4f3a2012aae55c7ab0c38f896016b;hpb=8e08bedb4b4bfb97adcb4f4eb94a60012ca3729b;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index a325766cd..0e378d69d 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -41,6 +41,8 @@ use SL::Mailer; use SL::MoreCommon; use SL::Template; +use strict; + sub get_config { $main::lxdebug->enter_sub(); @@ -598,6 +600,11 @@ sub get_dunning { push(@values, $form->{dunningto}); } + if ($form->{salesman_id}) { + $where .= qq| AND a.salesman_id = ?|; + push(@values, conv_i($form->{salesman_id})); + } + my %sort_columns = ( 'dunning_description' => [ qw(dn.dunning_description customername invnumber) ], 'customername' => [ qw(customername invnumber) ], @@ -606,6 +613,7 @@ sub get_dunning { 'duedate' => [ qw(a.duedate a.invnumber) ], 'dunning_date' => [ qw(dunning_date a.invnumber) ], 'dunning_duedate' => [ qw(dunning_duedate a.invnumber) ], + 'salesman' => [ qw(salesman) ], ); my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; @@ -616,9 +624,11 @@ sub get_dunning { qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount, ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee, da.interest, dn.dunning_description, da.transdate AS dunning_date, - da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id + da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id, + e2.name AS salesman FROM ar a - JOIN customer ct ON (a.customer_id = ct.id), dunning da + JOIN customer ct ON (a.customer_id = ct.id) + LEFT JOIN employee e2 ON (a.salesman_id = e2.id), dunning da LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id) $where ORDER BY $sortorder|;