X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FTopQuickSearch%2FGLTransaction.pm;h=53d05ea420e35adae8d4260580b21a38ceff5fff;hb=24e928a5db664197697cdee8a0d65937845bea24;hp=8eead24de39cdd10848e3bee14fb7865a31034cd;hpb=bc40bcabc425b99f3b79a5544684a6fe8674adfe;p=kivitendo-erp.git diff --git a/SL/Controller/TopQuickSearch/GLTransaction.pm b/SL/Controller/TopQuickSearch/GLTransaction.pm index 8eead24de..53d05ea42 100644 --- a/SL/Controller/TopQuickSearch/GLTransaction.pm +++ b/SL/Controller/TopQuickSearch/GLTransaction.pm @@ -11,7 +11,7 @@ use SL::Locale::String qw(t8); use SL::DBUtils qw(like); use List::Util qw(sum); -sub auth { 'general_ledger' } +sub auth { 'general_ledger|gl_transactions|ap_transactions|ar_transactions' } sub name { 'gl_transaction' } @@ -45,17 +45,13 @@ sub query_autocomplete { my $ars = SL::DB::Manager::Invoice->get_all( query => [ @arfilter ], limit => $limit, sort_by => 'transdate DESC', with_objects => [ 'customer' ]); my $aps = SL::DB::Manager::PurchaseInvoice->get_all(query => [ @apfilter ], limit => $limit, sort_by => 'transdate DESC', with_objects => [ 'vendor' ]); - # use the sum of all credit amounts as the "amount" of the gl transaction - foreach my $gl ( @$gls ) { - $gl->{'amount'} = sum map { $_->amount if $_->amount > 0 } @{$gl->transactions}; - }; - my $gldata = [ map( { { - transdate => DateTime->from_object(object => $_->transdate)->ymd(), - label => $_->abbreviation. ": " . $_->description . " " . $_->reference . " " . $::form->format_amount(\%::myconfig, $_->{'amount'},2). " (" . $_->transdate->to_lxoffice . ")" , + transdate => $_->transdate->ymd(''), # only used for sorting + label => $_->oneline_summary, + value => '', id => 'gl.pl?action=edit&id=' . $_->id, } } @@ -67,8 +63,9 @@ sub query_autocomplete { map( { { - transdate => DateTime->from_object(object => $_->transdate)->ymd(), - label => $_->abbreviation . ": " . $_->invnumber . " " . $_->customer->name . " " . $::form->format_amount(\%::myconfig, $_->amount,2) . " (" . $_->transdate->to_lxoffice . ")" , + transdate => $_->transdate->ymd(''), + label => $_->oneline_summary, + value => "", id => ($_->invoice ? "is" : "ar" ) . '.pl?action=edit&id=' . $_->id, } } @@ -80,8 +77,8 @@ sub query_autocomplete { map( { { - transdate => DateTime->from_object(object => $_->transdate)->ymd(), - label => $_->abbreviation . ": " . $_->invnumber . " " . $_->vendor->name . " " . $::form->format_amount(\%::myconfig, $_->amount,2) . " (" . $_->transdate->to_lxoffice . ")" , + transdate => $_->transdate->ymd(''), + label => $_->oneline_summary, value => "", id => ($_->invoice ? "ir" : "ap" ) . '.pl?action=edit&id=' . $_->id, }