Commit Graph

2167 Commits

Author SHA1 Message Date
67a7cda036 Cambios parciales 2025-04-21 15:39:02 +02:00
753aafe05d Resolviendo conflictos 2025-04-21 14:09:08 +02:00
63254f0bf3 Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!718
2025-04-21 12:07:04 +00:00
0afd31aae0 Resolviendo conflictos 2025-04-21 14:06:47 +02:00
dd723f9889 Resolviendo conflictos 2025-04-21 14:06:13 +02:00
703781e115 Resolviendo conflictos 2025-04-21 13:59:55 +02:00
9ae3d8707c Merge branch 'fix/rutas_papeles_genericos' into 'main'
Arreglado bug de rutas

See merge request jjimenez/safekat!717
2025-04-21 11:35:36 +00:00
c344274f9d Arreglado bug de rutas 2025-04-21 13:35:12 +02:00
e18a39938b Revision con JJO 2025-04-21 13:26:00 +02:00
5ebf2c670f Merge branch 'fix/app-permissions' into 'main'
add 755 app

See merge request jjimenez/safekat!716
2025-04-21 10:56:43 +00:00
12e06937c4 add 755 app 2025-04-21 12:55:45 +02:00
9cb7762905 Creada migracion para tabla de isk's 2025-04-21 08:53:37 +02:00
548a444b7d Merge branch 'feat/imposiciones' into 'main'
Feat/imposiciones

See merge request jjimenez/safekat!715
2025-04-21 06:33:51 +00:00
969966ac78 add select imposicion datatable 2025-04-21 08:32:21 +02:00
b318721b90 button imprimir code safekat 2025-04-21 00:12:51 +02:00
a137ede1a7 fix sidebar toggle 2025-04-20 23:27:06 +02:00
5eaa5fea0b fix side bar toggle 2025-04-20 23:03:45 +02:00
14b5f4bf95 Revisados formularios de crear y editar, con su validacion 2025-04-20 21:35:24 +02:00
f2ea93ddb6 fix menu toggle links 2025-04-20 20:01:15 +02:00
31524dcf61 fix menu toggle links 2025-04-20 20:00:52 +02:00
c3d38e29a4 imposiciones 2025-04-20 19:26:07 +02:00
f93ecda648 Creado concepto de ISK 2025-04-20 15:58:43 +02:00
49f9fe4009 Avances inicializacion edit 2025-04-19 22:27:27 +02:00
52a4e7d37b Merge branch 'fix/ot-bugs' into 'main'
Fix/ot bugs

See merge request jjimenez/safekat!713
2025-04-16 18:31:44 +00:00
972d0c4ec8 pdf download file name 2025-04-16 20:31:18 +02:00
36f5d42d03 pdf uncomment 2025-04-16 20:27:08 +02:00
c28753e1f1 Merge branch 'fix/ot-bugs' into 'main'
fix pod and file if not exist

See merge request jjimenez/safekat!712
2025-04-16 18:26:15 +00:00
8e97e7b58c fix pod and file if not exist 2025-04-16 20:25:13 +02:00
f19d2b7ffe Merge branch 'fix/ot-bugs' into 'main'
fix ot

See merge request jjimenez/safekat!711
2025-04-16 17:57:24 +00:00
2a8c4b9da6 fix ot 2025-04-16 19:55:30 +02:00
c42f223b9a Configurando la logica del catalogo (JS) 2025-04-16 16:10:04 +02:00
173afe403e Merge branch 'feat/ot-general-features' into 'main'
ot general features

See merge request jjimenez/safekat!709
2025-04-16 13:52:28 +00:00
c76f4428a6 ot general features 2025-04-16 15:51:09 +02:00
6a4e753a06 Merge branch 'feat/ot-pdf-colores' into 'main'
colores header pdf ot

See merge request jjimenez/safekat!708
2025-04-16 07:15:26 +00:00
7ee844fb0c colores header pdf ot 2025-04-16 09:14:16 +02:00
6d5b8ab621 Importando estilo del comparador 2025-04-15 22:11:58 +02:00
a74021f97d Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!707
2025-04-15 19:07:51 +00:00
725ea61078 Eliminada subida de ficheros y configurado menu de catalogo (no beta) 2025-04-15 21:05:33 +02:00
5dbb40af1d Merge branch 'fix/pedido-espera-update-ot' into 'main'
fix update pedido espera update

See merge request jjimenez/safekat!706
2025-04-15 17:46:28 +00:00
c6db000057 fix update pedido espera update 2025-04-15 19:39:07 +02:00
7cf1bf006d Prrrrrrrrrrr 2025-04-15 16:05:11 +02:00
10e18d60e4 Merge branch 'feat/colors-plannings' into 'main'
add colors plannings

See merge request jjimenez/safekat!703
2025-04-15 07:55:36 +00:00
67e588dd67 Primera version visual formulario catalogo completa 2025-04-15 09:54:33 +02:00
0fe2470477 add colors plannings 2025-04-15 09:53:50 +02:00
ea59390b75 Merge branch 'feat/sk-38+messages+dates' into 'main'
Feat/sk 38+messages+dates

See merge request jjimenez/safekat!702
2025-04-15 06:27:41 +00:00
a52745fe09 fix cols 2025-04-15 01:42:20 +02:00
2102a44a1e Merge branch 'feat/ot-messages' into feat/sk-38+messages+dates 2025-04-15 01:32:20 +02:00
ab99baaa81 add new dates in form 2025-04-15 01:30:46 +02:00
9f46569b01 add messages to ot 2025-04-15 00:42:24 +02:00
14c5cf493c add new dates 2025-04-14 23:36:39 +02:00