Commit Graph

  • 2cfe03b2ec Merge branch 'fix/papel-impresion-routes' into 'main' Alvaro 2025-04-22 08:33:10 +00:00
  • b28c0d9f71 Merge branch 'main' into fix/papel-impresion-routes amazuecos 2025-04-22 10:30:48 +02:00
  • 01c7da8ca6 Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat amazuecos 2025-04-22 10:30:23 +02:00
  • 13128ebdae fix papel impresion plana filter amazuecos 2025-04-22 10:30:05 +02:00
  • 6016b6145c Merge branch 'add/view_logistica_principal' into 'main' Jaime Jimenez Ortega 2025-04-22 08:26:52 +00:00
  • 6450231b53 terminados albaranes Jaime Jiménez 2025-04-22 10:26:33 +02:00
  • b86acc3949 fix papel route amazuecos 2025-04-22 10:18:44 +02:00
  • 92a6a3c16c ot tareas new migrations amazuecos 2025-04-22 10:07:03 +02:00
  • 62a95a0ca8 add views amazuecos 2025-04-22 09:43:25 +02:00
  • ed5f73db25 Refactoring imnavajas 2025-04-22 09:06:11 +02:00
  • ddf02f73b8 Añadido conenido merge imnavajas 2025-04-22 08:40:49 +02:00
  • b555e988be Merge branch 'main' into 'feat/catalogo' Ignacio Martinez Navajas 2025-04-22 06:37:54 +00:00
  • 2050f0ae1e botones albaran finalizado Jaime Jiménez 2025-04-22 00:50:31 +02:00
  • fc1b69f2fe Merge branch 'main' into add/view_logistica_principal Jaime Jiménez 2025-04-21 21:09:00 +02:00
  • 946527cc1a Merge branch 'fix/plantillas_clientes_deleted_at_editor' into 'main' Jaime Jimenez Ortega 2025-04-21 15:42:34 +00:00
  • 33d3e74e80 arreglado Jaime Jiménez 2025-04-21 17:41:53 +02:00
  • 67a7cda036 Cambios parciales unknown 2025-04-21 15:39:02 +02:00
  • ed28263994 Merge branch 'fix/imposicion-ot-view' into 'main' Alvaro 2025-04-21 12:31:52 +00:00
  • 0d24e50d01 fix if imposicion null amazuecos 2025-04-21 14:29:51 +02:00
  • a27536e406 Merge branch 'fix/ot_view' into 'main' Ignacio Martinez Navajas 2025-04-21 12:21:43 +00:00
  • 4af34d7ba4 Arreglado bug en visualizacion de OTs. Cambiada vista por defecto en listado a pendientes unknown 2025-04-21 14:21:19 +02:00
  • 753aafe05d Resolviendo conflictos unknown 2025-04-21 14:09:08 +02:00
  • 63254f0bf3 Merge branch 'main' into 'feat/catalogo' Ignacio Martinez Navajas 2025-04-21 12:07:04 +00:00
  • 0afd31aae0 Resolviendo conflictos unknown 2025-04-21 14:06:47 +02:00
  • dd723f9889 Resolviendo conflictos unknown 2025-04-21 14:06:13 +02:00
  • 703781e115 Resolviendo conflictos unknown 2025-04-21 13:59:55 +02:00
  • 9ae3d8707c Merge branch 'fix/rutas_papeles_genericos' into 'main' Ignacio Martinez Navajas 2025-04-21 11:35:36 +00:00
  • c344274f9d Arreglado bug de rutas unknown 2025-04-21 13:35:12 +02:00
  • e18a39938b Revision con JJO unknown 2025-04-21 13:26:00 +02:00
  • 5ebf2c670f Merge branch 'fix/app-permissions' into 'main' Alvaro 2025-04-21 10:56:43 +00:00
  • 12e06937c4 add 755 app amazuecos 2025-04-21 12:55:45 +02:00
  • fe164c4ab3 trabajando Jaime Jiménez 2025-04-21 12:43:09 +02:00
  • 9cb7762905 Creada migracion para tabla de isk's imnavajas 2025-04-21 08:53:37 +02:00
  • 548a444b7d Merge branch 'feat/imposiciones' into 'main' Alvaro 2025-04-21 06:33:51 +00:00
  • 969966ac78 add select imposicion datatable feat/imposiciones amazuecos 2025-04-21 08:32:21 +02:00
  • b318721b90 button imprimir code safekat amazuecos 2025-04-21 00:12:51 +02:00
  • a137ede1a7 fix sidebar toggle amazuecos 2025-04-20 23:27:06 +02:00
  • 5eaa5fea0b fix side bar toggle amazuecos 2025-04-20 23:03:45 +02:00
  • 19fd76e910 falta terminar albaranes Jaime Jiménez 2025-04-20 22:10:56 +02:00
  • 14b5f4bf95 Revisados formularios de crear y editar, con su validacion unknown 2025-04-20 21:35:24 +02:00
  • 61abcb3dbd trabajando en albaranes. Voy a quitar las cajas Jaime Jiménez 2025-04-20 20:02:14 +02:00
  • f2ea93ddb6 fix menu toggle links amazuecos 2025-04-20 20:01:15 +02:00
  • 31524dcf61 fix menu toggle links amazuecos 2025-04-20 20:00:52 +02:00
  • c3d38e29a4 imposiciones amazuecos 2025-04-20 19:26:07 +02:00
  • f93ecda648 Creado concepto de ISK unknown 2025-04-20 15:58:43 +02:00
  • 49f9fe4009 Avances inicializacion edit unknown 2025-04-19 22:27:27 +02:00
  • 65c9b34f56 añadido switch a los grupos para seleccionar Jaime Jiménez 2025-04-18 13:52:49 +02:00
  • 46c29f3c13 añadidos links al pedido y al presupuesto Jaime Jiménez 2025-04-18 13:42:45 +02:00
  • 0b04e6dabd terminada envio lineas Jaime Jiménez 2025-04-18 13:38:06 +02:00
  • 15f6d0d675 voy a añadir grupos de cajas Jaime Jiménez 2025-04-18 10:36:06 +02:00
  • 3949607a3c trabajando en añadir lineas a envio Jaime Jiménez 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 Jaime Jiménez 2025-04-17 09:10:35 +02:00
  • 76baae9e92 Merge branch 'main' into 'add/view_logistica_principal' Jaime Jimenez Ortega 2025-04-17 07:10:25 +00:00
  • 52a4e7d37b Merge branch 'fix/ot-bugs' into 'main' Alvaro 2025-04-16 18:31:44 +00:00
  • 972d0c4ec8 pdf download file name amazuecos 2025-04-16 20:31:18 +02:00
  • 36f5d42d03 pdf uncomment amazuecos 2025-04-16 20:27:08 +02:00
  • c28753e1f1 Merge branch 'fix/ot-bugs' into 'main' Alvaro 2025-04-16 18:26:15 +00:00
  • 8e97e7b58c fix pod and file if not exist amazuecos 2025-04-16 20:25:13 +02:00
  • f19d2b7ffe Merge branch 'fix/ot-bugs' into 'main' Alvaro 2025-04-16 17:57:24 +00:00
  • 2a8c4b9da6 fix ot amazuecos 2025-04-16 19:55:30 +02:00
  • d50b511e83 Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal Jaime Jiménez 2025-04-16 18:24:53 +02:00
  • 3ada529b6e trabajando Jaime Jiménez 2025-04-16 18:24:48 +02:00
  • 02a64fa40a Merge branch 'main' into 'add/view_logistica_principal' Jaime Jimenez Ortega 2025-04-16 16:24:25 +00:00
  • c42f223b9a Configurando la logica del catalogo (JS) unknown 2025-04-16 16:10:04 +02:00
  • 173afe403e Merge branch 'feat/ot-general-features' into 'main' Alvaro 2025-04-16 13:52:28 +00:00
  • c76f4428a6 ot general features amazuecos 2025-04-16 15:51:09 +02:00
  • 6a4e753a06 Merge branch 'feat/ot-pdf-colores' into 'main' Alvaro 2025-04-16 07:15:26 +00:00
  • 7ee844fb0c colores header pdf ot feat/ot-pdf-colores amazuecos 2025-04-16 09:14:16 +02:00
  • 6d5b8ab621 Importando estilo del comparador unknown 2025-04-15 22:11:58 +02:00
  • a74021f97d Merge branch 'main' into 'feat/catalogo' Ignacio Martinez Navajas 2025-04-15 19:07:51 +00:00
  • 725ea61078 Eliminada subida de ficheros y configurado menu de catalogo (no beta) unknown 2025-04-15 21:05:33 +02:00
  • 5dbb40af1d Merge branch 'fix/pedido-espera-update-ot' into 'main' Alvaro 2025-04-15 17:46:28 +00:00
  • c6db000057 fix update pedido espera update amazuecos 2025-04-15 19:39:07 +02:00
  • 6a4e9b611e Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal Jaime Jiménez 2025-04-15 18:48:07 +02:00
  • fedc608463 cambios antes del pull Jaime Jiménez 2025-04-15 18:48:01 +02:00
  • 4667e77144 Merge branch 'main' into 'add/view_logistica_principal' Jaime Jimenez Ortega 2025-04-15 16:47:08 +00:00
  • 7cf1bf006d Prrrrrrrrrrr imnavajas 2025-04-15 16:05:11 +02:00
  • 10e18d60e4 Merge branch 'feat/colors-plannings' into 'main' feat/sk-38+messages+dates Alvaro 2025-04-15 07:55:36 +00:00
  • 67e588dd67 Primera version visual formulario catalogo completa imnavajas 2025-04-15 09:54:33 +02:00
  • 0fe2470477 add colors plannings amazuecos 2025-04-15 09:53:50 +02:00
  • ea59390b75 Merge branch 'feat/sk-38+messages+dates' into 'main' Alvaro 2025-04-15 06:27:41 +00:00
  • a52745fe09 fix cols amazuecos 2025-04-15 01:42:20 +02:00
  • 2102a44a1e Merge branch 'feat/ot-messages' into feat/sk-38+messages+dates amazuecos 2025-04-15 01:32:20 +02:00
  • ab99baaa81 add new dates in form amazuecos 2025-04-15 01:30:46 +02:00
  • 9f46569b01 add messages to ot amazuecos 2025-04-15 00:42:24 +02:00
  • 14c5cf493c add new dates amazuecos 2025-04-14 23:36:39 +02:00
  • 16dc39ee15 generando el grupo de envios Jaime Jiménez 2025-04-14 22:00:52 +02:00
  • ebf0a9d5d7 feat colors amazuecos 2025-04-14 20:41:23 +02:00
  • c157b1215c Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal Jaime Jiménez 2025-04-14 20:07:36 +02:00
  • c226f031d9 trabajando en selector de pedidos Jaime Jiménez 2025-04-14 20:07:29 +02:00
  • f9909bd8cd Merge branch 'main' into 'add/view_logistica_principal' Jaime Jimenez Ortega 2025-04-14 18:07:14 +00:00
  • c75a2f9ef4 Construyendo el formulario de edicion imnavajas 2025-04-14 14:45:35 +02:00
  • 137d5b9db2 Merge branch 'feat/sk-40/sk-37' into 'main' Alvaro 2025-04-14 06:51:33 +00:00
  • 0d21a7ab3b Merge branch 'main' into feat/sk-40/sk-37 amazuecos 2025-04-14 08:50:36 +02:00
  • e9827c3557 fechas pedido and imposiciones amazuecos 2025-04-14 08:05:03 +02:00
  • f0a4f19089 vista creada de envios Jaime Jiménez 2025-04-13 20:28:05 +02:00
  • 084f3220e1 Merge branch 'fix/flujo_facturas_precio' into 'main' Jaime Jimenez Ortega 2025-04-13 12:13:24 +00:00
  • b28b8b761e reflejado diferentes ivas en total de factura Jaime Jiménez 2025-04-13 14:13:05 +02:00
  • 42a0aed019 Merge branch 'fix/deleted_at/plantilla_precios' into 'main' Alvaro 2025-04-13 07:55:09 +00:00
  • f343071311 fix deleted at amazuecos 2025-04-13 09:54:17 +02:00