diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index e9e6e9673e5d..6896dbde2213 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -50,7 +50,7 @@ class SearchController extends Controller ->when(!$user->hasPermission('view_all') || !$user->hasPermission('view_client'), function ($query) use ($user) { $query->where('user_id', $user->id); }) - ->orderBy('id', 'desc') + ->orderBy('updated_at', 'desc') ->take(1000) ->get(); diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index d4fe57993252..15e0d94aec9e 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -741,6 +741,10 @@ class HtmlEngine if((int)$this->client->country_id !== (int)$this->company->settings->country_id) { $tax_label .= ctrans('texts.intracommunity_tax_info') . "
"; + + if($this->entity_calc->getTotalTaxes() > 0) + $tax_label = ''; + } return $tax_label;