diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index d5cf5e840..355a0e47d 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -992,6 +992,9 @@ Public Class ClsContabilidad ElseIf ex1.Message.Contains("Vw_Val_Conta_CuentasResultados_SubProyectos") Then Dim Concepto2 As String = DirectCast(HttpContext.Current.Application("GlobalDTContaConceptosContables"), DataTable).FiltroPrimeroValor("ConceptoContable", String.Format("CveConceptoContable = {0}", CveConceptoContable)) OnError(String.Format("El concepto '{0}' requiere centro de costo", Concepto2), ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + ElseIf ex1.Message.Contains("UK_Vw_Val_Conta_CuentasResultados_SubProyectos") Then + Dim Concepto3 As String = DirectCast(HttpContext.Current.Application("GlobalDTContaConceptosContables"), DataTable).FiltroPrimeroValor("ConceptoContable", String.Format("CveConceptoContable = {0}", CveConceptoContable)) + OnError(String.Format("El concepto '{0}' requiere centro de costo", Concepto3), ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) Else OnError("Ocurrió un error al Guardar", ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End If ' @@ -3814,6 +3817,30 @@ Public Class ClsContabilidad Return Retorno End Function + + + Public Function GetFlujoEfectivo2(FechaF As Date, Tipo As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno = False + + DataAdapter("PA_Conta_RepFlujoEfectivo2") + + With SqlAdapter.SelectCommand.Parameters + + .Add("@FechaF", SqlDbType.Date).Value = FechaF + .Add("@TipoReporte", SqlDbType.Int).Value = Tipo + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + Me.OnError("Ocurrió un error al obtener el Estado de Flujo de Efectivo.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + End Function + Public Function GetOrigenAplicacion(FechaI As String, FechaF As String, TipoReporte As Integer, CveSubProyecto As String, CveEmpresa As Integer) As Boolean Dim Retorno = False diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 90bb8784f..34ede2134 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -4834,6 +4834,8 @@ Public Class ClsPaginas PaginaDict.Add("/Contabilidad/RepIEPS.aspx".ToUpper(), 714) PaginaDict.Add("/Contabilidad/CatPeriodosBloqueo.aspx".ToUpper(), 677) PaginaDict.Add("/Contabilidad/CatClasificacionPorcentaje.aspx".ToUpper(), 752) + PaginaDict.Add("/Contabilidad/RepFlujoEfectivo.aspx".ToUpper(), 783) + #End Region 'CONTABILIDAD2 diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb index 0f37de0bb..03f75a6a1 100644 --- a/Bancos/IE.aspx.vb +++ b/Bancos/IE.aspx.vb @@ -1884,7 +1884,7 @@ Partial Class Bancos_IE If Tipo.Length > 0 Then DdlTipoTransaccion.Items.Clear() - DdlTipoTransaccion.DataSource = dt.FiltraParametros($"Tipo = '{Tipo}' ") + DdlTipoTransaccion.DataSource = GlobalDTTipoTransacciones.FiltraParametros($"Tipo = '{Tipo}' AND EstatusTexto = 'Activo' ") End If diff --git a/Bin/AjaxControlToolkit.StaticResources.dll.refresh b/Bin/AjaxControlToolkit.StaticResources.dll.refresh new file mode 100644 index 000000000..b3cf24911 Binary files /dev/null and b/Bin/AjaxControlToolkit.StaticResources.dll.refresh differ diff --git a/Bin/AjaxControlToolkit.dll.refresh b/Bin/AjaxControlToolkit.dll.refresh new file mode 100644 index 000000000..77c4b3e42 --- /dev/null +++ b/Bin/AjaxControlToolkit.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\AjaxControlToolkit.15.1.4.0\lib\net40\AjaxControlToolkit.dll \ No newline at end of file diff --git a/Bin/Antlr3.Runtime.dll.refresh b/Bin/Antlr3.Runtime.dll.refresh new file mode 100644 index 000000000..38d3e5b03 --- /dev/null +++ b/Bin/Antlr3.Runtime.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll \ No newline at end of file diff --git a/Bin/BarcodeStandard.dll.refresh b/Bin/BarcodeStandard.dll.refresh new file mode 100644 index 000000000..a4e749e42 Binary files /dev/null and b/Bin/BarcodeStandard.dll.refresh differ diff --git a/Bin/Bin.rar b/Bin/Bin.rar new file mode 100644 index 000000000..5d8159013 Binary files /dev/null and b/Bin/Bin.rar differ diff --git a/Bin/Bin_20220223.rar b/Bin/Bin_20220223.rar new file mode 100644 index 000000000..1d4ea77ab Binary files /dev/null and b/Bin/Bin_20220223.rar differ diff --git a/Bin/ClosedXML.dll.refresh b/Bin/ClosedXML.dll.refresh new file mode 100644 index 000000000..77ab5998d Binary files /dev/null and b/Bin/ClosedXML.dll.refresh differ diff --git a/Bin/DocumentFormat.OpenXml.dll.refresh b/Bin/DocumentFormat.OpenXml.dll.refresh new file mode 100644 index 000000000..5fd0dd7fd --- /dev/null +++ b/Bin/DocumentFormat.OpenXml.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll \ No newline at end of file diff --git a/Bin/ExcelNumberFormat.dll.refresh b/Bin/ExcelNumberFormat.dll.refresh new file mode 100644 index 000000000..0aa2b8948 Binary files /dev/null and b/Bin/ExcelNumberFormat.dll.refresh differ diff --git a/Bin/Microsoft.AspNet.SignalR.Core.dll.refresh b/Bin/Microsoft.AspNet.SignalR.Core.dll.refresh new file mode 100644 index 000000000..a9958cd7f --- /dev/null +++ b/Bin/Microsoft.AspNet.SignalR.Core.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll \ No newline at end of file diff --git a/Bin/Microsoft.AspNet.SignalR.SystemWeb.dll.refresh b/Bin/Microsoft.AspNet.SignalR.SystemWeb.dll.refresh new file mode 100644 index 000000000..2f0774e9f --- /dev/null +++ b/Bin/Microsoft.AspNet.SignalR.SystemWeb.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.AspNet.SignalR.SystemWeb.2.4.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll \ No newline at end of file diff --git a/Bin/Microsoft.Bcl.AsyncInterfaces.dll.refresh b/Bin/Microsoft.Bcl.AsyncInterfaces.dll.refresh new file mode 100644 index 000000000..7ee9c9d22 --- /dev/null +++ b/Bin/Microsoft.Bcl.AsyncInterfaces.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll \ No newline at end of file diff --git a/Bin/Microsoft.Bcl.HashCode.dll.refresh b/Bin/Microsoft.Bcl.HashCode.dll.refresh new file mode 100644 index 000000000..59bf6915c Binary files /dev/null and b/Bin/Microsoft.Bcl.HashCode.dll.refresh differ diff --git a/Bin/Microsoft.EntityFrameworkCore.Abstractions.dll.refresh b/Bin/Microsoft.EntityFrameworkCore.Abstractions.dll.refresh new file mode 100644 index 000000000..6f8e0c413 Binary files /dev/null and b/Bin/Microsoft.EntityFrameworkCore.Abstractions.dll.refresh differ diff --git a/Bin/Microsoft.EntityFrameworkCore.dll.refresh b/Bin/Microsoft.EntityFrameworkCore.dll.refresh new file mode 100644 index 000000000..4c1d7daed Binary files /dev/null and b/Bin/Microsoft.EntityFrameworkCore.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Caching.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.Caching.Abstractions.dll.refresh new file mode 100644 index 000000000..45fd7fb69 Binary files /dev/null and b/Bin/Microsoft.Extensions.Caching.Abstractions.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Caching.Memory.dll.refresh b/Bin/Microsoft.Extensions.Caching.Memory.dll.refresh new file mode 100644 index 000000000..2eb00ecef Binary files /dev/null and b/Bin/Microsoft.Extensions.Caching.Memory.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Configuration.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.Configuration.Abstractions.dll.refresh new file mode 100644 index 000000000..9e0d5a5d2 Binary files /dev/null and b/Bin/Microsoft.Extensions.Configuration.Abstractions.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Configuration.Binder.dll.refresh b/Bin/Microsoft.Extensions.Configuration.Binder.dll.refresh new file mode 100644 index 000000000..7685c4f8a Binary files /dev/null and b/Bin/Microsoft.Extensions.Configuration.Binder.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Configuration.dll.refresh b/Bin/Microsoft.Extensions.Configuration.dll.refresh new file mode 100644 index 000000000..fc07ce8ca Binary files /dev/null and b/Bin/Microsoft.Extensions.Configuration.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll.refresh new file mode 100644 index 000000000..fc50476ed Binary files /dev/null and b/Bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.DependencyInjection.dll.refresh b/Bin/Microsoft.Extensions.DependencyInjection.dll.refresh new file mode 100644 index 000000000..13cc264a4 Binary files /dev/null and b/Bin/Microsoft.Extensions.DependencyInjection.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Logging.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.Logging.Abstractions.dll.refresh new file mode 100644 index 000000000..ded6a5d13 Binary files /dev/null and b/Bin/Microsoft.Extensions.Logging.Abstractions.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Logging.dll.refresh b/Bin/Microsoft.Extensions.Logging.dll.refresh new file mode 100644 index 000000000..33dd44698 Binary files /dev/null and b/Bin/Microsoft.Extensions.Logging.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Options.dll.refresh b/Bin/Microsoft.Extensions.Options.dll.refresh new file mode 100644 index 000000000..12e55441f Binary files /dev/null and b/Bin/Microsoft.Extensions.Options.dll.refresh differ diff --git a/Bin/Microsoft.Extensions.Primitives.dll.refresh b/Bin/Microsoft.Extensions.Primitives.dll.refresh new file mode 100644 index 000000000..dfc1297b3 Binary files /dev/null and b/Bin/Microsoft.Extensions.Primitives.dll.refresh differ diff --git a/Bin/Microsoft.Owin.Host.SystemWeb.dll.refresh b/Bin/Microsoft.Owin.Host.SystemWeb.dll.refresh new file mode 100644 index 000000000..24e891aba --- /dev/null +++ b/Bin/Microsoft.Owin.Host.SystemWeb.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll \ No newline at end of file diff --git a/Bin/Microsoft.Owin.Security.OAuth.dll.refresh b/Bin/Microsoft.Owin.Security.OAuth.dll.refresh new file mode 100644 index 000000000..8367f8120 --- /dev/null +++ b/Bin/Microsoft.Owin.Security.OAuth.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.Owin.Security.OAuth.4.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll \ No newline at end of file diff --git a/Bin/Microsoft.Owin.Security.dll.refresh b/Bin/Microsoft.Owin.Security.dll.refresh new file mode 100644 index 000000000..ebc4a2f6a Binary files /dev/null and b/Bin/Microsoft.Owin.Security.dll.refresh differ diff --git a/Bin/Microsoft.Owin.dll.refresh b/Bin/Microsoft.Owin.dll.refresh new file mode 100644 index 000000000..0c642ed25 Binary files /dev/null and b/Bin/Microsoft.Owin.dll.refresh differ diff --git a/Bin/Microsoft.ReportViewer.Common.dll.refresh b/Bin/Microsoft.ReportViewer.Common.dll.refresh new file mode 100644 index 000000000..f65d83594 --- /dev/null +++ b/Bin/Microsoft.ReportViewer.Common.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.ReportViewer.2015.Runtime.12.0.2.2402\lib\Microsoft.ReportViewer.Common.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.Design.dll.refresh b/Bin/Microsoft.ReportViewer.Design.dll.refresh new file mode 100644 index 000000000..5d3c3a60d Binary files /dev/null and b/Bin/Microsoft.ReportViewer.Design.dll.refresh differ diff --git a/Bin/Microsoft.ReportViewer.ProcessingObjectModel.DLL.refresh b/Bin/Microsoft.ReportViewer.ProcessingObjectModel.DLL.refresh new file mode 100644 index 000000000..ba5726ab9 --- /dev/null +++ b/Bin/Microsoft.ReportViewer.ProcessingObjectModel.DLL.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.ReportViewer.2015.Runtime.12.0.2.2402\lib\Microsoft.ReportViewer.ProcessingObjectModel.DLL \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh b/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh new file mode 100644 index 000000000..8f52dc67c Binary files /dev/null and b/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh differ diff --git a/Bin/Microsoft.ReportViewer.WebForms.DLL.refresh b/Bin/Microsoft.ReportViewer.WebForms.DLL.refresh new file mode 100644 index 000000000..84ff5c799 --- /dev/null +++ b/Bin/Microsoft.ReportViewer.WebForms.DLL.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.ReportViewer.2015.Runtime.12.0.2.2402\lib\Microsoft.ReportViewer.WebForms.DLL \ No newline at end of file diff --git a/Bin/Microsoft.SqlServer.Types.dll.refresh b/Bin/Microsoft.SqlServer.Types.dll.refresh new file mode 100644 index 000000000..70e0e613c --- /dev/null +++ b/Bin/Microsoft.SqlServer.Types.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.SqlServer.Types.14.0.1016.290\lib\net40\Microsoft.SqlServer.Types.dll \ No newline at end of file diff --git a/Bin/Microsoft.Threading.Tasks.Extensions.Desktop.dll.refresh b/Bin/Microsoft.Threading.Tasks.Extensions.Desktop.dll.refresh new file mode 100644 index 000000000..f6ac753bc Binary files /dev/null and b/Bin/Microsoft.Threading.Tasks.Extensions.Desktop.dll.refresh differ diff --git a/Bin/Microsoft.Threading.Tasks.Extensions.dll.refresh b/Bin/Microsoft.Threading.Tasks.Extensions.dll.refresh new file mode 100644 index 000000000..b98a3119d Binary files /dev/null and b/Bin/Microsoft.Threading.Tasks.Extensions.dll.refresh differ diff --git a/Bin/Microsoft.Threading.Tasks.dll.refresh b/Bin/Microsoft.Threading.Tasks.dll.refresh new file mode 100644 index 000000000..9b20e6064 Binary files /dev/null and b/Bin/Microsoft.Threading.Tasks.dll.refresh differ diff --git a/Bin/Microsoft.Web.Infrastructure.dll.refresh b/Bin/Microsoft.Web.Infrastructure.dll.refresh new file mode 100644 index 000000000..0f05d5223 --- /dev/null +++ b/Bin/Microsoft.Web.Infrastructure.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll \ No newline at end of file diff --git a/Bin/Microsoft.Web.XmlTransform.dll.refresh b/Bin/Microsoft.Web.XmlTransform.dll.refresh new file mode 100644 index 000000000..b2ab5df52 --- /dev/null +++ b/Bin/Microsoft.Web.XmlTransform.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.Web.Xdt.1.0.0\lib\net40\Microsoft.Web.XmlTransform.dll \ No newline at end of file diff --git a/Bin/MoreLinq.dll.refresh b/Bin/MoreLinq.dll.refresh new file mode 100644 index 000000000..2c2b59e5e Binary files /dev/null and b/Bin/MoreLinq.dll.refresh differ diff --git a/Bin/Newtonsoft.Json.dll.refresh b/Bin/Newtonsoft.Json.dll.refresh new file mode 100644 index 000000000..7ea2fc3cc Binary files /dev/null and b/Bin/Newtonsoft.Json.dll.refresh differ diff --git a/Bin/NuGet.Core.dll.refresh b/Bin/NuGet.Core.dll.refresh new file mode 100644 index 000000000..8b4724d5f --- /dev/null +++ b/Bin/NuGet.Core.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\NuGet.Core.2.8.0\lib\net40-Client\NuGet.Core.dll \ No newline at end of file diff --git a/Bin/Owin.dll.refresh b/Bin/Owin.dll.refresh new file mode 100644 index 000000000..5781f891e --- /dev/null +++ b/Bin/Owin.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Owin.1.0\lib\net40\Owin.dll \ No newline at end of file diff --git a/Bin/StackExchange.Redis.StrongName.dll.refresh b/Bin/StackExchange.Redis.StrongName.dll.refresh new file mode 100644 index 000000000..69e4a7844 Binary files /dev/null and b/Bin/StackExchange.Redis.StrongName.dll.refresh differ diff --git a/Bin/System.Buffers.dll.refresh b/Bin/System.Buffers.dll.refresh new file mode 100644 index 000000000..9e47b925a --- /dev/null +++ b/Bin/System.Buffers.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll \ No newline at end of file diff --git a/Bin/System.Collections.Immutable.dll.refresh b/Bin/System.Collections.Immutable.dll.refresh new file mode 100644 index 000000000..fe7092133 --- /dev/null +++ b/Bin/System.Collections.Immutable.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll \ No newline at end of file diff --git a/Bin/System.ComponentModel.Annotations.dll.refresh b/Bin/System.ComponentModel.Annotations.dll.refresh new file mode 100644 index 000000000..a5268168b --- /dev/null +++ b/Bin/System.ComponentModel.Annotations.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll \ No newline at end of file diff --git a/Bin/System.Data.SqlClient.dll.refresh b/Bin/System.Data.SqlClient.dll.refresh new file mode 100644 index 000000000..98c0c6373 Binary files /dev/null and b/Bin/System.Data.SqlClient.dll.refresh differ diff --git a/Bin/System.Diagnostics.DiagnosticSource.dll.refresh b/Bin/System.Diagnostics.DiagnosticSource.dll.refresh new file mode 100644 index 000000000..2ee9bbe23 --- /dev/null +++ b/Bin/System.Diagnostics.DiagnosticSource.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll \ No newline at end of file diff --git a/Bin/System.IO.FileSystem.Primitives.dll.refresh b/Bin/System.IO.FileSystem.Primitives.dll.refresh new file mode 100644 index 000000000..92490d347 Binary files /dev/null and b/Bin/System.IO.FileSystem.Primitives.dll.refresh differ diff --git a/Bin/System.Memory.dll.refresh b/Bin/System.Memory.dll.refresh new file mode 100644 index 000000000..9dd2ab1f6 --- /dev/null +++ b/Bin/System.Memory.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll \ No newline at end of file diff --git a/Bin/System.Numerics.Vectors.dll.refresh b/Bin/System.Numerics.Vectors.dll.refresh new file mode 100644 index 000000000..83102c12f --- /dev/null +++ b/Bin/System.Numerics.Vectors.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll \ No newline at end of file diff --git a/Bin/System.Runtime.CompilerServices.Unsafe.dll.refresh b/Bin/System.Runtime.CompilerServices.Unsafe.dll.refresh new file mode 100644 index 000000000..017b2a2b7 --- /dev/null +++ b/Bin/System.Runtime.CompilerServices.Unsafe.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll \ No newline at end of file diff --git a/Bin/System.Text.Json.dll.refresh b/Bin/System.Text.Json.dll.refresh new file mode 100644 index 000000000..ac4c7142e --- /dev/null +++ b/Bin/System.Text.Json.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll \ No newline at end of file diff --git a/Bin/System.Threading.Tasks.Extensions.dll.refresh b/Bin/System.Threading.Tasks.Extensions.dll.refresh new file mode 100644 index 000000000..3bde29d1b --- /dev/null +++ b/Bin/System.Threading.Tasks.Extensions.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll \ No newline at end of file diff --git a/Bin/System.ValueTuple.dll.refresh b/Bin/System.ValueTuple.dll.refresh new file mode 100644 index 000000000..fa313a698 --- /dev/null +++ b/Bin/System.ValueTuple.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll \ No newline at end of file diff --git a/Bin/System.Web.Optimization.dll.refresh b/Bin/System.Web.Optimization.dll.refresh new file mode 100644 index 000000000..7159da811 --- /dev/null +++ b/Bin/System.Web.Optimization.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll \ No newline at end of file diff --git a/Bin/WebGrease.dll.refresh b/Bin/WebGrease.dll.refresh new file mode 100644 index 000000000..3eda72e78 --- /dev/null +++ b/Bin/WebGrease.dll.refresh @@ -0,0 +1 @@ +C:\Users\Caudillo\source\repos\localhost_85\packages\WebGrease.1.6.0\lib\WebGrease.dll \ No newline at end of file diff --git a/Bin/log4net.dll.refresh b/Bin/log4net.dll.refresh new file mode 100644 index 000000000..8c31352c2 Binary files /dev/null and b/Bin/log4net.dll.refresh differ diff --git a/Contabilidad/RegPrePolizaS.aspx.vb b/Contabilidad/RegPrePolizaS.aspx.vb index b0404e0a8..979dc9b22 100644 --- a/Contabilidad/RegPrePolizaS.aspx.vb +++ b/Contabilidad/RegPrePolizaS.aspx.vb @@ -2399,7 +2399,7 @@ Partial Class ContabilidadC_RegPrePolizaS Dim CveSubProyecto As Integer = -1 Dim TipoMovto As Boolean = If(Row("Cargo").ToString.ToDecimal <> 0, False, True) - Dim CveConceptoContable As Integer = GlobalDTContaConceptosContables(-1).FiltroPrimeroValor("CveConceptoContable", String.Format("ConceptoContable ='{0}'", Row("ConceptoAdministrativo"))).ToEntero ' Row("CveConceptoContable").ToString.ToEntero + Dim CveConceptoContable As Integer = GlobalDTContaConceptosContables(-1).FiltroPrimeroValor("CveConceptoContable", String.Format("ConceptoContable ='{0}'", Row("ConceptoAdministrativo").ToString.Trim)).ToEntero ' Row("CveConceptoContable").ToString.ToEntero 'Dim IdCtaContable As Integer = Row("IdCtaContable").ToString.ToEntero Dim CveClasificacion As Integer = -1 Dim CveCuentaExcel As Integer = -1 diff --git a/Contabilidad/RepFlujoEfectivo.aspx b/Contabilidad/RepFlujoEfectivo.aspx new file mode 100644 index 000000000..71572a776 --- /dev/null +++ b/Contabilidad/RepFlujoEfectivo.aspx @@ -0,0 +1,115 @@ +<%@ Page Title="Reporte Flujo de Efectivo" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="RepFlujoEfectivo.aspx.vb" Inherits="Contabilidad_RepFlujoEfectivo" %> + + + + + + + + + Reporte Flujo de Efectivo + + + +
  • + Exporta Excel +
    • + + +     + + + + +
    +
    +
    + +
    +
    +
    + <%--
    Fecha Inicio:
    +
    +
    + + + + + + +
    +
    --%> +
    Fecha Fin:
    +
    +
    + + + + + + +
    +
    +
    Tipo:
    +
    + + + + +
    +
    +
    +
    +
    +     +     + + + + + +
    +
    + + + + +
    + +
    +     + +     + + + + + + + + + + + + + + + + + + + +     +     +
    +
    + + + + +     +     +     + + + diff --git a/Contabilidad/RepFlujoEfectivo.aspx.vb b/Contabilidad/RepFlujoEfectivo.aspx.vb new file mode 100644 index 000000000..eaa2fd164 --- /dev/null +++ b/Contabilidad/RepFlujoEfectivo.aspx.vb @@ -0,0 +1,178 @@ +Option Explicit On +Option Strict On + +Imports System.Data +Imports Extensiones +Imports Microsoft.Reporting.WebForms +Imports System.IO +Imports iTextSharp.text +Imports iTextSharp.text.html.simpleparser +Imports iTextSharp.text.pdf + +Partial Class Contabilidad_RepFlujoEfectivo + Inherits ClsPaginas + +#Region "PROPIEDADES" + Private Property DtDatos As DataTable + Get + DtDatos = DirectCast(ViewState("DtDatos"), DataTable) + End Get + + Set(ByVal value As DataTable) + ViewState("DtDatos") = value + End Set + End Property + Private Property TotalActual As Double + Get + TotalActual = ViewState("TotalActual").ToString.ToDouble + End Get + Set(value As Double) + ViewState("TotalActual") = value + End Set + End Property + Private Property TotalAnterior As Double + Get + TotalAnterior = ViewState("TotalAnterior").ToString.ToDouble + End Get + Set(value As Double) + ViewState("TotalAnterior") = value + End Set + End Property + + Private Property FechaAl As String + Get + FechaAl = ViewState("FechaAl").ToString + End Get + Set(value As String) + ViewState("FechaAl") = value + End Set + End Property +#End Region + + Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load + If Not Page.IsPostBack Then + + + 'TxtFechaDel.Text = DateSerial(Year(Now), Month(Now), 1).ToShortDateString + TxtFechaAl.Text = Date.Now.ToShortDateString + + CargaDatos() + + BtnConsultar.Enabled = True + + End If + + End Sub + +#Region "CARGA DATOS Y GRID" + Private Sub CargaDatos() + Dim ObjConta As New ClsContabilidad + + 'Dim FechaInicio = If(TxtFechaDel.Text = "" Or TxtFechaDel.Text = "__/__/____", Date.Now, TxtFechaDel.Text.ToDate) + Dim FechaFin = If(TxtFechaAl.Text = "" Or TxtFechaAl.Text = "__/__/____", Date.Now, TxtFechaAl.Text.ToDate) + + FechaAl = TxtFechaAl.Text + + If ObjConta.GetFlujoEfectivo2(FechaFin, DdlTipo.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then + DtDatos = ObjConta.DtResultados + Else + DtDatos = Nothing + Alert("Ocurrio un error al cargar los datos del Estado de Flujo de Efectivo", TipoMensaje.MsgError) + End If + + ObjConta.Dispose() + + GvDatos.DataSource = DtDatos + GvDatos.DataBind() + UpDatos.Update() + + End Sub + +#End Region + + Protected Sub BtnConsultar_Click(sender As Object, e As EventArgs) + CargaDatos() + End Sub + + + Protected Sub GvDatos_RowDataBound(sender As Object, e As GridViewRowEventArgs) + If e.Row.RowType = DataControlRowType.DataRow Then + + 'PARA PONER AÑO EN HEADER + If e.Row.RowIndex = 0 Then + GvDatos.HeaderRow.FCLabel("LbPeriodoActual").Text = e.Row.DBCampo("Actual") + GvDatos.HeaderRow.FCLabel("LbPeriodoAnterior").Text = e.Row.DBCampo("Anterior") + End If + + 'TITULO DE BLOQUE (CABECERAS Y TOTALES) + If e.Row.DBCampo("Level") = "-1" Then + CType(e.Row.FindControl("Concepto"), HtmlControl).Attributes.Add("style", "margin-top:20px; ") + e.Row.Font.Bold = True + + 'CABCERA + If e.Row.DBCampo("Id") = "12" Then + e.Row.FCLabel("LbActual").Text = "" + e.Row.FCLabel("LbAnterior").Text = "" + End If + + 'TOTAL OPERACIONES + If e.Row.DBCampo("Id") = "123" Then + e.Row.FCLabel("LbActual").Text = TotalActual.ToString.FormatoNumero + e.Row.FCLabel("LbAnterior").Text = TotalAnterior.ToString.FormatoNumero + End If + + End If + + 'ORIGEN Y APLICACION + If e.Row.DBCampo("Level") = "0" Then + CType(e.Row.FindControl("Concepto"), HtmlControl).Attributes.Add("style", "margin-left:30px; margin-top:15px") + e.Row.Font.Bold = True + End If + + 'PAPAS + If e.Row.DBCampo("Level") = "2" Then + CType(e.Row.FindControl("Concepto"), HtmlControl).Attributes.Add("style", "margin-left: 60px; margin-top:5px;") + End If + + 'HIJOS + If e.Row.DBCampo("Level") = "3" Then + CType(e.Row.FindControl("Concepto"), HtmlControl).Attributes.Add("style", "margin-left:90px;") + End If + + 'INGRESOS -> ORIGEN + If e.Row.DBCampo("Codigo").ToString.Substring(0, 5) = "00004" Then e.Row.FCLiteral("LtNombre").Text = "ORIGEN" + + 'GASTOS -> APLICACION + If e.Row.DBCampo("Codigo").ToString.Substring(0, 5) = "00005" Then e.Row.FCLiteral("LtNombre").Text = "APLICACION" + + + + 'ACTIVIDADES DE OPERACION + If e.Row.DBCampo("Sup").ToString <> "" Then + If e.Row.DBCampo("ImporteAnterior").ToString.ToDecimal = 0 Then + e.Row.FCLabel("LbAnterior").Text = "" + End If + If e.Row.DBCampo("ImporteActual").ToString.ToDecimal = 0 Then + e.Row.FCLabel("LbActual").Text = "" + End If + End If + + + End If + End Sub + + + Public Overrides Sub VerifyRenderingInServerForm(control As Control) + + End Sub + + + + Protected Sub ImgExcel_Click(sender As Object, e As EventArgs) Handles ImgExcel.Click + + GvDatos.ExportToExcel2("RepFlujosDeEfectivo.xlsx") + End Sub + + + +End Class diff --git a/Empresas/119/Formatos/OC.rdlc b/Empresas/119/Formatos/OC.rdlc index 1d461c99b..642a0e720 100644 --- a/Empresas/119/Formatos/OC.rdlc +++ b/Empresas/119/Formatos/OC.rdlc @@ -410,26 +410,6 @@ LightGrey - - LightGrey - - 1pt - - - LightGrey - - 1pt - - - LightGrey - - 1pt - - - LightGrey - - 1pt - 2pt 2pt 1pt @@ -612,6 +592,7 @@ @@ -631,6 +612,7 @@ 1pt + true @@ -2072,11 +2054,391 @@ 2pt + + true + + + + + ="Total " & Parameters!Moneda.Value + + + + + + + Textbox20 + 7.3465cm + 16.7985cm + 0.45183cm + 1.8653cm + 28 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + SubTotal + + + + + + + Textbox20 + 5.54915cm + 16.7985cm + 0.42361cm + 1.8653cm + 29 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!Total.Value + + + + + + + Textbox20 + 7.3465cm + 18.6638cm + 0.45183cm + 1.80228cm + 30 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!SubTotal.Value + + + + + + + Textbox20 + 5.54915cm + 18.6638cm + 0.42361cm + 1.7992cm + 31 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + IVA + + + + + + + Textbox20 + 6.90659cm + 16.7985cm + 0.45183cm + 1.8653cm + 32 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!IVA.Value + + + + + + + Textbox20 + 6.90659cm + 18.6638cm + 0.45183cm + 1.80228cm + 33 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + Descuento + + + + + + + Textbox20 + 6.00293cm + 16.7985cm + 0.45183cm + 1.8653cm + 34 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!Descuento.Value + + + + + + + Textbox20 + 6.00293cm + 18.6638cm + 0.45183cm + 1.80228cm + 35 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + Sub Total 2 + + + + + + + Textbox20 + 6.45476cm + 16.7985cm + 0.45183cm + 1.8653cm + 36 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!SubTotal2.Value + + + + + + + Textbox20 + 6.45476cm + 18.6638cm + 0.45183cm + 1.80228cm + 37 + + =IIF(Parameters!TipoProveedor.Value = "1",true,false) + + + + 2pt + 2pt + 2pt + 2pt + + 4.17138in - 4.67366cm + 4.11804cm true true @@ -1886,50 +1886,6 @@ - - true - true - - - - - Fecha Impresión: - - - - - - - - =Today - - - - - - 2pt - 2pt - 2pt - 2pt - - + + + + true + true + + + + + =Parameters!NombreEntrego.Value + + + + Textbox21 + 1.75355cm + 2.54796cm + 0.63472cm + 5.79375cm + + =iif(Parameters!CveConcepto.Value = 9,true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!NombreAccion.Value + + + + Textbox21 + 1.75355cm + 11.26277cm + 0.63528cm + 5.78664cm + 1 + + =iif(Parameters!CveConcepto.Value = 9,true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + ___________________________ + + + + + + Firma + + + + Textbox21 + 3.70652cm + 2.55591cm + 1.2cm + 5.78664cm + 2 + + =iif(Parameters!CveConcepto.Value = 9,true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + ___________________________ + + + + + + Nombre y Firma + + + + Textbox21 + 3.70653cm + 11.26987cm + 1.2cm + 5.78664cm + 3 + + =iif(Parameters!CveConcepto.Value = 9,true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + OBSERVACIONES: + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Observaciones.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + 1.25938cm + 0.01422cm + 0cm + 19.56892cm + 6 + + + + + + true + true + + + + + ENTREGA + + + + + + + Textbox22 + 1.29466cm + 2.55591cm + 0.6cm + 5.78664cm + 7 + + =iif(Parameters!CveConcepto.Value = 9,true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Accion.Value + + + + + + + Textbox22 + 1.25938cm + 11.26987cm + 0.6cm + 5.78664cm + 8 + + =iif(Parameters!CveConcepto.Value = 9,true,false) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =IIF(Parameters!NombreAccion.Value="-1","",Parameters!NombreAccion.Value) + + + + Textbox21 + 1.75299cm + 6.89827cm + 0.63528cm + 5.78664cm + 9 + + =iif(Parameters!CveConcepto.Value = 8, True, False) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + ___________________________ + + + + + + Nombre y Firma + + + + Textbox21 + 3.70597cm + 6.90537cm + 1.2cm + 5.78664cm + 10 + + =iif(Parameters!CveConcepto.Value = 8, True, False) + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Accion.Value + + + + + + + Textbox22 + 1.25882cm + 6.90537cm + 0.6cm + 5.78664cm + 11 + + =iif(Parameters!CveConcepto.Value = 8, True, False) + + + + 2pt + 2pt + 2pt + 2pt + + + + 0.05938cm + 0cm + 19.56892cm + 12 + + + + + + true + 1.66302cm + 4.90653cm + 19.5894cm + 3 + + =iif(Code.PageNumber() = Code.TotalPages(),False,True) + + + + + - 0.72418in + 2.58644in - 6.45758cm + 0.41981cm true true - - true - true - - - - - =Parameters!NombreEntrego.Value - - - - Textbox21 - 1.87056cm - 2.54cm - 0.63472cm - 5.79375cm - - =iif(Parameters!CveConcepto.Value = 9,true,false) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!NombreAccion.Value - - - - Textbox21 - 1.87056cm - 11.25481cm - 0.63528cm - 5.78664cm - 1 - - =iif(Parameters!CveConcepto.Value = 9,true,false) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - ___________________________ - - - - - - Firma - - - - Textbox21 - 3.82353cm - 2.54795cm - 1.2cm - 5.78664cm - 2 - - =iif(Parameters!CveConcepto.Value = 9,true,false) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - ___________________________ - - - - - - Nombre y Firma - - - - Textbox21 - 3.82354cm - 11.26191cm - 1.2cm - 5.78664cm - 3 - - =iif(Parameters!CveConcepto.Value = 9,true,false) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - OBSERVACIONES: - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Observaciones.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - 1.37639cm - 0.00626cm - 0cm - 19.57518cm - 6 - - - - - - 0.17639cm - 0cm - 19.57518cm - 7 - - - - - - true - true - - - - - ENTREGA - - - - - - - Textbox22 - 1.41167cm - 2.54795cm - 0.6cm - 5.78664cm - 8 - - =iif(Parameters!CveConcepto.Value = 9,true,false) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Accion.Value - - - - - - - Textbox22 - 1.37639cm - 11.26191cm - 0.6cm - 5.78664cm - 9 - - =iif(Parameters!CveConcepto.Value = 9,true,false) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =IIF(Parameters!NombreAccion.Value="-1","",Parameters!NombreAccion.Value) - - - - Textbox21 - 1.87cm - 6.89031cm - 0.63528cm - 5.78664cm - 10 - - =iif(Parameters!CveConcepto.Value = 8, True, False) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - ___________________________ - - - - - - Nombre y Firma - - - - Textbox21 - 3.82298cm - 6.89741cm - 1.2cm - 5.78664cm - 11 - - =iif(Parameters!CveConcepto.Value = 8, True, False) - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Accion.Value - - - - - - - Textbox22 - 1.37583cm - 6.89741cm - 0.6cm - 5.78664cm - 12 - - =iif(Parameters!CveConcepto.Value = 8, True, False) - - - - 2pt - 2pt - 2pt - 2pt - - true true @@ -1531,11 +1549,10 @@ Textbox29 - 5.90548cm - 0.00711cm + 0cm + 0.00085cm 0.41981cm 5.78083cm - 13 @@ -1571,11 +1588,11 @@ Textbox31 - 5.90548cm - 7.42772cm + 0cm + 7.42146cm 0.41981cm 6.04844cm - 14 + 1 @@ -1606,11 +1623,11 @@ Textbox35 - 5.90548cm - 17.07518cm + 0cm + 17.06892cm 0.41981cm 2.5cm - 15 + 2 @@ -1622,11 +1639,11 @@ - 5.70264cm - 0.00313cm + 0cm + 0.11295cm 0cm 19.57518cm - 16 + 3 @@ -1857,6 +1874,19 @@ ReportParameter1 + +Public Function PageNumber() as String + Dim str as String + str = Me.Report.Globals!PageNumber.ToString() + Return str +End Function + + +Public Function TotalPages() as String + Dim str as String + str = Me.Report.Globals!TotalPages.ToString() + Return str +End Function image/png @@ -1878,6 +1908,7 @@ PdfBx35OOIxsxc6bfmde0CPzpyKS8dh4WriXz1kK+mrfkx5wjKYmr53cT81GrmbvY+MW/p7yzWQS0c7f 0Qc+q/1isPX7YhG7F22JAj9dtfMW2AwiwC6v+2B/S6lKMFY4ZWVRGQIr2yl0ydYoFLi5ES4BN+9/ezwyKWbvP8YtBMZLVk848Oati0RqgF3AGga+49h9+kgAB6b5IllUoNAb2fpaTwvacDAOSK3aFXM+6j2yLDIpZA8XFHvQ/5H1tJBRE4PefmfSFdIDjq/fi1buiu16PmLZliN3DK38HnAv3nIDPoj+CUI7Z83VkS6+4EP+Z15UVHWe0uGdfbn1yJ3yim/1l299WL0ndsmWKMSZ+RuuLd9+A4EImotKuH9UwkeD3KDNINWoBANH9/icfsYXdc7Y3nyULNocNdKFJGAnQp+2PSTO9dx9+3ock96gnzYejMeTIMsEUV22PRp3QZm3/joIBnV8yeGAJCRRNm7BnntiOi2I7iQ94NgnaWpq478ktQC9aK+G/7CAM9Bq+GPBc6IwP7oTJJq9acVg4vj/WX7jODjyG8fBkd84Do78xnFw5DeOgyO/cRwc+Y3jYMjXr/8L8NSH3fYwrbUAAAAASUVORK5CYII= + true Cm 859971a9-970d-45f5-be4a-0f05a1eb9a33 \ No newline at end of file diff --git a/Inventarios/EntradasSalidas.aspx.vb b/Inventarios/EntradasSalidas.aspx.vb index 9cdc4a770..3325d6163 100644 --- a/Inventarios/EntradasSalidas.aspx.vb +++ b/Inventarios/EntradasSalidas.aspx.vb @@ -294,6 +294,10 @@ Partial Class Inventarios_EntradasSalidas Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not IsPostBack Then + + + + If UsuarioActual.CveUsuario = 100 AndAlso IfNull(Request("Regenera"), "").ToString = "1" Then RegeneraRM(Request("CveMovimiento").ToString.ToEntero, 119) Exit Sub diff --git a/RH/Personal.aspx b/RH/Personal.aspx index dde132e59..4e3846eb0 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -858,7 +858,7 @@
    -
    +
    @@ -870,7 +870,8 @@ - + <%----%> +
    diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index 8d4e00bb5..45ad4afb3 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -951,6 +951,14 @@ Partial Class RH_Personal DivSuperiorInmediato.Visible = False End If + + + If UsuarioActual.CveEmpresa = 7 Then + DivSuperiorInmediato.Visible = True + DVSupervisorAsignado.Visible = False + End If + + '09/05/2018 - Si el Personal tiene consumos, muestra boton para generar reporte If DTConsumos IsNot Nothing Then If DTConsumos.Rows.Count > 0 Then @@ -1391,7 +1399,7 @@ Partial Class RH_Personal Private Sub CargaOutSourcing() If UsuarioActual.CveEmpresa = 7 Then - DdlEmpresaAsignada.DataSource = GlobalDTEmpresas.FiltraParametros("CveEmpresa in (7,11,12,122,145)") + DdlEmpresaAsignada.DataSource = GlobalDTEmpresas.FiltraParametros("CveEmpresa in (7,11,12,122,145,113)") DdlEmpresaAsignada.DataBind() DvOutsourcing.Visible = True End If diff --git a/Ventas/RepProductosServicios.aspx b/Ventas/RepProductosServicios.aspx index 0e07b8f0d..bf5486a98 100644 --- a/Ventas/RepProductosServicios.aspx +++ b/Ventas/RepProductosServicios.aspx @@ -508,6 +508,7 @@ +
    diff --git a/Ventas/RepProductosServicios.aspx.vb b/Ventas/RepProductosServicios.aspx.vb index b16140dd0..15738fd9a 100644 --- a/Ventas/RepProductosServicios.aspx.vb +++ b/Ventas/RepProductosServicios.aspx.vb @@ -675,6 +675,8 @@ Partial Class Ventas_RepProductosServicios Row("Valor") = Dr("SubTotal").ToString.FormatoNumero Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero + Case 4 + Row("Valor") = Dr("Cantidad").ToString.FormatoNumero End Select Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString Row("Moneda") = Dr("Moneda").ToString