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/ajustes_mail'

Browse Source 
Main

See merge request jjimenez/safekat!670
This commit is contained in:
Ignacio Martinez Navajas
2025-04-07 20:16:02 +00:00
parent 4f5bc3301f 4633fa623a
commit a62e51d31c
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci4/app/Models/Clientes/ClienteModel.php
View File

@ -573,10 +573,14 @@ class ClienteModel extends \App\Models\BaseModel
$result['total_pedidos_finalizados'] =
round(floatval(($data && $data[0]->total != null) ? $data[0]->total : 0), 2);
$result['pendiente_old_erp'] =
round(floatval($this->getTotalPendienteOldERP($cliente_id)), 2);
$result['total_pendiente'] =
$result['total_facturas_sin_pagar']
+ $result['total_pedidos_produccion']
+ $result['total_pedidos_finalizados'];
+ $result['total_pedidos_finalizados'] +
$result['pendiente_old_erp'];
$result['total_pendiente'] = round(floatval($result['total_pendiente']), 2);
$result['limite_credito'] = $this->db->table('clientes')

1
ci4/app/Models/Configuracion/PapelImpresionModel.php
View File

@ -163,7 +163,6 @@ class PapelImpresionModel extends \App\Models\BaseModel
$builder->join("lg_papel_generico t2", "t1.papel_generico_id = t2.id", "left");
$builder->where("t1.is_deleted", 0);
$builder->where("t1.isActivo", 1);
if ($generico_id > 0) {
$builder->where("t1.papel_generico_id", $generico_id);
}