Commit 48dcabcb authored by Enrique Matías Sánchez (Quique)'s avatar Enrique Matías Sánchez (Quique)

Merge branch 'master' of

parents 475229f2 b760993c
Pipeline #807 failed with stage
in 1 second
......@@ -922,11 +922,12 @@ class Valoracion(models.Model):
SELECT DISTINCT prog.nombre_corto, l.nombre,, p.titulo, p.ayuda, p.financiacion, p.titulo, c.nombre, p.ayuda, p.financiacion
FROM indo_valoracion v
JOIN indo_proyecto p ON v.proyecto_id =
JOIN indo_programa prog ON p.programa_id =
LEFT JOIN indo_linea l ON p.linea_id =
LEFT JOIN indo_centro c ON p.centro_id =
WHERE prog.convocatoria_id = {anyo}
ORDER BY proyecto_id;
......@@ -966,6 +967,7 @@ class Valoracion(models.Model):
_('Ayuda solicitada'),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment