diff --git a/AC/Reportes/RepSituacionFinanciera.rdlc b/AC/Reportes/RepSituacionFinanciera.rdlc
index 05411130d..750d7f2cc 100644
--- a/AC/Reportes/RepSituacionFinanciera.rdlc
+++ b/AC/Reportes/RepSituacionFinanciera.rdlc
@@ -215,7 +215,7 @@
ImporteAnterior
- true
+ =IIf(Parameters!CveEmpresa.Value = 48,False,True)
@@ -3022,10 +3050,10 @@
- =Sum(iif(Fields!Tipo.Value.ToString() = "A" OR Fields!Tipo.Value.ToString() = "B" OR Fields!Tipo.Value.ToString() = "C" OR Cint(Fields!TipoCuenta.Value) = 9 , Fields!ImporteActual.Value, 0) , "DataSet1")
+ =Sum(iif(Fields!Sup.Value = "ACTIVO NO CIRCULANTE" OR Fields!Sup.Value="ACTIVO CIRCULANTE", Fields!ImporteActual.Value, 0) , "DataSet1")
- =Sum( iif(Fields!Sup.Value = "ACTIVO NO CIRCULANTE" OR Fields!Sup.Value="ACTIVO CIRCULANTE" OR Cint(Fields!TipoCuenta.value) = 9 , Fields!ImporteAnterior.Value, 0), "DataSet1")
+ =Sum(iif(Fields!Sup.Value = "ACTIVO NO CIRCULANTE" OR Fields!Sup.Value="ACTIVO CIRCULANTE", Fields!ImporteAnterior.Value, 0), "DataSet1")
=Sum( iif(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE" , Fields!ImporteActual.Value, 0), "DataSet1")
@@ -3035,22 +3063,22 @@
true
- =Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" , Fields!ImporteActual.Value, 0),"DataSet1")
+ =Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PATRIMONIO CONTRIBUIDO" , Fields!ImporteActual.Value, 0),"DataSet1")
- =Variables!TotalPatrimonioCActual.Value
+ =Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PATRIMONIO GENERADO" , Fields!ImporteActual.Value, 0),"DataSet1")
- =Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" , Fields!ImporteAnterior.Value, 0),"DataSet1")
+ =Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PATRIMONIO CONTRIBUIDO" , Fields!ImporteAnterior.Value, 0),"DataSet1")
- =Variables!TotalPatrimonioCAnterior.Value
+ =Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PATRIMONIO GENERADO" , Fields!ImporteAnterior.Value, 0),"DataSet1")
- =Variables!TotalPasivoActual.Value+Variables!TotalPatrimonioHActual.Value
+ =Variables!TotalPasivoActual.Value+Variables!TotalPatrimonioHActual.Value+Variables!TotalPatrimonioCActual.Value
- =Variables!TotalPatrimonioHAnterior.Value+ Variables!TotalPasivoAnterior.Value
+ =Variables!TotalPasivoAnterior.Value+Variables!TotalPatrimonioHAnterior.Value+Variables!TotalPatrimonioCAnterior.Value
Cm
diff --git a/App_Code/ClsContPAQi.vb b/App_Code/ClsContPAQi.vb
index cbe00b5ee..2abd5de9e 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, C.CtaMayor as TipoCuenta, ")
+ StrSQL.Append(" SELECT C.Id, C.Codigo, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Ct.Nombre as Sup, Orden, D.Level, ")
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, C.CtaMayor as TipoCuenta, ")
+ StrSQL.Append(" SELECT C.Id, C.Codigo, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Ct.Nombre as Sup, Orden, Level, ")
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 ")