|
|
a6bff58793
|
resumen lateral terminado
|
2024-11-13 08:44:31 +01:00 |
|
|
|
a53f85f35c
|
Merge branch 'main' into 'dev/resumen_lateral'
Main
See merge request jjimenez/safekat!373
|
2024-11-13 06:05:53 +00:00 |
|
|
|
e21e790309
|
Merge branch 'main' into fix/mensajes
Merge main into fix/messages
|
2024-11-13 00:48:58 +01:00 |
|
|
|
eb604f3293
|
fix : mensajes internos, arreglar total numero mensajes
|
2024-11-13 00:47:47 +01:00 |
|
|
|
6b8ebba4e2
|
Merge branch 'main' into 'dev/resumen_lateral'
Main
See merge request jjimenez/safekat!371
|
2024-11-12 18:49:14 +00:00 |
|
|
|
1a3fc3eb58
|
comprueba ahora que son iguales
|
2024-11-12 19:14:44 +01:00 |
|
|
|
c32ebc153f
|
Merge branch 'main' into 'dev/resumen_lateral'
Main
See merge request jjimenez/safekat!367
|
2024-11-12 17:58:26 +00:00 |
|
|
|
e159ac8762
|
arreglado bug en direcciones de envio. tarifas envio ordenables por 3 columnas
|
2024-11-12 18:46:16 +01:00 |
|
|
|
b97e027920
|
feat: mensajes directos cliente
|
2024-11-12 18:26:22 +01:00 |
|
|
|
7223b56db6
|
menu lateral datos generales
|
2024-11-12 01:08:53 +01:00 |
|
|
|
873adc5bf5
|
boton guardar en todas pags, resuelto preview cosido
|
2024-11-09 12:15:32 +01:00 |
|
|
|
1b637cd5a4
|
arreglado todo
|
2024-11-07 20:24:40 +01:00 |
|
|
|
b251e0e56c
|
añadidos assets y js
|
2024-11-07 20:17:58 +01:00 |
|
|
|
7ce2723a09
|
Revert "Merge branch 'feat/add-chat-presupuesto-cliente' into 'main'"
This reverts merge request !352
|
2024-10-23 05:18:00 +00:00 |
|
|
|
8f2f19df1b
|
fix mensajes internos
|
2024-10-23 05:14:31 +00:00 |
|
|
|
9919496397
|
finalizado nuevo presupuesto cliente a falta de confirmar
|
2024-10-22 23:34:21 +02:00 |
|
|
|
0a5f8dee68
|
espiral y wireo
|
2024-10-22 14:14:52 +02:00 |
|
|
|
4afb977577
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-22 10:31:43 +02:00 |
|
|
|
262aa4a88f
|
fix visto datatable errores-presupuesto
|
2024-10-22 10:30:47 +02:00 |
|
|
|
9f61faf67a
|
preview casi
|
2024-10-22 10:29:34 +02:00 |
|
|
|
2f83526d7e
|
comprobando presupuestos
|
2024-10-22 08:43:21 +02:00 |
|
|
|
62a3706049
|
cargando presu
|
2024-10-19 20:26:52 +02:00 |
|
|
|
1914cb01fe
|
a punto de guardar
|
2024-10-19 14:32:49 +02:00 |
|
|
|
09e5149090
|
Mergeado
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-19 13:04:05 +02:00 |
|
|
|
859f2a99be
|
merge errores_presupuestos
|
2024-10-19 08:56:31 +00:00 |
|
|
|
4d20b4ac1c
|
fix : contemplat que presupuesto_id es null
|
2024-10-19 08:54:53 +00:00 |
|
|
|
8135e635ab
|
errores presupuesto
|
2024-10-19 10:38:13 +02:00 |
|
|
|
643e325e59
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-19 09:42:06 +02:00 |
|
|
|
3c48d88357
|
cargando presu
|
2024-10-19 09:36:48 +02:00 |
|
|
|
035d695780
|
merge changes from dev/presu_cliente_v2
|
2024-10-19 07:33:41 +00:00 |
|
|
|
f9b12cbcdd
|
feat:errores presupuesto
|
2024-10-19 07:29:47 +00:00 |
|
|
|
f1df4559f7
|
error presupuestos
|
2024-10-18 16:00:10 +02:00 |
|
|
|
464e136025
|
cargando presupuesto datos generales
|
2024-10-18 14:33:27 +02:00 |
|
|
|
23491b2e1a
|
add errores presupuesto
|
2024-10-17 23:48:16 +00:00 |
|
|
|
8a044d41fe
|
cargando datos
|
2024-10-18 01:43:41 +02:00 |
|
|
|
7c9b8a0b6d
|
guardar terminado
|
2024-10-17 22:22:43 +02:00 |
|
|
|
a0128d8f1e
|
arreglado la comprobación del papelformato
|
2024-10-17 11:43:16 +02:00 |
|
|
|
fdf838c909
|
quitado rellenar presupuesto
|
2024-10-16 03:46:35 +02:00 |
|
|
|
b5924dceb5
|
falta preview resumen
|
2024-10-16 03:45:10 +02:00 |
|
|
|
2c5ea4d7ba
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-15 15:42:19 +02:00 |
|
|
|
19be8591f3
|
trabajando en el backend para papeles diferentes
|
2024-10-15 15:41:38 +02:00 |
|
|
|
a8a741f0bf
|
trabajando en añadir las tiradas a las direcciones
|
2024-10-15 11:43:44 +02:00 |
|
|
|
29eeecb905
|
fix : mensaje-internos only users in group admin and beta
|
2024-10-14 16:20:59 +00:00 |
|
|
|
668d0d79e6
|
problema ruta papelformato
|
2024-10-14 18:19:41 +02:00 |
|
|
|
f9b7de63fd
|
Merge branch 'dev/presu_cliente_v2' of https://git.imnavajas.es/jjimenez/safekat into dev/presu_cliente_v2
|
2024-10-14 14:33:06 +02:00 |
|
|
|
9c3a7848f3
|
arreglado los select2 para que funcionen con el select2 de alvaro
|
2024-10-14 14:29:43 +02:00 |
|
|
|
6b49984c28
|
Merge branch 'main' into 'dev/presu_cliente_v2'
Main
See merge request jjimenez/safekat!347
|
2024-10-14 12:04:48 +00:00 |
|
|
|
44fc60372b
|
Cogido el select2 de alvaro para problema del merge.
|
2024-10-14 14:03:24 +02:00 |
|
|
|
287335dc6b
|
cogido select2 de alvaro
|
2024-10-14 13:58:50 +02:00 |
|
|
|
2012ada27f
|
feat : mensajes internos module
|
2024-10-13 23:10:17 +00:00 |
|
