Commit Graph

1160 Commits

Author SHA1 Message Date
3402e67fb2 Merge branch 'add/envio_ferros' into 'main'
Add/envio ferros

See merge request jjimenez/safekat!745
2025-04-27 10:14:05 +00:00
b1932e6f85 terminado envio de ferros 2025-04-27 12:12:52 +02:00
4d8332e625 Merge branch 'main' into feat/sk-44 2025-04-27 10:59:41 +02:00
c75d08b3c3 ot pliegos 2025-04-27 10:58:23 +02:00
0e444295e3 trabajando en el formulario envio de ferros 2025-04-27 09:51:04 +02:00
45e41c77e4 tablas encuadernacion ot pdf 2025-04-27 08:20:35 +02:00
7f31e65960 subidos ficheros 2025-04-26 18:08:41 +02:00
25b6d14423 falta boton borrar albaranes! 2025-04-26 14:16:32 +02:00
b5b86b4164 terminado a falta de pruebas 2025-04-26 10:50:59 +02:00
f473caf06c Merge branch 'fix/change_pedido_ot_logistica' into 'main'
terminado

See merge request jjimenez/safekat!739
2025-04-26 07:55:29 +00:00
5e8a7f8bd4 terminado 2025-04-26 09:54:56 +02:00
d0f37cb714 <php syntax 2025-04-25 19:32:26 +02:00
dafdf68c41 view maquinista 2025-04-25 13:20:35 +02:00
4379a9d23b erase ot dates 2025-04-25 12:57:14 +02:00
b942064608 Merge branch 'main' into feat/view-maquinista 2025-04-25 07:41:25 +02:00
52b3b1ae4d maquinista view-basic 2025-04-25 07:40:20 +02:00
5c68334e9a cambiado ael añadir envios 2025-04-24 23:44:07 +02:00
3838bcb536 terminado 2025-04-24 12:01:06 +02:00
616c12002e solucionado el totl aceptado 2025-04-24 11:01:38 +02:00
f7b9c23f69 parece terminado los envios 2025-04-24 00:32:53 +02:00
8b949a3173 Merge branch 'main' into add/finalizar_envios_logistica 2025-04-23 17:22:40 +02:00
e0916b567c tabajando 2025-04-23 17:22:12 +02:00
6175da1d61 Arreglado renaming de las rutas 2025-04-23 15:26:22 +02: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
5ac1e3d4c1 finalizar envio ok 2025-04-22 22:20:03 +02:00
649a244a10 Optimizando vista html 2025-04-22 12:00:12 +02:00
952500e10e Merge branch 'main' into feat/view-maquinista 2025-04-22 10:34:06 +02:00
6450231b53 terminados albaranes 2025-04-22 10:26:33 +02:00
62a95a0ca8 add views 2025-04-22 09:43:25 +02:00
ed5f73db25 Refactoring 2025-04-22 09:06:11 +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
67a7cda036 Cambios parciales 2025-04-21 15:39:02 +02:00
0d24e50d01 fix if imposicion null 2025-04-21 14:29:51 +02: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
703781e115 Resolviendo conflictos 2025-04-21 13:59:55 +02:00
e18a39938b Revision con JJO 2025-04-21 13:26:00 +02:00
12e06937c4 add 755 app 2025-04-21 12:55:45 +02: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