From 39f5b8f6623edf579d9ade0df911da6ad0088bba Mon Sep 17 00:00:00 2001 From: janeth arvizu Date: Mon, 23 Sep 2019 13:40:06 -0700 Subject: [PATCH] =?UTF-8?q?Se=20agreg=C3=B3=20campo=20para=20corregir=20fo?= =?UTF-8?q?rmato?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AC/RepEstadoActividades.aspx.vb | 3 ++- AC/Reportes/RepEstadoActividades.rdlc | 6 ++++++ App_Code/ClsContPAQi.vb | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AC/RepEstadoActividades.aspx.vb b/AC/RepEstadoActividades.aspx.vb index b4c061882..f2cd112c1 100644 --- a/AC/RepEstadoActividades.aspx.vb +++ b/AC/RepEstadoActividades.aspx.vb @@ -339,7 +339,8 @@ Partial Class AC_RepEstadoActividades params.Add(New ReportParameter("pFirma1", "")) params.Add(New ReportParameter("pFirma2", "")) End If - params.Add(New ReportParameter("pFechaFin", String.Format("{0} al {1}", FechaI, FechaF))) + params.Add(New ReportParameter("periodo", String.Format("de {0} {1}", DdlPeriodo.SelectedItem, DdlEjercicio.SelectedItem))) + params.Add(New ReportParameter("pFechaFin", FechaF)) ImprimirPDF("AC/Reportes/RepEstadoActividades.rdlc", lrds, params, "EstadoActividades", Formato) End Sub diff --git a/AC/Reportes/RepEstadoActividades.rdlc b/AC/Reportes/RepEstadoActividades.rdlc index 73f518b5d..f17742f32 100644 --- a/AC/Reportes/RepEstadoActividades.rdlc +++ b/AC/Reportes/RepEstadoActividades.rdlc @@ -1325,6 +1325,12 @@ true ReportParameter1 + + String + true + true + ReportParameter1 + Cm 163d4464-e41c-42b9-8827-487ff815b059 diff --git a/App_Code/ClsContPAQi.vb b/App_Code/ClsContPAQi.vb index 4c79dccab..a191b7b11 100644 --- a/App_Code/ClsContPAQi.vb +++ b/App_Code/ClsContPAQi.vb @@ -3741,7 +3741,7 @@ Public Class ClsContPAQi StrSQL.Append(" ") StrSQL.Append(" SELECT * ") StrSQL.Append(" FROM ( ") - StrSQL.Append(" SELECT C.Id, C.Codigo, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Ct.Nombre as Sup, Orden, D.Level, ") + StrSQL.Append(" SELECT C.Id, C.Codigo, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Ct.Nombre as Sup, Orden, D.Level, C.CtaMayor as TipoCuenta, ") StrSQL.Append(" CASE WHEN C.Id = @IdCuentaAhorroDesahorro THEN @TotalActual ELSE ISNULL (dbo.FNC_TotalComplementaria(c.Id, @FechaI, @FechaF, @Tipo, @SegmentoNegocio), 0) END AS ImporteActual, ") StrSQL.Append(" CASE ") StrSQL.Append(" WHEN @Tipo < 0 THEN CASE WHEN C.Id = @IdCuentaAhorroDesahorro THEN @TotalAnterior ELSE ISNULL (dbo.FNC_TotalComplementaria(c.Id, @FechaI, DATEADD(yy,-1,@FechaF), @Tipo, @SegmentoNegocio), 0) END ") @@ -3806,7 +3806,7 @@ Public Class ClsContPAQi StrSQL.Append(" ") StrSQL.Append(" SELECT * ") StrSQL.Append(" FROM ( ") - StrSQL.Append(" SELECT C.Id, C.Codigo, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Ct.Nombre as Sup, Orden, Level, ") + StrSQL.Append(" SELECT C.Id, C.Codigo, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Ct.Nombre as Sup, Orden, Level, C.CtaMayor as TipoCuenta, ") StrSQL.Append(" CASE WHEN C.Id = @IdCuentaAhorroDesahorro THEN @TotalActual ELSE ISNULL (dbo.FNC_TotalComplementaria(c.Id, @FechaI, @FechaF, @Tipo, @SegmentoNegocio), 0) END AS ImporteActual, ") StrSQL.Append(" CASE ") StrSQL.Append(" WHEN @Tipo < 0 AND @UsaAnterior > 0 THEN CASE WHEN C.Id = @IdCuentaAhorroDesahorro THEN @TotalAnterior ELSE ISNULL (dbo.FNC_TotalComplementaria(c.Id, DATEADD(yyyy,-1,@FechaI), DATEADD(yyyy,-1,@FechaF), @Tipo, @SegmentoNegocio), 0) END ")