kivitendo 3.9.2-0.2

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

diff --git a/SL/Controller/TopQuickSearch/GLTransaction.pm b/SL/Controller/TopQuickSearch/GLTransaction.pm
index ebdcee895b061e111d36c13d869dd9fd00e5ca1b..c834ba4c34b9ce735eea17a63eb20826ab06c8f5 100644 (file)
--- a/SL/Controller/TopQuickSearch/GLTransaction.pm
+++ b/SL/Controller/TopQuickSearch/GLTransaction.pm
@@ -25,20 +25,19 @@ 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');
@@ -49,7 +48,7 @@ sub query_autocomplete {
     map(
       {
         {
-           transdate => $_->transdate->to_kivitendo,
+           transdate => $_->transdate->ymd(''), # only used for sorting
            label     => $_->oneline_summary,
            value     => '',
            id        => 'gl.pl?action=edit&id=' . $_->id,
@@ -63,7 +62,7 @@ sub query_autocomplete {
     map(
       {
         {
-           transdate => $_->transdate->to_kivitendo,
+           transdate => $_->transdate->ymd(''),
            label     => $_->oneline_summary,
            value     => "",
            id        => ($_->invoice ? "is" : "ar" ) . '.pl?action=edit&id=' . $_->id,
@@ -77,7 +76,7 @@ sub query_autocomplete {
     map(
       {
         {
-           transdate => $_->transdate->to_kivitendo,
+           transdate => $_->transdate->ymd(''),
            label     => $_->oneline_summary,
            value     => "",
            id        => ($_->invoice ? "ir" : "ap" ) . '.pl?action=edit&id=' . $_->id,