AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
RPimienta
2023-02-21 00:32:26 -06:00
parent baa6978e42 75e2b380e7
commit 98ea8e2e9d
34 changed files with 2121 additions and 1842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Contabilidad2/RepEstadoResultadosHorizontal.aspx
View File

@@ -159,7 +159,10 @@
</ContentTemplate>
</asp:UpdatePanel>
<ajax:TabContainer ID="Tab" runat="server" ActiveTabIndex="0" Width="100%" OnActiveTabChanged="Tab_ActiveTabChanged" AutoPostBack="true">
<asp:UpdatePanel runat="server" ID="UpGeneral" UpdateMode="Always">
<ContentTemplate>
<ajax:TabContainer ID="Tab" runat="server" ActiveTabIndex="0" Width="100%" OnActiveTabChanged="Tab_ActiveTabChanged" AutoPostBack="true">
<ajax:TabPanel ID="TabMes" runat="server" HeaderText="Mensual">
<ContentTemplate>
@@ -1413,6 +1416,11 @@
</ContentTemplate>
</ajax:TabPanel>
</ajax:TabContainer>
</ContentTemplate>
</asp:UpdatePanel>

38
Contabilidad2/RepEstadoResultadosHorizontal.aspx.vb
View File

@@ -458,8 +458,8 @@ Partial Class Contabilidad_RepEstadoResultadosHorizontal
LblTri.Visible = False
DVTri.Visible = False
LiPeriodoDdl.Visible = False
LiPeriodoLbl.Visible = False
LiPeriodoDdl.Visible = True
LiPeriodoLbl.Visible = True
DdlPeriodo.SelectedValueExist(12)
End If
@@ -1655,7 +1655,12 @@ Partial Class Contabilidad_RepEstadoResultadosHorizontal
IndexData = 13
For IndexData = 13 To IndexMax
Row.Item(IndexData) = DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)")
Row.Item($"Porcentaje{DtIngresosAnualH.Columns(IndexData).ColumnName}") = DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)") * 100 / DtIngresosAnualH.SUM("ImporteAcumulado", "NOT CtaMayor in (3,4)")
If DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)") > 0 Then
Row.Item($"Porcentaje{DtIngresosAnualH.Columns(IndexData).ColumnName}") = DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)") * 100 / DtIngresosAnualH.SUM("ImporteAcumulado", "NOT CtaMayor in (3,4)")
Else
Row.Item($"Porcentaje{DtIngresosAnualH.Columns(IndexData).ColumnName}") = "0"
End If
Next
@@ -1730,7 +1735,16 @@ Partial Class Contabilidad_RepEstadoResultadosHorizontal
IndexData = 13
For IndexData = 13 To IndexMax
Row.Item(IndexData) = DtGastosAnualH.SUM($"[{DtGastosAnualH.Columns(IndexData).ColumnName}]", "Not CtaMayor In (3,4)")
Row.Item($"Porcentaje{DtGastosAnualH.Columns(IndexData).ColumnName}") = DtGastosAnualH.SUM($"[{DtGastosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)") * 100 / DtGastosAnualH.SUM("ImporteAcumulado", "NOT CtaMayor in (3,4)")
If DtGastosAnualH.SUM($"[{DtGastosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)") > 0 Then
Row.Item($"Porcentaje{DtGastosAnualH.Columns(IndexData).ColumnName}") = DtGastosAnualH.SUM($"[{DtGastosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (3,4)") * 100 / DtGastosAnualH.SUM("ImporteAcumulado", "NOT CtaMayor in (3,4)")
Else
Row.Item($"Porcentaje{DtGastosAnualH.Columns(IndexData).ColumnName}") = "0"
End If
Next
Row.Item("Nombre") = "TOTAL GASTOS"
@@ -1757,7 +1771,16 @@ Partial Class Contabilidad_RepEstadoResultadosHorizontal
IndexData = 13
For IndexData = 13 To IndexMax
Row.Item(IndexData) = DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "Not CtaMayor In (-1,3,4)") - DtGastosAnualH.SUM($"[{DtGastosAnualH.Columns(IndexData).ColumnName}]", "Not CtaMayor In (-1,3,4)")
Row.Item($"Porcentaje{DtIngresosAnualH.Columns(IndexData).ColumnName}") = DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (-1,3,4)") * 100 / DtIngresosAnualH.SUM("ImporteAcumulado", "NOT CtaMayor in (-1,3,4)")
If DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (-1,3,4)") > 0 Then
Row.Item($"Porcentaje{DtIngresosAnualH.Columns(IndexData).ColumnName}") = DtIngresosAnualH.SUM($"[{DtIngresosAnualH.Columns(IndexData).ColumnName}]", "NOT CtaMayor in (-1,3,4)") * 100 / DtIngresosAnualH.SUM("ImporteAcumulado", "NOT CtaMayor in (-1,3,4)")
Else
Row.Item($"Porcentaje{DtIngresosAnualH.Columns(IndexData).ColumnName}") = "0"
End If
Next
Row.Item("Nombre") = "Resultados del Ejercicio"
@@ -2131,11 +2154,6 @@ Partial Class Contabilidad_RepEstadoResultadosHorizontal
Row.Item("CtaMayor") = -1
DtIngresosSubProyectoH.Rows.Add(Row)
Row.Item("Nombre") = "TOTAL INGRESOS "
Row.Item("ImporteActual") = "0.00"
Row.Item("ImporteAcumulado") = "0.00"
Row.Item("CtaMayor") = -1
DtIngresosSubProyectoH.Rows.Add(Row)
End If
Dim T1 = TotalActual, T2 = TotalAnterior