Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / Controller / TopQuickSearch / GLTransaction.pm

diff --git a/SL/Controller/TopQuickSearch/GLTransaction.pm b/SL/Controller/TopQuickSearch/GLTransaction.pm
index 8eead24de39cdd10848e3bee14fb7865a31034cd..c834ba4c34b9ce735eea17a63eb20826ab06c8f5 100644 (file)
--- 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' }
 
@@ -25,37 +25,32 @@ sub query_autocomplete {
   my $limit = $::form->{limit} || 40; # max number of results per type (AR/AP/GL)
   my $term  = $::form->{term}  || '';
 
-  my $descriptionquery = { ilike => like($term) };
-  my $referencequery   = { ilike => like($term) };
-  my $apinvnumberquery = { ilike => like($term) };
-  my $namequery        = { ilike => like($term) };
-  my $arinvnumberquery = { ilike => '%' . SL::Util::trim($term) };
+  my $descriptionquery        = { ilike => like($term) };
+  my $referencequery          = { ilike => like($term) };
+  my $apinvnumberquery        = { ilike => like($term) };
+  my $namequery               = { ilike => like($term) };
+  my $arinvnumber_left_query  = { ilike => '%' . SL::Util::trim($term) };
+  my $arinvnumber_right_query = { ilike => SL::Util::trim($term) . '%' };
   # ar match is more restrictive. Left fuzzy beginning so it also matches "Storno zu $INVNUMBER"
-  # and numbers like 000123 if you only enter 123.
-  # When used in quicksearch short numbers like 1 or 11 won't match because of the
-  # ajax autocomplete minlimit of 3 characters
+  # and numbers like 000123 if you only enter 123. Right beginning searches from the begin.
 
   my (@glfilter, @arfilter, @apfilter);
 
   push( @glfilter, (or => [ description => $descriptionquery, reference => $referencequery ] ) );
-  push( @arfilter, (or => [ invnumber   => $arinvnumberquery, name      => $namequery ] ) );
+  push( @arfilter, (or => [ invnumber   => $arinvnumber_left_query, invnumber => $arinvnumber_right_query, name => $namequery ] ) );
   push( @apfilter, (or => [ invnumber   => $apinvnumberquery, name      => $namequery ] ) );
 
   my $gls = SL::DB::Manager::GLTransaction->get_all(  query => [ @glfilter ], limit => $limit, sort_by => 'transdate DESC');
   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 +62,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 +76,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,
         }