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 'mod/presupuesto_admin'

Browse Source 
Main

See merge request jjimenez/safekat!453
This commit is contained in:
Jaime Jimenez Ortega
2024-12-26 13:18:04 +00:00
parent 2890eacb74 afb7ca0812
commit d53b63d032
9 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,7 @@ class Papelesgenericos 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') . ' -';

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

@ -417,7 +417,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController
if (!empty($selId)) :
$papelGenericoModel = model('App\Models\Configuracion\PapelGenericoModel');
$selOption = $papelGenericoModel->where('id', $selId)->findColumn('nombre');
$selOption = $papelGenericoModel->where('is_deleted', 0)->where('id', $selId)->findColumn('nombre');
if (!empty($selOption)) :
$data[$selId] = $selOption[0];
endif;

6
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -1127,7 +1127,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
[$data['datosGenerales']['paginasNegro'], $data['datosGenerales']['paginasColor']] =
$this->getPaginas($lineas);
if (intval($presupuesto->envios_recoge_cliente) == 1) {
if (intval($presupuesto->recoger_en_taller) == 1) {
$data['direcciones']['entrega_taller'] = 1;
} else {
$data['direcciones']['entrega_taller'] = 0;
@ -1913,7 +1913,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
foreach ($servDefectoEnc as $servicio) {
if ($servicio->total <= 0) {
$input_data['servicios'] = $servDefecto;
$input_data['servicios'] = $servDefectoEnc;
$errorModel = new ErrorPresupuesto();
$errorModel->insertError(
$datos_entrada['id'],
@ -1948,7 +1948,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
foreach ($servDefectoMan as $servicio) {
if ($servicio->total <= 0) {
$input_data['servicios'] = $servDefecto;
$input_data['servicios'] = $servDefectoMan;
$errorModel = new ErrorPresupuesto();
$errorModel->insertError(
$datos_entrada['id'],