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

• e2da90926d Listado de libros de catalogo unknown 2025-04-13 09:46:47 +02:00
• 08a91294b4 dates users ot amazuecos 2025-04-13 09:43:15 +02:00
• f5d01e520a Merge branch 'main' into feat/imposiciones/sk-40 amazuecos 2025-04-12 23:54:52 +02:00
• ba9c4dc339 imposiciones amazuecos 2025-04-12 23:53:48 +02:00
• 41159d1588 select imposicion route amazuecos 2025-04-12 23:53:28 +02:00
• 5e8da603f9 Merge branch 'main' into 'feat/catalogo' Ignacio Martinez Navajas 2025-04-12 20:21:30 +00:00
• f031e31930 Merge branch 'mod/autoroute' into 'main' Ignacio Martinez Navajas 2025-04-12 20:20:11 +00:00
• e8123c9fb8 Cambiado el flag de autorute a ON unknown 2025-04-12 22:19:48 +02:00
• abc8db6b8b Merge branch 'main' into 'mod/autoroute' Ignacio Martinez Navajas 2025-04-12 20:18:05 +00:00
• a31e0bddb6 Añadido RBAC directory unknown 2025-04-12 22:14:57 +02:00
• 9981f878d1 Inicializacion del modulo catalogo unknown 2025-04-12 22:04:34 +02:00
• 7350e193e5 Merge branch 'fix/rbac_init' into 'main' Ignacio Martinez Navajas 2025-04-12 19:11:48 +00:00
• 9ee2a833b5 Comprobar que el directorio RBAC existe y añadido .gitkeep unknown 2025-04-12 21:11:20 +02:00
• 8cd4570845 Merge branch 'mod/flujo_facturas' into 'main' Jaime Jimenez Ortega 2025-04-12 15:48:21 +00:00
• 89531f1a1b terminado el flujo completo de facturas, incluyendo cambio en el texto de pedidos y facturas cuando no tiene factura validada Jaime Jiménez 2025-04-12 17:47:36 +02:00
• 8912606c9a pagos en borrador Jaime Jiménez 2025-04-12 12:37:57 +02:00
• f966f2d47a Merge branch 'fix/facturas_suma_alineamiento' into 'main' Jaime Jimenez Ortega 2025-04-12 08:51:07 +00:00
• 2e845b7355 solucionado Jaime Jiménez 2025-04-12 10:50:50 +02:00
• 803b979e0d Merge branch 'fix/error_no_inaplazable' into 'main' Jaime Jimenez Ortega 2025-04-12 08:18:51 +00:00
• 79fcb1e3fe arreglado problema Jaime Jiménez 2025-04-12 10:18:32 +02:00
• 9b6b66af13 Merge branch 'mod/pedidos_user_fechas' into 'main' Jaime Jimenez Ortega 2025-04-12 08:02:28 +00:00
• 3d535e4ed5 Merge branch 'main' into 'mod/pedidos_user_fechas' Jaime Jimenez Ortega 2025-04-12 08:01:59 +00:00
• bb9f6210e7 terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en rojo en fechas cuando inaplazable Jaime Jiménez 2025-04-12 10:00:24 +02:00
• da8917b0d3 Merge branch 'fix/sk-41' into 'main' Alvaro 2025-04-12 06:01:17 +00:00
• 38d60402c0 constraint btn-edit event inside table not in $(document) amazuecos 2025-04-12 08:00:32 +02:00
• e7394999ab constraint btn-edit event inside table not in $(document) amazuecos 2025-04-12 08:00:26 +02:00
• ba54d99185 remove doble slash ad form url amazuecos 2025-04-12 07:59:57 +02:00
• efb50383b7 add class table-responsive amazuecos 2025-04-12 07:59:33 +02:00
• de8ae93871 Merge branch 'fix/sk-36' into 'main' Alvaro 2025-04-11 05:04:09 +00:00
• defb7373c4 remove unused imports amazuecos 2025-04-11 07:03:08 +02:00
• a4f6f8cdb3 migration drop is_deleted amazuecos 2025-04-11 07:01:39 +02:00
• 1e339b5503 delete is_deleted field amazuecos 2025-04-11 06:56:55 +02:00
• 9e591a099d Merge branch 'fix/user-import-model' into 'main' Alvaro 2025-04-11 01:36:08 +00:00
• 269410c2c7 Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat amazuecos 2025-04-11 03:34:10 +02:00
• 49f3430f12 Merge branch 'fix/facturas_pdf' into 'main' Ignacio Martinez Navajas 2025-04-10 20:42:05 +00:00
• 64e4f51e13 Arreglado bug al generar PDF de facturas unknown 2025-04-10 22:41:38 +02:00
• 10781c40a9 Merge branch 'mod/facturas_trello' into 'main' Jaime Jimenez Ortega 2025-04-10 14:59:28 +00:00
• 026a109b5e terminado Jaime Jiménez 2025-04-10 16:58:54 +02:00
• cce8b1845f Merge branch 'main' into 'mod/facturas_trello' Jaime Jimenez Ortega 2025-04-10 13:34:31 +00:00
• 7139bb377c falta autonumeric Jaime Jiménez 2025-04-10 15:34:14 +02:00
• 29e130458a Merge branch 'mod/pdf_facturas' into 'main' Ignacio Martinez Navajas 2025-04-10 12:34:22 +00:00
• d8cb02271e Actualizado el pdf de facturas para eliminar precio por linea unknown 2025-04-10 14:33:35 +02:00
• b37f3f663a Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat amazuecos 2025-04-09 07:05:11 +02:00
• 014b48e693 fix user model imports amazuecos 2025-04-09 07:04:06 +02:00
• af57f7d5ae Modificado Paises al metodo JS unknown 2025-04-09 00:37:30 +02:00
• b7c5c328da Merge branch 'main' into 'mod/autoroute' Ignacio Martinez Navajas 2025-04-08 20:44:10 +00:00
• 5a2b2ee7cb Resolviendo conflictos unknown 2025-04-08 22:43:49 +02:00
• 94a2a1dd2e Resolviendo conflictos unknown 2025-04-08 22:41:25 +02:00
• 84155d1f71 Merge branch 'fix/rolesPermissions_view' into 'main' Jaime Jimenez Ortega 2025-04-08 20:38:29 +00:00
• fc52417b53 modificada la vista cuando hay más de 3 permisos Jaime Jiménez 2025-04-08 22:37:53 +02:00
• 03135fdac7 Añadidos archivos de rutas para presupuestos y compras unknown 2025-04-08 15:22:39 +02:00
• 3cfdc584e5 Añadida estructura de rutas en carpeta dedicada unknown 2025-04-08 15:04:14 +02:00
• c0de7ec238 Cambiadas rutas de maquinas, papel generico, papel impresion, perfil y paises unknown 2025-04-08 14:45:14 +02:00
• ae9af197ac Merge branch 'fix/arreglar_resumen_cliente_vs_admin' into 'main' Ignacio Martinez Navajas 2025-04-07 22:44:08 +00:00
• ab4afe7492 Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin' Ignacio Martinez Navajas 2025-04-07 22:43:25 +00:00
• 982b008ada Merge branch 'fix/compras_proveedores' into 'main' Ignacio Martinez Navajas 2025-04-07 22:42:27 +00:00
• 036c11b4ab Arreglado menu compras/proveedores unknown 2025-04-08 00:41:31 +02:00
• 644ad41001 todo okgit pullgit pull Jaime Jiménez 2025-04-08 00:28:45 +02:00
• b413245683 Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin' Ignacio Martinez Navajas 2025-04-07 22:19:36 +00:00
• 0116553b2b Merge branch 'rev/roles_2' into 'main' Ignacio Martinez Navajas 2025-04-07 21:59:31 +00:00
• 4b57c716ab Refactorizazion unknown 2025-04-07 23:58:44 +02:00
• df05f4b5b4 Revisados roles de pedidos y corregidos bugs de poner autoroute = false unknown 2025-04-07 23:49:35 +02:00
• 6c20121f0c Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin' Jaime Jimenez Ortega 2025-04-07 21:39:12 +00:00
• 885aea495c falta factores cliente Jaime Jiménez 2025-04-07 23:38:31 +02:00
• a6f07a15b5 Añadidos permisos para Produccion unknown 2025-04-07 23:20:07 +02:00
• 432567e964 Permisos produccion unknown 2025-04-07 22:56:07 +02:00
• 470732ca39 Merge branch 'rev/roles_1' into 'main' Ignacio Martinez Navajas 2025-04-07 20:35:18 +00:00
• 5b15d7a72e Subiendo menu importador unknown 2025-04-07 22:34:40 +02:00
• 64a6e0c5f4 Merge branch 'main' into 'rev/roles_1' Ignacio Martinez Navajas 2025-04-07 20:30:49 +00:00
• c8598cbd27 Resolviendo conflictos unknown 2025-04-07 22:30:29 +02:00
• e96c738839 Merge branch 'mod/ajustes_mail' into 'main' Ignacio Martinez Navajas 2025-04-07 20:17:28 +00:00
• a62e51d31c Merge branch 'main' into 'mod/ajustes_mail' Ignacio Martinez Navajas 2025-04-07 20:16:02 +00:00
• 4f5bc3301f Eliminados ajustes de sistemas. Ahora estan en variables del ERP unknown 2025-04-07 22:14:44 +02:00
• 4633fa623a Merge branch 'add/tablaCredito_presuAdmin_old_erp' into 'main' Jaime Jimenez Ortega 2025-04-07 19:32:56 +00:00
• ce1d94bbda añadido pendiente en erp antiguo Jaime Jiménez 2025-04-07 21:32:36 +02:00
• 387667b0c2 Merge branch 'fix/lista_papel_impre_activo' into 'main' Jaime Jimenez Ortega 2025-04-07 16:38:50 +00:00
• 66825d3286 quitada la condición isactivo en el listado Jaime Jiménez 2025-04-07 18:38:29 +02:00
• 3baa7c9e51 Merge branch 'rev/roles_1' of https://git.imnavajas.es/jjimenez/safekat into rev/roles_1 unknown 2025-04-07 09:55:35 +02:00
• c450d4f804 Revisando roles y añadido clase beta al CSS unknown 2025-04-07 09:55:30 +02:00
• 937af8f5d9 Merge branch 'main' into 'rev/roles_1' Ignacio Martinez Navajas 2025-04-07 07:54:11 +00:00
• 6045d65935 Merge branch 'mod/listado_plantillas_tarifas' into 'main' Jaime Jimenez Ortega 2025-04-07 05:11:04 +00:00
• 78584f22c3 cambiado a papel generico la descripción del pedido (y de facturas por tanto) Jaime Jiménez 2025-04-07 07:10:17 +02:00
• 2de72e4278 añadidos totales a tarifas de clientes Jaime Jiménez 2025-04-06 19:35:39 +02:00
• e5b2bc19d4 Merge branch 'fix/permisos-mensajeria-sidebar' into 'main' Alvaro 2025-04-06 07:50:27 +00:00
• ce325d73dc Merge branch 'main' into fix/permisos-mensajeria-sidebar amazuecos 2025-04-06 09:49:46 +02:00
• 301152c6e2 Merge branch 'feat/sk-34/filter-maquina-padre' into 'main' Alvaro 2025-04-06 07:43:31 +00:00
• 1b451ab08e Merge branch 'feat/sk-32' into 'main' Alvaro 2025-04-06 07:42:31 +00:00
• c42a7bae44 Merge branch 'main' into fix/permisos-mensajeria-sidebar amazuecos 2025-04-06 09:40:09 +02:00
• c6bc2e532f Merge branch 'fix/maquina-form-bugs' into 'main' Alvaro 2025-04-06 07:37:26 +00:00
• 2b343b0dd9 add filter maquina padre in datatablePlanningPlana amazuecos 2025-04-06 09:33:44 +02:00
• 89ec78bc31 add select filter maquina padre amazuecos 2025-04-06 09:32:53 +02:00
• 2857697fd2 add padre_id to select in planningPlanaQueryDatatable amazuecos 2025-04-06 09:32:42 +02:00
• 2eb51ffd55 maquina padre plana amazuecos 2025-04-06 09:32:13 +02:00
• b320856af8 select maquina plana padre amazuecos 2025-04-06 09:32:04 +02:00
• 071dceced8 table papeles impresion responsive amazuecos 2025-04-06 06:17:19 +02:00
• 75eea1a736 Merge branch 'main' into feat/sk-32 amazuecos 2025-04-06 06:03:44 +02:00
• c14eb1f3c3 button to sm. Acorddion default collapsed amazuecos 2025-04-06 06:02:51 +02:00
• 7aa1a33767 fix switches inaplazable y revisada css amazuecos 2025-04-06 06:02:27 +02:00
• f56ede87da reorder sections amazuecos 2025-04-06 06:02:02 +02:00
• ea11011aca buttons to btn-sm amazuecos 2025-04-06 06:01:50 +02:00