Merge branch 'main' into 'dev/chat'

Main

See merge request jjimenez/safekat!296
This commit is contained in:
Ignacio Martinez Navajas
2024-07-31 18:41:45 +00:00
64 changed files with 3508 additions and 2443 deletions

View File

@ -4,8 +4,8 @@
*/
if (
auth()->user()->can('paises.menu') ||
auth()->user()->can('papeles-genericos.menu') ||
auth()->user()->can('papeles-impresion.menu') ||
auth()->user()->can('papel-genericosk .menu') ||
auth()->user()->can('papel-impresion.menu') ||
auth()->user()->can('maquinas.menu') ||
auth()->user()->can('maquinas-defecto.menu') ||
auth()->user()->can('usuarios.menu') ||
@ -25,14 +25,14 @@ if (
</a>
</li>
<?php } ?>
<?php if (auth()->user()->can('papeles-genericos.menu')) { ?>
<?php if (auth()->user()->can('papel-generico.menu')) { ?>
<li class="menu-item">
<a href="<?= site_url("configuracion/papelesgenericos") ?>" class="menu-link">
<?= lang("App.menu_papelgenerico") ?>
</a>
</li>
<?php } ?>
<?php if (auth()->user()->can('papeles-impresion.menu')) { ?>
<?php if (auth()->user()->can('papel-impresion.menu')) { ?>
<li class="menu-item">
<a href="<?= site_url("configuracion/papelesimpresion") ?>" class="menu-link">
<?= lang("App.menu_papelimpresion") ?>

View File

@ -12,7 +12,7 @@ if (auth()->user()->inGroup('beta')) {
</a>
<ul class="menu-sub">
<li class="menu-item">
<a href="<?= route_to('facturasList') ?>" class="menu-link">
<a href="<?= route_to('newFactura') ?>" class="menu-link">
<?= lang("App.menu_facturas_nueva") ?>
</a>
</li>