jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/sk-33

Browse Source
This commit is contained in:
amazuecos
2025-04-02 22:25:22 +02:00
parent 9cbbddcc1c 5f3bc61a41
commit cecf193e37
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Controllers/Configuracion/Maquinas.php
View File

@ -341,7 +341,7 @@ class Maquinas extends \App\Controllers\BaseResourceController
$onlyActiveOnes = false;
$columns2select = [$reqId ?? 'id', $reqText ?? 'nombre'];
$onlyActiveOnes = false;
$menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
$menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr, true);
$nonItem = new \stdClass;
$nonItem->id = '';
$nonItem->text = '- ' . lang('Basic.global.None') . ' -';

1
ci4/app/Controllers/Presupuestos/Presupuestoadmin.php
View File

@ -617,6 +617,7 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$data['resumen']['total_margenPercent_servicios'] = $presupuesto->total_margenPercent_servicios;
$data['resumen']['total_margen_servicios'] = $presupuesto->total_margen_servicios;
$data['resumen']['total_coste_envios'] = $presupuesto->total_coste_envios;
$data['resumen']['total_precio_envios'] = $presupuesto->envio_base;
$data['resumen']['total_margen_envios'] = $presupuesto->total_margen_envios;
$data['resumen']['total_costes'] = $presupuesto->total_costes;
$data['resumen']['porcentajeMargen'] =