Merge branch 'main' into 'dev/delete-ui'

# Conflicts:
#   ci4/app/Controllers/Tarifas/Tarifaacabado.php
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
This commit is contained in:
Ignacio Martinez Navajas
2023-07-24 12:59:19 +00:00
67 changed files with 2210 additions and 355 deletions

View File

@ -49,7 +49,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController {
// Breadcrumbs (IMN)
$this->viewData['breadcrumb'] = [
['title' => lang("App.menu_clientes"), 'route' => "", 'active' => false],
['title' => lang("App.menu_clientes"), 'route' => "javascript:void(0);", 'active' => false],
['title' => lang("App.menu_cliente"), 'route' => site_url('clientes/cliente'), 'active' => true]
];