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 'fix/facturas_problema_albaranes_2' into 'main'

Browse Source 
solucionado el totl aceptado

See merge request jjimenez/safekat!733
This commit is contained in:
Jaime Jimenez Ortega
2025-04-24 09:02:06 +00:00
parent ab36e86bdb 616c12002e
commit e2011529b4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Models/Facturas/FacturaLineaModel.php
View File

@ -39,7 +39,7 @@ class FacturaLineaModel extends \App\Models\BaseModel {
t1.pedido_linea_impresion_id AS pedido_linea_impresion_id, t1.pedido_maquetacion_id AS pedido_maquetacion_id,
t1.descripcion AS descripcion, t1.cantidad as cantidad, t1.iva AS iva,
t1.base AS base, t1.total_iva AS total_iva, t1.total AS total, t1.data AS data, t2.pedido_id AS pedido_id,
t3.total_aceptado_revisado AS total_aceptado, t4.tirada_flexible AS tirada_flexible, t4.descuento_tirada_flexible AS descuento_tirada_flexible,
t3.total_aceptado AS total_aceptado, t3.total_aceptado_revisado AS total_aceptado_revisado, t4.tirada_flexible AS tirada_flexible, t4.descuento_tirada_flexible AS descuento_tirada_flexible,
t6.cantidad AS cantidad_albaran"
)
->join("pedidos_linea t2", "t2.id = t1.pedido_linea_impresion_id", "left")

4
ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php
View File

@ -321,7 +321,9 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({
if(row.pedido_linea_impresion_id != null && <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? 0 : 1 ?>){
// se convierten a float data.total_aceptado y subtotal
var total_aceptado = parseFloat(row.total_aceptado);
var total_aceptado_revisado = parseFloat(row.total_aceptado_revisado);
var total_aceptado = total_aceptado_revisado?total_aceptado_revisado: parseFloat(row.total_aceptado);
var subtotal = parseFloat(row.base);
var error_text = '';