|
|
bf21a336b1
|
Merge branch 'main' into feat/festivos-calendar
|
2025-04-28 02:10:52 +02:00 |
|
|
|
d1e5731d1d
|
create POD dates pedido
|
2025-04-28 02:03:40 +02:00 |
|
|
|
029757bb40
|
add calendar festivos
|
2025-04-28 00:42:15 +02:00 |
|
|
|
bb4c9690b9
|
Merge branch 'feat/importador_rama' into 'main'
Feat/importador rama
See merge request jjimenez/safekat!750
|
2025-04-27 20:01:26 +00:00 |
|
|
|
6d45a950df
|
Trabajando JS
|
2025-04-27 22:00:52 +02:00 |
|
|
|
6f8890a8b1
|
Merge branch 'main' into 'feat/importador_rama'
Main
See merge request jjimenez/safekat!749
|
2025-04-27 18:56:08 +00:00 |
|
|
|
c093c01c00
|
Merge branch 'main' into feat/festivos-calendar
|
2025-04-27 19:30:31 +02:00 |
|
|
|
a4532a7ff6
|
Merge branch 'fix/filter-datatable-ot' into 'main'
Fix/filter datatable ot
See merge request jjimenez/safekat!748
|
2025-04-27 17:27:30 +00:00 |
|
|
|
31a12ff343
|
try catch getTiempoProcesamientoHHMM
|
2025-04-27 19:26:02 +02:00 |
|
|
|
1d6f5fe53e
|
default table encuadernacion
|
2025-04-27 19:24:11 +02:00 |
|
|
|
0b767c63e9
|
fix filter ferro
|
2025-04-27 19:13:06 +02:00 |
|
|
|
e464652fe2
|
festivo entity model
|
2025-04-27 19:01:23 +02:00 |
|
|
|
dd20f2a20e
|
Merge branch 'maquinista-change-user' into 'main'
Maquinista change user
See merge request jjimenez/safekat!747
|
2025-04-27 16:54:35 +00:00 |
|
|
|
97554bffc9
|
add maquinista change user session
|
2025-04-27 18:53:24 +02:00 |
|
|
|
73e9e941ed
|
Merge branch 'main' into maquinista-change-user
|
2025-04-27 12:25:09 +02:00 |
|
|
|
05720cf1ce
|
Merge branch 'fix/migrate' into 'main'
fix migrate class name
See merge request jjimenez/safekat!746
|
2025-04-27 10:20:33 +00:00 |
|
|
|
04e9e3ee6f
|
fix migrate class name
|
2025-04-27 12:18:20 +02:00 |
|
|
|
9804a6a927
|
change user session
|
2025-04-27 12:17:31 +02:00 |
|
|
|
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 |
|
|
|
13ae70236e
|
Merge branch 'feat/sk-44' into 'main'
Feat/sk 44
See merge request jjimenez/safekat!744
|
2025-04-27 09:00:23 +00: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 |
|
|
|
a0b5f3b4df
|
trabajando en envio de ferros
|
2025-04-27 09:51:52 +02:00 |
|
|
|
0e444295e3
|
trabajando en el formulario envio de ferros
|
2025-04-27 09:51:04 +02:00 |
|
|
|
ae7707057a
|
Cambiando titulo pagina
|
2025-04-27 09:17:46 +02:00 |
|
|
|
ff115f4f20
|
Configurando logica de captacion del Excel
|
2025-04-27 09:16:15 +02:00 |
|
|
|
45e41c77e4
|
tablas encuadernacion ot pdf
|
2025-04-27 08:20:35 +02:00 |
|
|
|
ae456c8890
|
Implementado script principal
|
2025-04-27 00:00:58 +02:00 |
|
|
|
e8958dc893
|
Implementado menu lateral
|
2025-04-26 23:23:04 +02:00 |
|
|
|
b0ac132e59
|
Arreglado bug en archivo de migrate del catalogo
|
2025-04-26 23:05:15 +02:00 |
|
|
|
b50e564641
|
Desplegando arcihvos iniciales
|
2025-04-26 21:32:22 +02:00 |
|
|
|
894770d6ce
|
Merge branch 'feat/importador_rama' of https://git.imnavajas.es/jjimenez/safekat into feat/importador_rama
|
2025-04-26 21:25:18 +02:00 |
|
|
|
367c7c2ea8
|
Merge branch 'main' into 'feat/importador_rama'
Main
See merge request jjimenez/safekat!743
|
2025-04-26 19:24:58 +00:00 |
|
|
|
9375b9b624
|
Añadiendo idiomas
|
2025-04-26 21:22:39 +02:00 |
|
|
|
9a6a4f89a2
|
Merge branch 'add/files_albaranes' into 'main'
subidos ficheros
See merge request jjimenez/safekat!742
|
2025-04-26 16:09:09 +00:00 |
|
|
|
7f31e65960
|
subidos ficheros
|
2025-04-26 18:08:41 +02:00 |
|
|
|
5aa2a2e6c9
|
Merge branch 'add/logistica_albaranes' into 'main'
Add/logistica albaranes
See merge request jjimenez/safekat!741
|
2025-04-26 15:27:46 +00:00 |
|
|
|
dfbcb13ba5
|
hecho tema albaranes logistica
|
2025-04-26 17:27:29 +02:00 |
|
|
|
033184cfa2
|
Iniciando herramienta de importacion desde catalogo
|
2025-04-26 16:52:59 +02:00 |
|
|
|
25b6d14423
|
falta boton borrar albaranes!
|
2025-04-26 14:16:32 +02:00 |
|
|
|
96bd24ae8b
|
Merge branch 'add/impresion_etiquetas_envios' into 'main'
Add/impresion etiquetas envios
See merge request jjimenez/safekat!740
|
2025-04-26 08:51:24 +00:00 |
|
|
|
b5b86b4164
|
terminado a falta de pruebas
|
2025-04-26 10:50:59 +02:00 |
|
|
|
ef173ab0fc
|
Merge branch 'main' into add/impresion_etiquetas_envios
|
2025-04-26 09:56:47 +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 |
|
|
|
905112334f
|
Merge branch 'fix/php-syntax' into 'main'
<php syntax
See merge request jjimenez/safekat!738
|
2025-04-25 17:34:29 +00:00 |
|
|
|
d0f37cb714
|
<php syntax
|
2025-04-25 19:32:26 +02:00 |
|
|
|
151e4a2d7a
|
cambios
|
2025-04-25 17:50:30 +02:00 |
|
|
|
05ebfa06df
|
Merge branch 'feat/view-maquinista' into 'main'
Feat/view maquinista
See merge request jjimenez/safekat!737
|
2025-04-25 11:22:19 +00:00 |
|
