X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=031ef112db172ea2411ef733e57477f15bdc07a3;hb=ae32e420b4016d27bd80f866a28bfdbcf20ebe2f;hp=6a52ee71675087a11382c3ee400cd7be5cd52e46;hpb=564b5410a5b4913215b53e659be6ee2a9cf259be;p=kivitendo-erp.git diff --git a/SL/CT.pm b/SL/CT.pm index 6a52ee716..031ef112d 100644 --- a/SL/CT.pm +++ b/SL/CT.pm @@ -84,6 +84,9 @@ sub search { "salesman" => "e.name", "payment" => "pt.description", "pricegroup" => "pg.pricegroup", + "ustid" => "ct.ustid", + "creditlimit" => "ct.creditlimit", + "commercial_court" => "ct.commercial_court", ); $form->{sort} ||= "name"; @@ -98,7 +101,7 @@ sub search { } my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; - if ($sortorder !~ /(business|id|discount|itime)/ && !$join_records) { + if ($sortorder !~ /(business|creditlimit|id|discount|itime)/ && !$join_records) { $sortorder = "lower($sortorder) ${sortdir}"; } else { $sortorder .= " ${sortdir}"; @@ -236,11 +239,9 @@ sub search { push @values, ("%$_%")x2 for @tokens; } - # Nur Kunden finden, bei denen ich selber der Verkäufer bin - # Gilt nicht für Lieferanten - if ($cv eq 'customer' && !$main::auth->assert('customer_vendor_all_edit', 1)) { - $where .= qq| AND ct.salesman_id = (select em.id from employee em where em.login = ?)|; - push(@values, $::myconfig{login}); + if (($form->{create_zugferd_invoices} // '') ne '') { + $where .= qq| AND (ct.create_zugferd_invoices = ?)|; + push @values, $form->{create_zugferd_invoices}; } my ($cvar_where, @cvar_values) = CVar->build_filter_query('module' => 'CT',