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 'bug/servicios_defecto' into 'main'

Browse Source 
corregido bug de servicios por defecto

See merge request jjimenez/safekat!189
This commit is contained in:
Jaime Jimenez Ortega
2024-03-13 20:07:59 +00:00
parent 0ca809805d 879669a7f0
commit 634c907cfb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Models/Configuracion/PapelFormatoModel.php
View File

@ -91,6 +91,6 @@ class PapelFormatoModel extends \App\Models\GoBaseModel
->table($this->table . " t1")
->select(
"t1.id AS id, CONCAT(t1.ancho, ' x ', t1.alto) AS tamanio"
)->get()->getResultObject();
)->where('is_deleted', 0)->get()->getResultObject();
}
}

6
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js
View File

@ -664,8 +664,8 @@ async function get_tarifas_enc(tipo=null, tarifa_id = -1){
if(tipo != null){
datos['tipo'] = tipo;
datos['tipo_impresion_id'] = parseInt($('#tipo_impresion').val())
}
datos['tipo_impresion_id'] = parseInt($('#tipo_impresion_id').val())
}
$.ajax({
type: "POST",
@ -953,7 +953,7 @@ async function get_tarifas_manipulado(tipo=null, tarifa_id = -1){
if(tipo != null){
datos['tipo'] = tipo;
datos['solapas'] = $('#solapas').is(':checked')?1:0;
datos['tipo_impresion_id'] = parseInt($('#tipo_impresion').val());
datos['tipo_impresion_id'] = parseInt($('#tipo_impresion_id').val());
}