Commit Graph

Select branches

Hide Pull Requests

bug/presupuesto_cliente

dev/import_users

dev/presu_cliente_v2

feat/buscador_usuarios

feat/imposiciones

feat/ot-datatable-navs

feat/ot-pdf-colores

feat/revision-ot-2

feat/sk-38+messages+dates

feat/sk-44

feat/tareas_servicios

feat/tarifas-ot

feat/tipo_papel_presup_cliente

feat/tipos_papeles

feat/view-maquinista

main

mod/historico_catalogo

mod/permisos_admin

Mono Color

• 7a316d9b81 update with pedido espera amazuecos 2025-04-06 06:01:32 +02:00
• 5051bddf36 add translations amazuecos 2025-04-06 06:01:20 +02:00
• 98d47a0f0f remove pedido_espera_by cast amazuecos 2025-04-06 06:01:12 +02:00
• cfa3f7329f add error resposne to get_orden_trabajo_summary amazuecos 2025-04-06 06:00:52 +02:00
• f362087c01 add pedido espera switch amazuecos 2025-04-06 06:00:09 +02:00
• 4343b86640 fix sistema/intranet path amazuecos 2025-04-06 05:59:37 +02:00
• ccfc78ed0d add block ui and file zone amazuecos 2025-04-06 05:59:23 +02:00
• 4fb6533926 notiflix amazuecos 2025-04-06 05:59:04 +02:00
• 2c59ac33df Merge branch 'fix/add_merma_servicios' into 'main' Jaime Jimenez Ortega 2025-04-05 08:25:34 +00:00
• 73e6106e4f solucionado. También corregidos añadir margen en envios de cliente y problema al cargar cubierta con solapas Jaime Jiménez 2025-04-05 10:25:08 +02:00
• b17abbdfa8 upload file feature amazuecos 2025-04-05 09:40:51 +02:00
• 60b77453d9 resourcePath config value amazuecos 2025-04-05 09:40:38 +02:00
• e29e77703d orden trabajo files methods amazuecos 2025-04-05 09:40:18 +02:00
• 139724ae8a update model with files and new attributes amazuecos 2025-04-05 09:40:08 +02:00
• 7dd2e8c1c6 update entity with new attributes amazuecos 2025-04-05 09:39:57 +02:00
• 87b52afab3 update entity with new attributes amazuecos 2025-04-05 09:39:44 +02:00
• 0533d051c4 add migration column is pedido espera amazuecos 2025-04-05 09:39:34 +02:00
• fa03a872dc orden trabajo amazuecos 2025-04-05 09:39:24 +02:00
• c31aa262e2 upload files amazuecos 2025-04-05 09:39:17 +02:00
• 87dcd73c40 Merge branch 'fix/lp_negrohq' into 'main' Jaime Jimenez Ortega 2025-04-05 06:49:48 +00:00
• 21dceb2c23 arraglado Jaime Jiménez 2025-04-05 08:49:24 +02:00
• 1a3b067fbc Merge branch 'fix/remove_dual_presupuesto_aceptado' into 'main' Jaime Jimenez Ortega 2025-04-04 16:30:42 +00:00
• c493f7c8ac corregido Jaime Jiménez 2025-04-04 18:30:24 +02:00
• 4545c33a27 Merge branch 'fix/cargar_user_id_presu_admin' into 'main' Jaime Jimenez Ortega 2025-04-04 16:21:44 +00:00
• e70e3b9683 corregido Jaime Jiménez 2025-04-04 18:21:25 +02:00
• f937695714 Merge branch 'fix/percent_margin_resumen_admin' into 'main' Jaime Jimenez Ortega 2025-04-04 16:14:54 +00:00
• 6b1dc57821 corregido Jaime Jiménez 2025-04-04 18:14:31 +02:00
• 077cfd7d82 Merge branch 'add/ajustar_margen' into 'main' Jaime Jimenez Ortega 2025-04-04 15:04:15 +00:00
• 244361a1ce Merge branch 'main' into 'add/ajustar_margen' Jaime Jimenez Ortega 2025-04-04 15:03:45 +00:00
• cddf64b025 terminada modificacion Jaime Jiménez 2025-04-04 17:03:08 +02:00
• c9d6196aac Merge branch 'bug/users_overwrited' into 'main' Alvaro 2025-04-04 07:53:46 +00:00
• a0cb703991 trabajando Jaime Jiménez 2025-04-04 09:21:36 +02:00
• 2d794aa1a3 Merge branch 'main' into fix/permisos-mensajeria-sidebar Sección habilitada para todos los roles excepto cliente-administrador y cliente amazuecos 2025-04-04 08:53:59 +02:00
• 6594cb6f51 Merge branch 'main' into bug/users_overwrited amazuecos 2025-04-04 01:33:35 +02:00
• c832af90d0 add import ChatNotificationModel amazuecos 2025-04-04 01:32:50 +02:00
• 3d6e8b4886 update with ot files amazuecos 2025-04-04 00:52:41 +02:00
• 00ff185cf1 orden_trabajo_files_table migrate amazuecos 2025-04-04 00:51:55 +02:00
• 1777f435d9 get file and upload_files methods amazuecos 2025-04-04 00:51:43 +02:00
• b141dcacb8 add upload get files for ots amazuecos 2025-04-04 00:51:06 +02:00
• eae40ff4d8 Merge branch 'add/ajustar_margen' of https://git.imnavajas.es/jjimenez/safekat into add/ajustar_margen Jaime Jiménez 2025-04-03 23:37:20 +02:00
• cdf70c19ff añadidos ficheros nuevos Jaime Jiménez 2025-04-03 23:37:14 +02:00
• 1d4f8696e1 Merge branch 'main' into 'add/ajustar_margen' Jaime Jimenez Ortega 2025-04-03 21:36:49 +00:00
• 6208839a12 empezando modificaciones Jaime Jiménez 2025-04-03 23:36:12 +02:00
• 8830f59665 Merge branch 'rev/roles' into 'main' Ignacio Martinez Navajas 2025-04-03 20:21:42 +00:00
• 5b048b8a1b Revision roles soporte de tickets unknown 2025-04-03 22:21:01 +02:00
• 92f7d30c99 Revision facturas en vista cliente unknown 2025-04-03 22:09:28 +02:00
• c9e655ca82 Revisado roles sistema y facturas unknown 2025-04-03 21:44:58 +02:00
• 750847e3b6 Revisado roles Compras unknown 2025-04-03 21:14:39 +02:00
• d017115530 Merge branch 'main' into feat/sk-32 amazuecos 2025-04-03 20:30:17 +02:00
• 27126dbaed Merge branch 'main' into fix/permisos-mensajeria-sidebar amazuecos 2025-04-03 20:23:02 +02:00
• 41bdae0623 fix focus dropdown notifications unviewed amazuecos 2025-04-03 20:20:49 +02:00
• e593f3000b roles message datatatables amazuecos 2025-04-03 20:20:36 +02:00
• 0cde6d5fc5 allow all roles except cliente-administrador y cliente amazuecos 2025-04-03 19:51:52 +02:00
• 465ab4c8f5 add cargo_null key amazuecos 2025-04-03 19:51:19 +02:00
• dc4647fee7 add default value if cargo is null in query amazuecos 2025-04-03 19:51:07 +02:00
• 5d4cc98a91 Merge branch 'add/roles_facturas' into 'main' Jaime Jimenez Ortega 2025-04-03 17:41:06 +00:00
• cbf4ddd550 añadidos roles facturacion Jaime Jiménez 2025-04-03 19:40:33 +02:00
• 40b37962a8 Merge branch 'fix/resumen_margen_envio' into 'main' Jaime Jimenez Ortega 2025-04-03 17:17:52 +00:00
• 4f07f45676 arreglado el problema de que no se actualizaba bien el resumen cuando se clickaba en recoger en taller Jaime Jiménez 2025-04-03 19:17:34 +02:00
• 398afbaeda Arreglado bug añadir usuarios imnavajas 2025-04-03 14:16:43 +02:00
• a123c2dfa7 Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor de App\Models\Usuarios\UserModel imnavajas 2025-04-03 13:54:19 +02:00
• ac804e9720 Eliminadas referencias a UsersEntity imnavajas 2025-04-03 13:29:32 +02:00
• ab63043f36 Unificada entidad de usuarios a UserEntity imnavajas 2025-04-03 13:26:44 +02:00
• b79f490f17 add check horas planning plana amazuecos 2025-04-03 01:08:29 +02:00
• bb848d391f Merge branch 'fix/sk-33' into 'main' Alvaro 2025-04-02 20:26:33 +00:00
• cecf193e37 Merge branch 'main' into fix/sk-33 amazuecos 2025-04-02 22:25:22 +02:00
• 9cbbddcc1c fix chat view amazuecos 2025-04-02 22:24:32 +02:00
• 5f3bc61a41 Merge branch 'fix/maquina_form_variantes' into 'main' Jaime Jimenez Ortega 2025-04-02 18:42:41 +00:00
• 0a10c91159 arreglado Jaime Jiménez 2025-04-02 20:42:27 +02:00
• 2ff4a8fb9d Merge branch 'fix/porcentajes_resumen_admin' into 'main' Jaime Jimenez Ortega 2025-04-02 18:22:13 +00:00
• d294ea2811 arreglado Jaime Jiménez 2025-04-02 20:21:57 +02:00
• 69f6d6cbeb chat select cliente contactos amazuecos 2025-04-02 20:19:16 +02:00
• 9e9eb1f56f Merge branch 'fix/actualizar_presupuestos_acabados' into 'main' Jaime Jimenez Ortega 2025-04-02 18:08:45 +00:00
• 91c820feed arreglado Jaime Jiménez 2025-04-02 20:08:30 +02:00
• b279bd5321 Merge branch 'mod/cambiar_proveedor_enc_admin' into 'main' Jaime Jimenez Ortega 2025-04-02 17:45:12 +00:00
• 9b83f6e722 hecha la modificacione Jaime Jiménez 2025-04-02 19:44:54 +02:00
• b5cc032afc Merge branch 'fix/guardar_presupuesto_coste_envio' into 'main' Jaime Jimenez Ortega 2025-04-02 17:17:55 +00:00
• 88e98962d1 arreglado Jaime Jiménez 2025-04-02 19:17:40 +02:00
• 9d071e462c constraint chat functionalities to all roles, excep and amazuecos 2025-04-02 18:49:36 +02:00
• d51949c593 Merge branch 'fix/logistica-controller' into 'main' Alvaro 2025-04-02 16:43:48 +00:00
• 4d21ff78ff fix logistica controller amazuecos 2025-04-02 18:43:13 +02:00
• 3dc7b816a5 Merge branch 'mod/envio_resumen_admin' into 'main' Jaime Jimenez Ortega 2025-04-02 16:39:49 +00:00
• 6e5d2c3e94 Merge branch 'main' into 'mod/envio_resumen_admin' Jaime Jimenez Ortega 2025-04-02 16:39:27 +00:00
• a481375028 modificado Jaime Jiménez 2025-04-02 18:38:48 +02:00
• 371e986baf Merge branch 'feat/printer-labels' into 'main' Alvaro 2025-04-02 16:30:14 +00:00
• 4872e498a5 Modificado el controlador unknown 2025-04-02 15:53:30 +02:00
• c960fd8539 Tunning parameters! unknown 2025-04-02 14:03:32 +02:00
• 9924f27b5b tmp file amazuecos 2025-04-02 14:00:10 +02:00
• 492c7366cf add ftp send printer amazuecos 2025-04-02 13:54:51 +02:00
• dc4db78b76 Merge branch 'feat/printer-labels' of https://git.imnavajas.es/jjimenez/safekat into feat/printer-labels amazuecos 2025-04-02 13:54:06 +02:00
• 41291c82fd fx amazuecos 2025-04-02 13:53:41 +02:00
• 69aa3f4837 Merge branch 'main' into feat/printer-labels amazuecos 2025-04-02 13:50:34 +02:00
• b4a835bbfd fix ftp send printer command amazuecos 2025-04-02 13:42:24 +02:00
• ef79cc5c2e Merge branch 'main' into 'feat/printer-labels' Ignacio Martinez Navajas 2025-04-02 10:14:38 +00:00
• 0f5e8a223b Merge branch 'fix/importador_papel_diferente' into 'main' Jaime Jimenez Ortega 2025-04-02 08:22:33 +00:00
• ecbd762c7f corregido typo en papelInteriorDiferente Jaime Jimenez 2025-04-02 10:22:11 +02:00
• d42f46d280 etiqueta impresora amazuecos 2025-04-02 08:16:58 +02:00
• c2b61a3d99 Merge branch 'add/logistica_files' into 'main' Jaime Jimenez Ortega 2025-04-01 18:31:46 +00:00
• babd832606 añadidos ficheros Jaime Jiménez 2025-04-01 20:31:24 +02:00
• 210c87ab11 Merge branch 'add/vista_panel_logistica' into 'main' Jaime Jimenez Ortega 2025-04-01 18:29:40 +00:00