mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-03 15:34:37 -04:00
Updates for search controller
This commit is contained in:
parent
58efa6dcad
commit
8aef589fe0
@ -50,7 +50,7 @@ class SearchController extends Controller
|
|||||||
->when(!$user->hasPermission('view_all') || !$user->hasPermission('view_client'), function ($query) use ($user) {
|
->when(!$user->hasPermission('view_all') || !$user->hasPermission('view_client'), function ($query) use ($user) {
|
||||||
$query->where('user_id', $user->id);
|
$query->where('user_id', $user->id);
|
||||||
})
|
})
|
||||||
->orderBy('id', 'desc')
|
->orderBy('updated_at', 'desc')
|
||||||
->take(1000)
|
->take(1000)
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
|
@ -741,6 +741,10 @@ class HtmlEngine
|
|||||||
|
|
||||||
if((int)$this->client->country_id !== (int)$this->company->settings->country_id) {
|
if((int)$this->client->country_id !== (int)$this->company->settings->country_id) {
|
||||||
$tax_label .= ctrans('texts.intracommunity_tax_info') . "<br>";
|
$tax_label .= ctrans('texts.intracommunity_tax_info') . "<br>";
|
||||||
|
|
||||||
|
if($this->entity_calc->getTotalTaxes() > 0)
|
||||||
|
$tax_label = '';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $tax_label;
|
return $tax_label;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user