|
|
ddf02f73b8
|
Añadido conenido merge
|
2025-04-22 08:40:49 +02:00 |
|
|
|
b555e988be
|
Merge branch 'main' into 'feat/catalogo'
Main
See merge request jjimenez/safekat!724
|
2025-04-22 06:37:54 +00:00 |
|
|
|
2050f0ae1e
|
botones albaran finalizado
|
2025-04-22 00:50:31 +02:00 |
|
|
|
fc1b69f2fe
|
Merge branch 'main' into add/view_logistica_principal
|
2025-04-21 21:09:00 +02:00 |
|
|
|
946527cc1a
|
Merge branch 'fix/plantillas_clientes_deleted_at_editor' into 'main'
arreglado
See merge request jjimenez/safekat!722
|
2025-04-21 15:42:34 +00:00 |
|
|
|
33d3e74e80
|
arreglado
|
2025-04-21 17:41:53 +02:00 |
|
|
|
67a7cda036
|
Cambios parciales
|
2025-04-21 15:39:02 +02:00 |
|
|
|
ed28263994
|
Merge branch 'fix/imposicion-ot-view' into 'main'
fix if imposicion null
See merge request jjimenez/safekat!721
|
2025-04-21 12:31:52 +00:00 |
|
|
|
0d24e50d01
|
fix if imposicion null
|
2025-04-21 14:29:51 +02:00 |
|
|
|
a27536e406
|
Merge branch 'fix/ot_view' into 'main'
Arreglado bug en visualizacion de OTs. Cambiada vista por defecto en listado a pendientes
See merge request jjimenez/safekat!719
|
2025-04-21 12:21:43 +00:00 |
|
|
|
4af34d7ba4
|
Arreglado bug en visualizacion de OTs. Cambiada vista por defecto en listado a pendientes
|
2025-04-21 14:21:19 +02:00 |
|
|
|
753aafe05d
|
Resolviendo conflictos
|
2025-04-21 14:09:08 +02:00 |
|
|
|
63254f0bf3
|
Merge branch 'main' into 'feat/catalogo'
Main
See merge request jjimenez/safekat!718
|
2025-04-21 12:07:04 +00:00 |
|
|
|
0afd31aae0
|
Resolviendo conflictos
|
2025-04-21 14:06:47 +02:00 |
|
|
|
dd723f9889
|
Resolviendo conflictos
|
2025-04-21 14:06:13 +02:00 |
|
|
|
703781e115
|
Resolviendo conflictos
|
2025-04-21 13:59:55 +02:00 |
|
|
|
9ae3d8707c
|
Merge branch 'fix/rutas_papeles_genericos' into 'main'
Arreglado bug de rutas
See merge request jjimenez/safekat!717
|
2025-04-21 11:35:36 +00:00 |
|
|
|
c344274f9d
|
Arreglado bug de rutas
|
2025-04-21 13:35:12 +02:00 |
|
|
|
e18a39938b
|
Revision con JJO
|
2025-04-21 13:26:00 +02:00 |
|
|
|
5ebf2c670f
|
Merge branch 'fix/app-permissions' into 'main'
add 755 app
See merge request jjimenez/safekat!716
|
2025-04-21 10:56:43 +00:00 |
|
|
|
12e06937c4
|
add 755 app
|
2025-04-21 12:55:45 +02:00 |
|
|
|
fe164c4ab3
|
trabajando
|
2025-04-21 12:43:09 +02:00 |
|
|
|
9cb7762905
|
Creada migracion para tabla de isk's
|
2025-04-21 08:53:37 +02:00 |
|
|
|
548a444b7d
|
Merge branch 'feat/imposiciones' into 'main'
Feat/imposiciones
See merge request jjimenez/safekat!715
|
2025-04-21 06:33:51 +00:00 |
|
|
|
969966ac78
|
add select imposicion datatable
|
2025-04-21 08:32:21 +02:00 |
|
|
|
b318721b90
|
button imprimir code safekat
|
2025-04-21 00:12:51 +02:00 |
|
|
|
a137ede1a7
|
fix sidebar toggle
|
2025-04-20 23:27:06 +02:00 |
|
|
|
5eaa5fea0b
|
fix side bar toggle
|
2025-04-20 23:03:45 +02:00 |
|
|
|
19fd76e910
|
falta terminar albaranes
|
2025-04-20 22:10:56 +02:00 |
|
|
|
14b5f4bf95
|
Revisados formularios de crear y editar, con su validacion
|
2025-04-20 21:35:24 +02:00 |
|
|
|
61abcb3dbd
|
trabajando en albaranes. Voy a quitar las cajas
|
2025-04-20 20:02:14 +02:00 |
|
|
|
f2ea93ddb6
|
fix menu toggle links
|
2025-04-20 20:01:15 +02:00 |
|
|
|
31524dcf61
|
fix menu toggle links
|
2025-04-20 20:00:52 +02:00 |
|
|
|
c3d38e29a4
|
imposiciones
|
2025-04-20 19:26:07 +02:00 |
|
|
|
f93ecda648
|
Creado concepto de ISK
|
2025-04-20 15:58:43 +02:00 |
|
|
|
49f9fe4009
|
Avances inicializacion edit
|
2025-04-19 22:27:27 +02:00 |
|
|
|
65c9b34f56
|
añadido switch a los grupos para seleccionar
|
2025-04-18 13:52:49 +02:00 |
|
|
|
46c29f3c13
|
añadidos links al pedido y al presupuesto
|
2025-04-18 13:42:45 +02:00 |
|
|
|
0b04e6dabd
|
terminada envio lineas
|
2025-04-18 13:38:06 +02:00 |
|
|
|
15f6d0d675
|
voy a añadir grupos de cajas
|
2025-04-18 10:36:06 +02:00 |
|
|
|
3949607a3c
|
trabajando en añadir lineas a envio
|
2025-04-17 13:47:26 +02:00 |
|
|
|
9e90ec798c
|
Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal
|
2025-04-17 09:10:35 +02:00 |
|
|
|
76baae9e92
|
Merge branch 'main' into 'add/view_logistica_principal'
Main
See merge request jjimenez/safekat!714
|
2025-04-17 07:10:25 +00:00 |
|
|
|
52a4e7d37b
|
Merge branch 'fix/ot-bugs' into 'main'
Fix/ot bugs
See merge request jjimenez/safekat!713
|
2025-04-16 18:31:44 +00:00 |
|
|
|
972d0c4ec8
|
pdf download file name
|
2025-04-16 20:31:18 +02:00 |
|
|
|
36f5d42d03
|
pdf uncomment
|
2025-04-16 20:27:08 +02:00 |
|
|
|
c28753e1f1
|
Merge branch 'fix/ot-bugs' into 'main'
fix pod and file if not exist
See merge request jjimenez/safekat!712
|
2025-04-16 18:26:15 +00:00 |
|
|
|
8e97e7b58c
|
fix pod and file if not exist
|
2025-04-16 20:25:13 +02:00 |
|
|
|
f19d2b7ffe
|
Merge branch 'fix/ot-bugs' into 'main'
fix ot
See merge request jjimenez/safekat!711
|
2025-04-16 17:57:24 +00:00 |
|
|
|
2a8c4b9da6
|
fix ot
|
2025-04-16 19:55:30 +02:00 |
|
