Merge branch 'dev/maquinas' into 'main'

falta funcionalidad tabla pivote. al pulsar isRotativa hay que añadir un...

See merge request jjimenez/safekat!28
This commit is contained in:
2023-07-09 22:18:58 +00:00
32 changed files with 3391 additions and 94 deletions

View File

@ -127,7 +127,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController {
$this->viewData['tarifaManipuladoEntity'] = isset($sanitizedData) ? new TarifaManipuladoEntity($sanitizedData) : new TarifaManipuladoEntity();
$this->viewData['formAction'] = route_to('createTarifaManipulado');
$this->viewData['formAction'] = site_url('configuracion/maquinas/add');//route_to('createTarifaManipulado');
$this->viewData['boxTitle'] = lang('Basic.global.addNew').' '.lang('Tarifamanipulado.moduleTitle').' '.lang('Basic.global.addNewSuffix');
@ -163,7 +163,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController {
// JJO
if(isset($this->model->user_update_id)){
$sanitizedData['user_update_id'] = $session->id_user;
$sanitizedData['user_updated_id'] = $session->id_user;
}
$noException = true;