jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 36c9227586 fix pdf tables encuadernacion. Add tarifa acabado configuration for ots feat/tarifas-ot amazuecos 2025-04-30 01:25:24 +02:00
  • 4e9dfb51c7 Merge branch 'fix/descuento_con_ajuste' into 'main' Jaime Jimenez Ortega 2025-04-29 18:03:58 +00:00
  • 5aab9a33ac arreglado Jaime Jiménez 2025-04-29 20:03:02 +02:00
  • ea762a09c0 Merge branch 'fix/confirmar_presupuesto_ajustado' into 'main' Jaime Jimenez Ortega 2025-04-29 17:56:28 +00:00
  • 21014d029f corregido Jaime Jiménez 2025-04-29 19:56:08 +02:00
  • 9c31f2bbc5 Merge branch 'add/configuracion_cliente_cambios_importador_catalogo' into 'main' Jaime Jimenez Ortega 2025-04-29 17:33:59 +00:00
  • b288ca498c terminado Jaime Jiménez 2025-04-29 19:30:35 +02:00
  • 96a6845c0c Merge branch 'feat/importador_rama_2' into 'main' Ignacio Martinez Navajas 2025-04-29 15:10:55 +00:00
  • eed5c0994e Importador rama con ajuste del precio unknown 2025-04-29 17:09:19 +02:00
  • e2ab42cd84 Arreglado bug impresora de tickets (logistica) unknown 2025-04-29 17:01:16 +02:00
  • 7da76af866 Primera version del importador RAMA unknown 2025-04-29 15:42:50 +02:00
  • bf1e66d746 Corregido bug en API imprimelibros unknown 2025-04-29 12:40:35 +02:00
  • adccc414be Merge branch 'fix/bugs-ot' into 'main' Alvaro 2025-04-28 06:13:50 +00:00
  • 95fa192cb9 remove ? from orden_trabajo pdf amazuecos 2025-04-28 08:12:22 +02:00
  • 9310d2dabd delete class text-center from div.card otTask amazuecos 2025-04-28 08:06:44 +02:00
  • 3abf45ca6e tiempo real tarea empty when created amazuecos 2025-04-28 08:00:39 +02:00
  • 6ea22066c2 Merge branch 'feat/festivos-calendar' into 'main' Alvaro 2025-04-28 00:11:16 +00:00
  • bf21a336b1 Merge branch 'main' into feat/festivos-calendar amazuecos 2025-04-28 02:10:52 +02:00
  • d1e5731d1d create POD dates pedido amazuecos 2025-04-28 02:03:40 +02:00
  • 029757bb40 add calendar festivos amazuecos 2025-04-28 00:42:15 +02:00
  • bb4c9690b9 Merge branch 'feat/importador_rama' into 'main' Ignacio Martinez Navajas 2025-04-27 20:01:26 +00:00
  • 6d45a950df Trabajando JS unknown 2025-04-27 22:00:52 +02:00
  • 6f8890a8b1 Merge branch 'main' into 'feat/importador_rama' Ignacio Martinez Navajas 2025-04-27 18:56:08 +00:00
  • c093c01c00 Merge branch 'main' into feat/festivos-calendar amazuecos 2025-04-27 19:30:31 +02:00
  • a4532a7ff6 Merge branch 'fix/filter-datatable-ot' into 'main' Alvaro 2025-04-27 17:27:30 +00:00
  • 31a12ff343 try catch getTiempoProcesamientoHHMM amazuecos 2025-04-27 19:26:02 +02:00
  • 1d6f5fe53e default table encuadernacion amazuecos 2025-04-27 19:24:11 +02:00
  • 0b767c63e9 fix filter ferro amazuecos 2025-04-27 19:13:06 +02:00
  • e464652fe2 festivo entity model amazuecos 2025-04-27 19:01:23 +02:00
  • dd20f2a20e Merge branch 'maquinista-change-user' into 'main' Alvaro 2025-04-27 16:54:35 +00:00
  • 97554bffc9 add maquinista change user session amazuecos 2025-04-27 18:53:24 +02:00
  • 73e9e941ed Merge branch 'main' into maquinista-change-user amazuecos 2025-04-27 12:25:09 +02:00
  • 05720cf1ce Merge branch 'fix/migrate' into 'main' Alvaro 2025-04-27 10:20:33 +00:00
  • 04e9e3ee6f fix migrate class name amazuecos 2025-04-27 12:18:20 +02:00
  • 9804a6a927 change user session amazuecos 2025-04-27 12:17:31 +02:00
  • 3402e67fb2 Merge branch 'add/envio_ferros' into 'main' Jaime Jimenez Ortega 2025-04-27 10:14:05 +00:00
  • b1932e6f85 terminado envio de ferros Jaime Jiménez 2025-04-27 12:12:52 +02:00
  • 13ae70236e Merge branch 'feat/sk-44' into 'main' Alvaro 2025-04-27 09:00:23 +00:00
  • 4d8332e625 Merge branch 'main' into feat/sk-44 feat/sk-44 amazuecos 2025-04-27 10:59:41 +02:00
  • c75d08b3c3 ot pliegos amazuecos 2025-04-27 10:58:23 +02:00
  • a0b5f3b4df trabajando en envio de ferros Jaime Jiménez 2025-04-27 09:51:52 +02:00
  • 0e444295e3 trabajando en el formulario envio de ferros Jaime Jiménez 2025-04-27 09:51:04 +02:00
  • ae7707057a Cambiando titulo pagina unknown 2025-04-27 09:17:46 +02:00
  • ff115f4f20 Configurando logica de captacion del Excel unknown 2025-04-27 09:16:15 +02:00
  • 45e41c77e4 tablas encuadernacion ot pdf amazuecos 2025-04-27 08:20:35 +02:00
  • ae456c8890 Implementado script principal unknown 2025-04-27 00:00:58 +02:00
  • e8958dc893 Implementado menu lateral unknown 2025-04-26 23:23:04 +02:00
  • b0ac132e59 Arreglado bug en archivo de migrate del catalogo unknown 2025-04-26 23:05:15 +02:00
  • b50e564641 Desplegando arcihvos iniciales unknown 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 unknown 2025-04-26 21:25:18 +02:00
  • 367c7c2ea8 Merge branch 'main' into 'feat/importador_rama' Ignacio Martinez Navajas 2025-04-26 19:24:58 +00:00
  • 9375b9b624 Añadiendo idiomas unknown 2025-04-26 21:22:39 +02:00
  • 9a6a4f89a2 Merge branch 'add/files_albaranes' into 'main' Jaime Jimenez Ortega 2025-04-26 16:09:09 +00:00
  • 7f31e65960 subidos ficheros Jaime Jiménez 2025-04-26 18:08:41 +02:00
  • 5aa2a2e6c9 Merge branch 'add/logistica_albaranes' into 'main' Jaime Jimenez Ortega 2025-04-26 15:27:46 +00:00
  • dfbcb13ba5 hecho tema albaranes logistica Jaime Jiménez 2025-04-26 17:27:29 +02:00
  • 033184cfa2 Iniciando herramienta de importacion desde catalogo unknown 2025-04-26 16:52:59 +02:00
  • 25b6d14423 falta boton borrar albaranes! Jaime Jiménez 2025-04-26 14:16:32 +02:00
  • 96bd24ae8b Merge branch 'add/impresion_etiquetas_envios' into 'main' Jaime Jimenez Ortega 2025-04-26 08:51:24 +00:00
  • b5b86b4164 terminado a falta de pruebas Jaime Jiménez 2025-04-26 10:50:59 +02:00
  • ef173ab0fc Merge branch 'main' into add/impresion_etiquetas_envios Jaime Jiménez 2025-04-26 09:56:47 +02:00
  • f473caf06c Merge branch 'fix/change_pedido_ot_logistica' into 'main' Jaime Jimenez Ortega 2025-04-26 07:55:29 +00:00
  • 5e8a7f8bd4 terminado Jaime Jiménez 2025-04-26 09:54:56 +02:00
  • 905112334f Merge branch 'fix/php-syntax' into 'main' Alvaro 2025-04-25 17:34:29 +00:00
  • d0f37cb714 <php syntax amazuecos 2025-04-25 19:32:26 +02:00
  • 151e4a2d7a cambios Jaime Jiménez 2025-04-25 17:50:30 +02:00
  • 05ebfa06df Merge branch 'feat/view-maquinista' into 'main' Alvaro 2025-04-25 11:22:19 +00:00
  • dafdf68c41 view maquinista feat/view-maquinista amazuecos 2025-04-25 13:20:35 +02:00
  • 4379a9d23b erase ot dates amazuecos 2025-04-25 12:57:14 +02:00
  • cc2c9eee1c maquina button amazuecos 2025-04-25 11:30:41 +02:00
  • b942064608 Merge branch 'main' into feat/view-maquinista amazuecos 2025-04-25 07:41:25 +02:00
  • 52b3b1ae4d maquinista view-basic amazuecos 2025-04-25 07:40:20 +02:00
  • 86dafb1133 Merge branch 'add/fechaEmbalajeForEnvio' into 'main' Jaime Jimenez Ortega 2025-04-24 21:44:35 +00:00
  • 5c68334e9a cambiado ael añadir envios Jaime Jiménez 2025-04-24 23:44:07 +02:00
  • f16654f4ad Merge branch 'fix/findpedidoLogistica' into 'main' Jaime Jimenez Ortega 2025-04-24 16:40:46 +00:00
  • a1fd7075d6 corregido el añadir cuando no es multienvio y select añadir lineas Jaime Jiménez 2025-04-24 18:40:10 +02:00
  • 4fd242d4d2 Merge branch 'fix/facturas_problems' into 'main' Jaime Jimenez Ortega 2025-04-24 10:01:38 +00:00
  • 3838bcb536 terminado Jaime Jiménez 2025-04-24 12:01:06 +02:00
  • e2011529b4 Merge branch 'fix/facturas_problema_albaranes_2' into 'main' Jaime Jimenez Ortega 2025-04-24 09:02:06 +00:00
  • 616c12002e solucionado el totl aceptado Jaime Jiménez 2025-04-24 11:01:38 +02:00
  • ab36e86bdb Merge branch 'fix/facturas_problema_albaranes' into 'main' Jaime Jimenez Ortega 2025-04-24 08:56:17 +00:00
  • 1ce4ac36a6 solucionado Jaime Jiménez 2025-04-24 10:55:52 +02:00
  • 7bfb49f412 Merge branch 'add/finalizar_envios_logistica' into 'main' Jaime Jimenez Ortega 2025-04-24 07:05:23 +00:00
  • f7b9c23f69 parece terminado los envios Jaime Jiménez 2025-04-24 00:32:53 +02:00
  • f7d1c59c6a Merge branch 'fix/round_tiempo_rot_descuento_admin' into 'main' Jaime Jimenez Ortega 2025-04-23 15:42:50 +00:00
  • e918b5f400 corregidos los dos fallos Jaime Jiménez 2025-04-23 17:41:43 +02:00
  • 8b949a3173 Merge branch 'main' into add/finalizar_envios_logistica Jaime Jiménez 2025-04-23 17:22:40 +02:00
  • e0916b567c tabajando Jaime Jiménez 2025-04-23 17:22:12 +02:00
  • 3779b3b8a0 Merge branch 'fix/bug_catalogo_rutas' into 'main' Ignacio Martinez Navajas 2025-04-23 13:26:56 +00:00
  • 6175da1d61 Arreglado renaming de las rutas imnavajas 2025-04-23 15:26:22 +02:00
  • 9473c10f97 Merge branch 'bug/ruta_duplicada' into 'main' Ignacio Martinez Navajas 2025-04-23 07:16:56 +00:00
  • 800d32afde Renombrada ruta duplicada imnavajas 2025-04-23 09:16:13 +02:00
  • 00401aaf7f Merge branch 'feat/catalogo' into 'main' Ignacio Martinez Navajas 2025-04-22 20:58:42 +00:00
  • 919c80fa9b Version 1.0 unknown 2025-04-22 22:57:27 +02:00
  • b5b4d6b026 añadidos ficheros Jaime Jiménez 2025-04-22 22:20:21 +02:00
  • 5ac1e3d4c1 finalizar envio ok Jaime Jiménez 2025-04-22 22:20:03 +02:00
  • 7dee2c26e8 Añadidas labels imnavajas 2025-04-22 15:52:48 +02:00
  • 649a244a10 Optimizando vista html imnavajas 2025-04-22 12:00:12 +02:00
  • 288a3f02eb Merge branch 'main' into feat/view-maquinista amazuecos 2025-04-22 10:37:41 +02:00
  • 952500e10e Merge branch 'main' into feat/view-maquinista amazuecos 2025-04-22 10:34:06 +02:00