|
|
f7d1c59c6a
|
Merge branch 'fix/round_tiempo_rot_descuento_admin' into 'main'
corregidos los dos fallos
See merge request jjimenez/safekat!730
|
2025-04-23 15:42:50 +00:00 |
|
|
|
e918b5f400
|
corregidos los dos fallos
|
2025-04-23 17:41:43 +02:00 |
|
|
|
3779b3b8a0
|
Merge branch 'fix/bug_catalogo_rutas' into 'main'
Arreglado renaming de las rutas
See merge request jjimenez/safekat!729
|
2025-04-23 13:26:56 +00:00 |
|
|
|
6175da1d61
|
Arreglado renaming de las rutas
|
2025-04-23 15:26:22 +02:00 |
|
|
|
9473c10f97
|
Merge branch 'bug/ruta_duplicada' into 'main'
Renombrada ruta duplicada
See merge request jjimenez/safekat!728
|
2025-04-23 07:16:56 +00:00 |
|
|
|
800d32afde
|
Renombrada ruta duplicada
|
2025-04-23 09:16:13 +02:00 |
|
|
|
00401aaf7f
|
Merge branch 'feat/catalogo' into 'main'
Feat/catalogo
See merge request jjimenez/safekat!727
|
2025-04-22 20:58:42 +00:00 |
|
|
|
919c80fa9b
|
Version 1.0
|
2025-04-22 22:57:27 +02:00 |
|
|
|
7dee2c26e8
|
Añadidas labels
|
2025-04-22 15:52:48 +02:00 |
|
|
|
649a244a10
|
Optimizando vista html
|
2025-04-22 12:00:12 +02:00 |
|
|
|
2cfe03b2ec
|
Merge branch 'fix/papel-impresion-routes' into 'main'
Fix/papel impresion routes
See merge request jjimenez/safekat!726
|
2025-04-22 08:33:10 +00:00 |
|
|
|
b28c0d9f71
|
Merge branch 'main' into fix/papel-impresion-routes
|
2025-04-22 10:30:48 +02:00 |
|
|
|
01c7da8ca6
|
Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat
|
2025-04-22 10:30:23 +02:00 |
|
|
|
13128ebdae
|
fix papel impresion plana filter
|
2025-04-22 10:30:05 +02:00 |
|
|
|
6016b6145c
|
Merge branch 'add/view_logistica_principal' into 'main'
Add/view logistica principal
See merge request jjimenez/safekat!725
|
2025-04-22 08:26:52 +00:00 |
|
|
|
6450231b53
|
terminados albaranes
|
2025-04-22 10:26:33 +02:00 |
|
|
|
b86acc3949
|
fix papel route
|
2025-04-22 10:18:44 +02:00 |
|
|
|
ed5f73db25
|
Refactoring
|
2025-04-22 09:06:11 +02:00 |
|
|
|
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 |
|
