diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 64ee112a5..ae2a6e5ca 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -435,7 +435,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If DirectCast(Application(AppNombre), DataTable) Is Nothing Then
Dim P As New ClsCompProveedores
- If P.GetProveedorClasificacion(UsuarioActual.CveEmpresa) Then Application(AppNombre) = P.DtResultados
+ If P.GetProveedorClasificacion(CveEmpresa) Then Application(AppNombre) = P.DtResultados
P.Dispose()
End If
@@ -449,8 +449,9 @@ Public Class ClsPaginas
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTProveedorClasificacion{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTProveedorClasificacion{0}", CveEmpresa)
+ Application(AppNombre) = value
+
End Set
End Property
Property GlobalDTProveedorSucursales(CveProveedor As Integer, CveEmpresa As Integer) As DataTable
@@ -459,7 +460,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If DirectCast(Application(AppNombre), DataTable) Is Nothing Then
Dim P As New ClsCompProveedores
- If P.GetSucursales(-1, UsuarioActual.CveEmpresa) Then Application(AppNombre) = P.DtResultados
+ If P.GetSucursales(-1, CveEmpresa) Then Application(AppNombre) = P.DtResultados
P.Dispose()
End If
@@ -473,8 +474,9 @@ Public Class ClsPaginas
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTProveedorSucursales{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTProveedorSucursales{0}", CveEmpresa)
+ Application(AppNombre) = value
+
End Set
End Property
Property GlobalDTRoles(CveEmpresa As Integer) As DataTable
@@ -755,37 +757,36 @@ Public Class ClsPaginas
Application("GlobalDTSATUsosCFDI") = value
End Set
End Property
- Public Shared Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
+ Public Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTUnidadesMedida{0}", CveEmpresa)
'sino existe, recarga los datos
- If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Or (DirectCast(HttpContext.Current.Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(HttpContext.Current.Application(AppNombre), DataTable).Rows.Count = 0) Then
+ If DirectCast(Application(AppNombre), DataTable) Is Nothing Or (DirectCast(Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(Application(AppNombre), DataTable).Rows.Count = 0) Then
Dim ObjUnidadesMedida As New ClsUnidadesMedida()
- If ObjUnidadesMedida.GetUnidadesMedida(CveEmpresa) Then HttpContext.Current.Application(AppNombre) = ObjUnidadesMedida.DtResultados Else HttpContext.Current.Application(AppNombre) = Nothing
- 'If ObjUnidadesMedida.GetUnidadesMedidaAlias() Then Application("GlobalDTUnidadesMedidaAlias") = ObjUnidadesMedida.DtResultados Else Application("GlobalDTUnidadesMedidaAlias") = Nothing
+ If ObjUnidadesMedida.GetUnidadesMedida(CveEmpresa) Then Application(AppNombre) = ObjUnidadesMedida.DtResultados
ObjUnidadesMedida.Dispose()
End If
If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
+ Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
GlobalDTUnidadesMedida = Dv.ToTable
Dv.Dispose()
Else
- GlobalDTUnidadesMedida = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ GlobalDTUnidadesMedida = DirectCast(Application(AppNombre), DataTable)
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTUnidadesMedida{0}", CveEmpresa)
- HttpContext.Current.Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTUnidadesMedida{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
Property GlobalDTUnidadesMedidaAlias(Optional CveEmpresa As Integer = -1) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTUnidadesMedidaAlias{0}", CveEmpresa)
'sino existe, recarga los datos
- If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Or (DirectCast(HttpContext.Current.Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(HttpContext.Current.Application(AppNombre), DataTable).Rows.Count = 0) Then
+ If DirectCast(Application(AppNombre), DataTable) Is Nothing Or (DirectCast(Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(Application(AppNombre), DataTable).Rows.Count = 0) Then
Dim ObjUnidadesMedida As New ClsUnidadesMedida()
- If ObjUnidadesMedida.GetUnidadesMedidaAlias(CveEmpresa, -1) Then Application(AppNombre) = ObjUnidadesMedida.DtResultados Else Application(AppNombre) = Nothing
+ If ObjUnidadesMedida.GetUnidadesMedidaAlias(CveEmpresa, -1) Then Application(AppNombre) = ObjUnidadesMedida.DtResultados
ObjUnidadesMedida.Dispose()
End If
If CveEmpresa <> -1 Then
@@ -797,8 +798,11 @@ Public Class ClsPaginas
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTUnidadesMedidaAlias{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTUnidadesMedidaAlias{0}", CveEmpresa)
+ Application(AppNombre) = value
+ 'Dim ObjUnidadesMedida As New ClsUnidadesMedida()
+ 'If ObjUnidadesMedida.GetUnidadesMedidaAlias(CveEmpresa, -1) Then Application(AppNombre) = ObjUnidadesMedida.DtResultados
+ 'ObjUnidadesMedida.Dispose()
End Set
End Property
Property GlobalDTEstatusOrdenCompra() As DataTable
@@ -879,20 +883,18 @@ Public Class ClsPaginas
Application("GlobalDTProyectos") = value
End Set
End Property
- Public Shared Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
+ Public Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTSubProyectos{0}", CveEmpresa)
'sino existe, recarga los datos
- If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Or (DirectCast(HttpContext.Current.Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(HttpContext.Current.Application(AppNombre), DataTable).Rows.Count = 0) Then
+ If DirectCast(Application(AppNombre), DataTable) Is Nothing Or (DirectCast(Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(Application(AppNombre), DataTable).Rows.Count = 0) Then
Dim P As New ClsSubProyectos
- If P.GetSubProyectos(CveEmpresa:=CveEmpresa) Then
- HttpContext.Current.Application(AppNombre) = P.DtResultados
- End If
+ If P.GetSubProyectos(CveEmpresa:=CveEmpresa) Then Application(AppNombre) = P.DtResultados
P.Dispose()
Dim msg As String = "aqui no se carga subproyectos"
- If HttpContext.Current.Request IsNot Nothing Then
- msg = msg & HttpContext.Current.Request.ServerVariables("URL")
+ If Request IsNot Nothing Then
+ msg = msg & Request.ServerVariables("URL")
End If
msg.GuardaLog()
@@ -905,26 +907,18 @@ Public Class ClsPaginas
If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
GlobalDTSubProyectos = Dv.ToTable
Dv.Dispose()
Else
- GlobalDTSubProyectos = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ GlobalDTSubProyectos = DirectCast(Application(AppNombre), DataTable)
End If
End Get
Set(ByVal value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTSubProyectos{0}", CveEmpresa)
- If value Is Nothing OrElse value.Rows.Count = 0 Then
- Dim msg As String = "aqui no se carga subproyectos"
- If HttpContext.Current.Request IsNot Nothing Then
- msg = msg & HttpContext.Current.Request.ServerVariables("URL")
- End If
- msg.GuardaLog()
-
- End If
- HttpContext.Current.Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTSubProyectos{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
Property GlobalDTSubProyectosUsuarios(CveUsuario As Integer, CveProyecto As Integer, CveEmpresa As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEstatus As Integer = -1) As DataTable
@@ -1179,20 +1173,20 @@ Public Class ClsPaginas
ObjPS.Dispose()
End Get
End Property
- Public Shared Property GlobalDTPSSimplificado(CveEmpresa As Integer, Optional CveClasificacion As Integer = -1, Optional PSCodigo As String = "-1", Optional Estatus As Integer = 1, Optional AplicaParaVenta As Integer = -1) As DataTable
+ Public Property GlobalDTPSSimplificado(CveEmpresa As Integer, Optional CveClasificacion As Integer = -1, Optional PSCodigo As String = "-1", Optional Estatus As Integer = 1, Optional AplicaParaVenta As Integer = -1) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTPSSimplificado{0}", CveEmpresa)
If CveEmpresa <> -1 Then
'sino existe, recarga los datos
- If HttpContext.Current.Application(AppNombre) Is Nothing Then
+ If Application(AppNombre) Is Nothing Then
Dim ObjPS As New ClsProductosServicios
- If ObjPS.GetPSSimplificado(-1) Then HttpContext.Current.Application(AppNombre) = ObjPS.DtResultados.AsEnumerable() Else HttpContext.Current.Application("GlobalDTPSSimplificado") = Nothing
+ If ObjPS.GetPSSimplificado(CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados.AsEnumerable()
ObjPS.Dispose()
End If
- Dim Cons = DirectCast(HttpContext.Current.Application(AppNombre), EnumerableRowCollection(Of DataRow))
+ Dim Cons = DirectCast(Application(AppNombre), EnumerableRowCollection(Of DataRow))
Cons = Cons.Where((Function(a) Convert.ToInt32(a!CveEmpresa) = CveEmpresa))
If CveClasificacion >= 0 Then Cons = Cons.Where((Function(a) Convert.ToInt32(a!CveClasificacion) = CveClasificacion))
@@ -1207,12 +1201,12 @@ Public Class ClsPaginas
End Try
Else
- GlobalDTPSSimplificado = DirectCast(HttpContext.Current.Application(AppNombre), EnumerableRowCollection(Of DataRow)).CopyToDataTable
+ GlobalDTPSSimplificado = DirectCast(Application(AppNombre), EnumerableRowCollection(Of DataRow)).CopyToDataTable
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTPSSimplificado{0}", CveEmpresa)
- HttpContext.Current.Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTPSSimplificado{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
Property GlobalDTProductosServiciosAlias(CveEmpresa As Integer, Optional Estatus As Integer = 1) As DataTable
@@ -1221,9 +1215,8 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjPS As New ClsProductosServicios
- If ObjPS.GetPSAlias(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados Else Application(AppNombre) = Nothing
+ If ObjPS.GetPSAlias(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados
ObjPS.Dispose()
-
End If
@@ -1241,20 +1234,19 @@ Public Class ClsPaginas
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTProductosServiciosAlias{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTProductosServiciosAlias{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
- Public Shared Property GlobalDTProductosServiciosEquivalencias(CvePS As Integer, CveUM As Integer, CveEmpresa As Integer) As DataTable
+ Public Property GlobalDTProductosServiciosEquivalencias(CvePS As Integer, CveUM As Integer, CveEmpresa As Integer) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTProductosServiciosEquivalencias{0}", CveEmpresa)
If CveEmpresa <> -1 Then
'sino existe, recarga los datos
- If HttpContext.Current.Application(AppNombre) Is Nothing Then
+ If Application(AppNombre) Is Nothing Then
Dim ObjPS As New ClsProductosServicios
- If ObjPS.GetPSEquivalencias(-1, CveEmpresa) Then HttpContext.Current.Application(AppNombre) = ObjPS.DtResultados Else HttpContext.Current.Application(AppNombre) = Nothing
- ObjPS.Dispose()
-
+ If ObjPS.GetPSEquivalencias(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados
+ ObjPS.Dispose()
End If
End If
@@ -1264,16 +1256,17 @@ Public Class ClsPaginas
If CveUM <> -1 Then StrSQL.AppendFormat(" AND CveUM = {0}", CveUM)
If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
GlobalDTProductosServiciosEquivalencias = Dv.ToTable
Dv.Dispose()
Else
- GlobalDTProductosServiciosEquivalencias = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ GlobalDTProductosServiciosEquivalencias = DirectCast(Application(AppNombre), DataTable)
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTProductosServiciosEquivalencias{0}", CveEmpresa)
- HttpContext.Current.Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTProductosServiciosEquivalencias{0}", CveEmpresa)
+ Application(AppNombre) = value
+
End Set
End Property
Property GlobalDTProductosServiciosCaracteristicas(CveEmpresa As Integer) As DataTable
@@ -1299,7 +1292,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjPS As New ClsProductosServicios
- If ObjPS.GetPSAdicionales(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados Else Application(AppNombre) = Nothing
+ If ObjPS.GetPSAdicionales(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados
ObjPS.Dispose()
End If
@@ -1317,8 +1310,9 @@ Public Class ClsPaginas
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTPSAdicionales{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTPSAdicionales{0}", CveEmpresa)
+ Application(AppNombre) = value
+
End Set
End Property
Property GlobalDTProductosServiciosCaracteristicasOpciones(CveEmpresa As Integer) As DataTable
@@ -1374,7 +1368,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjPS As New ClsProductosServicios
- If ObjPS.GetPSImpuestosLocales(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados Else Application(AppNombre) = Nothing
+ If ObjPS.GetPSImpuestosLocales(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados
ObjPS.Dispose()
End If
@@ -1391,8 +1385,11 @@ Public Class ClsPaginas
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTImpuestosLocales{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTImpuestosLocales{0}", CveEmpresa)
+ Application(AppNombre) = value
+ 'Dim ObjPS As New ClsProductosServicios
+ 'If ObjPS.GetPSImpuestosLocales(-1, CveEmpresa) Then Application(AppNombre) = ObjPS.DtResultados
+ 'ObjPS.Dispose()
End Set
End Property
'Bancos
@@ -1516,7 +1513,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjClientes As New ClsClientes
- If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa, Estatus:=-1) Then Application(AppNombre) = ObjClientes.DtResultados Else Application(AppNombre) = Nothing
+ If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then Application(AppNombre) = ObjClientes.DtResultados
ObjClientes.Dispose()
End If
@@ -1536,8 +1533,8 @@ Public Class ClsPaginas
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
Property GlobalDTClienteClasificaciones(CveEmpresa As Integer) As DataTable
@@ -1546,7 +1543,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjClientes As New ClsClientes
- If ObjClientes.GetClienteClasificacion(UsuarioActual.CveEmpresa) Then Application(AppNombre) = ObjClientes.DtResultados Else Application(AppNombre) = Nothing
+ If ObjClientes.GetClienteClasificacion(CveEmpresa) Then Application(AppNombre) = ObjClientes.DtResultados
ObjClientes.Dispose()
End If
If CveEmpresa <> -1 Then
@@ -1559,8 +1556,8 @@ Public Class ClsPaginas
End If
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTClienteClasificaciones{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTClienteClasificaciones{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
Property GlobalDTEstatusOrdenServicios(CveEmpresa As Integer) As DataTable
@@ -1580,16 +1577,24 @@ Public Class ClsPaginas
'Variables para Ventas
Property GlobalDTVendedores(CveEmpresa As Integer, Optional Estatus As Boolean = True, Optional VendedorTipo As Integer = 1) As DataTable
Get
+ Dim AppNombre As String = String.Format("GlobalDTVendedores{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If Application(AppNombre) Is Nothing Then
+ Dim ObjVendedores As New ClsVtaVendedores
+ If ObjVendedores.GetVendedores(-1) Then Application(AppNombre) = ObjVendedores.DtResultados
+ ObjVendedores.Dispose()
+ End If
If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(Application("GlobalDTVendedores"), DataTable), String.Format("CveEmpresa = {0} AND CveEstatus = {1} AND VendedorTipo = {2}", CveEmpresa, If(Estatus, 1, 0), VendedorTipo), "", DataViewRowState.CurrentRows)
+ Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), String.Format("CveEmpresa = {0} AND CveEstatus = {1} AND VendedorTipo = {2}", CveEmpresa, If(Estatus, 1, 0), VendedorTipo), "", DataViewRowState.CurrentRows)
GlobalDTVendedores = Dv.ToTable
Dv.Dispose()
Else
- GlobalDTVendedores = DirectCast(Application("GlobalDTVendedores"), DataTable)
+ GlobalDTVendedores = DirectCast(Application(AppNombre), DataTable)
End If
End Get
Set(value As DataTable)
- Application("GlobalDTVendedores") = value
+ Dim AppNombre As String = String.Format("GlobalDTVendedores{0}", CveEmpresa)
+ Application(AppNombre) = value
End Set
End Property
Property GlobalDTClientesCorporativo(CveEmpresa As Integer) As DataTable
@@ -1612,7 +1617,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjProveedores As New ClsCompProveedores
- If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa) Then Application(AppNombre) = ObjProveedores.DtResultados Else Application(AppNombre) = Nothing
+ If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa) Then Application(AppNombre) = ObjProveedores.DtResultados
ObjProveedores.Dispose()
End If
@@ -1626,8 +1631,11 @@ Public Class ClsPaginas
End Get
Set(value As DataTable)
- Dim AppNombre As String = String.Format("GlobalDTCompProveedores{0}", CveEmpresa)
- Application(AppNombre) = value
+ Dim AppNombre As String = String.Format("GlobalDTCompProveedores{0}", CveEmpresa)
+ Application(AppNombre) = value
+ 'Dim ObjProveedores As New ClsCompProveedores
+ 'If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa) Then Application(AppNombre) = ObjProveedores.DtResultados
+ 'ObjProveedores.Dispose()
End Set
End Property
'EstatusFactura
@@ -3228,7 +3236,36 @@ Public Class ClsPaginas
Set(value As DataTable)
Application("GlobalDTAcumTiposUso") = value
End Set
- End Property
+ End Property
+
+ Property GlobalDTAcumGarantiasMesesTipoUso(CveEmpresa As Integer, CveMarca As Integer) As DataTable
+ Get
+ Dim AppNombre As String = String.Format("GlobalDTAcumGarantiasMesesTipoUso{0}", CveEmpresa)
+ If Application(AppNombre) Is Nothing Then
+ Dim ObjAcumuladores As New ClsAcumuladores()
+ If ObjAcumuladores.GarantiasMesesGet(-1, -1) Then Application(AppNombre) = ObjAcumuladores.DtResultados.FiltraParametros("", DistinctColumns:={"CveMarca", "CveTipoUso", "TipoUso"})
+ ObjAcumuladores.Dispose()
+ End If
+
+ If CveMarca <> -1 Then
+ Dim Str As StringBuilder = New StringBuilder()
+ If CveMarca <> -1 Then Str.AppendFormat("CveMarca = {0}", CveMarca)
+
+ Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), Str.ToString, "", DataViewRowState.CurrentRows)
+ GlobalDTAcumGarantiasMesesTipoUso = Dv.ToTable
+ Dv.Dispose()
+ Else
+ GlobalDTAcumGarantiasMesesTipoUso = DirectCast(Application(AppNombre), DataTable)
+ End If
+
+ End Get
+ Set(value As DataTable)
+ Dim AppNombre As String = String.Format("GlobalDTAcumGarantiasMesesTipoUso{0}", CveEmpresa)
+ Application(AppNombre) = value
+ End Set
+ End Property
+
+
Property GlobalDTAcumTamaños() As DataTable
Get
GlobalDTAcumTamaños = DirectCast(Application("GlobalDTAcumTamaños"), DataTable)
diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb
index c5e33a480..52038c7cd 100644
--- a/App_Code/Modelos.vb
+++ b/App_Code/Modelos.vb
@@ -2630,7 +2630,7 @@ Namespace Modelos
importeMovimiento = ((TmpDTDetalle.SUM("TotalImporte", String.Format("CveClasificacion = {0} And CveSubProyecto = {1}", Row2("CveClasificacion"), Row2("CveSubProyecto"))).ToString.ToDecimal) * ValorMultiplicador)
importeMX = importeMovimiento * tipoCambio * Multiplicador
FechaMovimiento = ObjFactura.FechaPago
- Concepto = $"{ObjFactura.SerieFolio} {If(Row2("CveClasificacion").ToString.ToEntero > 0, GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Clasificacion", $"CveClasificacion = {Row2("CveClasificacion").ToString}"), "")} - {If(Row2("CveSubProyecto").ToString.ToEntero > 0, ClsPaginas.GlobalDTSubProyectos(-1, -1, UsuarioActual.CveEmpresa).FiltroPrimeroValor("SubProyecto", $"CveSubProyecto = {Row2("CveSubProyecto").ToString}"), "Sin SubProyecto Asignado")}"
+ Concepto = $"{ObjFactura.SerieFolio} {If(Row2("CveClasificacion").ToString.ToEntero > 0, GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Clasificacion", $"CveClasificacion = {Row2("CveClasificacion").ToString}"), "")} - {If(Row2("CveSubProyecto").ToString.ToEntero > 0, GlobalDTSubProyectos(-1, -1, UsuarioActual.CveEmpresa).FiltroPrimeroValor("SubProyecto", $"CveSubProyecto = {Row2("CveSubProyecto").ToString}"), "Sin SubProyecto Asignado")}"
If tipoCambio > 1 Then Concepto += $" TC:{tipoCambio} ${importeMovimiento.FormatoNumero(2)}"
'Nota cuando es Nota de crédiot, debe de tomar el devoluciones y rebajas
@@ -2705,7 +2705,7 @@ Namespace Modelos
importeMovimiento = ((TmpDTDetalle.SUM("TotalImporte", String.Format("CveClasificacion = {0} And CveSubProyecto = {1}", Row2("CveClasificacion"), Row2("CveSubProyecto"))).ToString.ToDecimal) * ValorMultiplicador)
importeMX = importeMovimiento * tipoCambio * Multiplicador
FechaMovimiento = ObjFactura.FechaPago
- Concepto = $"{ObjFactura.SerieFolio} {If(Row2("CveClasificacion").ToString.ToEntero > 0, GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Clasificacion", $"CveClasificacion = {Row2("CveClasificacion").ToString}"), "")} - {If(Row2("CveSubProyecto").ToString.ToEntero > 0, ClsPaginas.GlobalDTSubProyectos(-1, -1, UsuarioActual.CveEmpresa).FiltroPrimeroValor("SubProyecto", $"CveSubProyecto = {Row2("CveSubProyecto").ToString}"), "Sin SubProyecto Asignado")}"
+ Concepto = $"{ObjFactura.SerieFolio} {If(Row2("CveClasificacion").ToString.ToEntero > 0, GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Clasificacion", $"CveClasificacion = {Row2("CveClasificacion").ToString}"), "")} - {If(Row2("CveSubProyecto").ToString.ToEntero > 0, GlobalDTSubProyectos(-1, -1, UsuarioActual.CveEmpresa).FiltroPrimeroValor("SubProyecto", $"CveSubProyecto = {Row2("CveSubProyecto").ToString}"), "Sin SubProyecto Asignado")}"
If tipoCambio > 1 Then Concepto += $" TC:{tipoCambio} ${importeMovimiento.FormatoNumero(2)}"
'Nota cuando es Nota de crédiot, debe de tomar el devoluciones y rebajas
@@ -3204,7 +3204,7 @@ Namespace Modelos
If UsuarioActual.CveEmpresa = 1 Then
DtEquivalencias = New DataTable
- DtEquivalencias = ClsPaginas.GlobalDTProductosServiciosEquivalencias(CveProducto, -1, UsuarioActual.CveEmpresa)
+ DtEquivalencias = GlobalDTProductosServiciosEquivalencias(CveProducto, -1, UsuarioActual.CveEmpresa)
Dim CveUnidadBase As Integer = DtEquivalencias.FiltroPrimeroValor("CveUM", "UnidadBase = 'True'").ToEntero
Dim drUMBase As DataRow = DtEquivalencias.FiltroPrimero("UnidadBase = 'True'")
@@ -5446,11 +5446,11 @@ Namespace Modelos
Public Sub SetSubProyecto()
If CveSubProyecto > 0 Then
- SubProyecto = New Modelos.SubProyectoModel(ClsPaginas.GlobalDTSubProyectos(-1).FiltroPrimero($"CveSubProyecto = {CveSubProyecto}"))
+ SubProyecto = New Modelos.SubProyectoModel(GlobalDTSubProyectos(-1).FiltroPrimero($"CveSubProyecto = {CveSubProyecto}"))
End If
End Sub
Public Sub SetSubProyectoMatriz()
- Dim Row As Data.DataRow = ClsPaginas.GlobalDTSubProyectos(-1, CveSubProyecto:=-1, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimero("TipoSucursal=1")
+ Dim Row As Data.DataRow = GlobalDTSubProyectos(-1, CveSubProyecto:=-1, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimero("TipoSucursal=1")
If Not IsNothing(Row) Then
SubProyectoMatriz = New Modelos.SubProyectoModel(Row)
End If
@@ -5496,12 +5496,12 @@ Namespace Modelos
End Sub
Public Sub SetSubProyecto(obj As ClsPaginas)
If CveSubProyecto > 0 AndAlso Not IsNothing(obj) Then
- SubProyecto = New Modelos.SubProyectoModel(ClsPaginas.GlobalDTSubProyectos(-1).FiltroPrimero($"CveSubProyecto = {CveSubProyecto}"))
+ SubProyecto = New Modelos.SubProyectoModel(GlobalDTSubProyectos(-1).FiltroPrimero($"CveSubProyecto = {CveSubProyecto}"))
End If
End Sub
Public Sub SetSubProyectoMatriz(obj As ClsPaginas)
If Not IsNothing(obj) Then
- Dim Row As Data.DataRow = ClsPaginas.GlobalDTSubProyectos(-1, CveSubProyecto:=-1, CveEmpresa:=obj.UsuarioActual.CveEmpresa).FiltroPrimero("TipoSucursal=1")
+ Dim Row As Data.DataRow = GlobalDTSubProyectos(-1, CveSubProyecto:=-1, CveEmpresa:=obj.UsuarioActual.CveEmpresa).FiltroPrimero("TipoSucursal=1")
If Not IsNothing(Row) Then
SubProyectoMatriz = New Modelos.SubProyectoModel(Row)
End If
@@ -5937,6 +5937,27 @@ Namespace Modelos
HttpContext.Current.Application("GlobalDTProveedoresCuentas") = value
End Set
End Property
+
+ Public ReadOnly Property GlobalDTProductosServiciosEquivalencias(CvePS As Integer, CveUM As Integer, CveEmpresa As Integer) As DataTable
+ Get
+ Dim AppNombre As String = String.Format("GlobalDTProductosServiciosEquivalencias{0}", CveEmpresa)
+
+
+ If CvePS <> -1 OrElse CveUM <> -1 Then
+ Dim StrSQL As New StringBuilder
+ If CvePS <> -1 Then StrSQL.AppendFormat(" AND CvePS = {0}", CvePS)
+ If CveUM <> -1 Then StrSQL.AppendFormat(" AND CveUM = {0}", CveUM)
+ If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
+
+ Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ GlobalDTProductosServiciosEquivalencias = Dv.ToTable
+ Dv.Dispose()
+ Else
+ GlobalDTProductosServiciosEquivalencias = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ End If
+ End Get
+
+ End Property
Property GlobalDTProveedorClasificacion(CveEmpresa As Integer) As DataTable
Get
If CveEmpresa <> -1 Then
@@ -6245,34 +6266,34 @@ Namespace Modelos
HttpContext.Current.Application("GlobalDTSATUsosCFDI") = value
End Set
End Property
- Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
- Get
- If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
- GlobalDTUnidadesMedida = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTUnidadesMedida = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTUnidadesMedida") = value
- End Set
- End Property
- Property GlobalDTUnidadesMedidaAlias(Optional CveEmpresa As Integer = -1) As DataTable
- Get
- If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
- GlobalDTUnidadesMedidaAlias = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTUnidadesMedidaAlias = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias") = value
- End Set
- End Property
+ 'Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
+ ' Get
+ ' If CveEmpresa <> -1 Then
+ ' Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
+ ' GlobalDTUnidadesMedida = Dv.ToTable
+ ' Dv.Dispose()
+ ' Else
+ ' GlobalDTUnidadesMedida = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable)
+ ' End If
+ ' End Get
+ ' Set(value As DataTable)
+ ' HttpContext.Current.Application("GlobalDTUnidadesMedida") = value
+ ' End Set
+ 'End Property
+ 'Property GlobalDTUnidadesMedidaAlias(Optional CveEmpresa As Integer = -1) As DataTable
+ ' Get
+ ' If CveEmpresa <> -1 Then
+ ' Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
+ ' GlobalDTUnidadesMedidaAlias = Dv.ToTable
+ ' Dv.Dispose()
+ ' Else
+ ' GlobalDTUnidadesMedidaAlias = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable)
+ ' End If
+ ' End Get
+ ' Set(value As DataTable)
+ ' HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias") = value
+ ' End Set
+ 'End Property
Property GlobalDTEstatusOrdenCompra() As DataTable
Get
GlobalDTEstatusOrdenCompra = DirectCast(HttpContext.Current.Application("GlobalDTEstatusOrdenCompra"), DataTable)
@@ -6341,6 +6362,45 @@ Namespace Modelos
End Set
End Property
+ Public Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
+ Get
+ Dim AppNombre As String = String.Format("GlobalDTSubProyectos{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Or (DirectCast(HttpContext.Current.Application(AppNombre), DataTable) IsNot Nothing AndAlso DirectCast(HttpContext.Current.Application(AppNombre), DataTable).Rows.Count = 0) Then
+ Dim P As New ClsSubProyectos
+ If P.GetSubProyectos(CveEmpresa:=CveEmpresa) Then HttpContext.Current.Application(AppNombre) = P.DtResultados
+ P.Dispose()
+
+ Dim msg As String = "aqui no se carga subproyectos"
+ If HttpContext.Current.Request IsNot Nothing Then
+ msg = msg & HttpContext.Current.Request.ServerVariables("URL")
+ End If
+ msg.GuardaLog()
+
+ End If
+
+ If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
+ Dim StrSQL As New StringBuilder
+ If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
+ If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
+ If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
+ If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
+
+ Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ GlobalDTSubProyectos = Dv.ToTable
+ Dv.Dispose()
+
+ Else
+ GlobalDTSubProyectos = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ End If
+
+ End Get
+ Set(ByVal value As DataTable)
+ Dim AppNombre As String = String.Format("GlobalDTSubProyectos{0}", CveEmpresa)
+ HttpContext.Current.Application(AppNombre) = value
+ End Set
+ End Property
+
Property GlobalDTSubProyectosUsuarios(CveUsuario As Integer, CveProyecto As Integer, CveEmpresa As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEstatus As Integer = -1) As DataTable
Get
@@ -6698,51 +6758,64 @@ Namespace Modelos
'Fin Ruta
'Cliente
- Property GlobalDTCliente(CveEmpresa As Integer, Optional Estatus As Integer = 1) As DataTable
- Get
- If CveEmpresa <> -1 Then
-
- Dim StrSQL As New StringBuilder
- StrSQL.AppendFormat("CveEmpresa = {0}", CveEmpresa)
- If Estatus >= 0 Then StrSQL.AppendFormat(" AND EstatusBool = {0} ", Estatus)
-
- If HttpContext.Current.Application("GlobalDTCliente") Is Nothing Then
- Dim ObjClientes As New ClsClientes
- If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1) Then HttpContext.Current.Application("GlobalDTCliente") = ObjClientes.DtResultados Else HttpContext.Current.Application("GlobalDTCliente") = Nothing
- ObjClientes.Dispose()
-
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTCliente"), DataTable), StrSQL.ToString, "", DataViewRowState.CurrentRows)
- GlobalDTCliente = Dv.ToTable
- Dv.Dispose()
-
- Else
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTCliente"), DataTable), StrSQL.ToString, "", DataViewRowState.CurrentRows)
- GlobalDTCliente = Dv.ToTable
- Dv.Dispose()
- End If
-
- Else
- GlobalDTCliente = DirectCast(HttpContext.Current.Application("GlobalDTCliente"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTCliente") = value
- End Set
- End Property
- Property GlobalDTClienteClasificaciones(CveEmpresa As Integer) As DataTable
- Get
- If CveEmpresa <> -1 Then
-
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTClienteClasificaciones"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
- GlobalDTClienteClasificaciones = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTClienteClasificaciones = DirectCast(HttpContext.Current.Application("GlobalDTClienteClasificaciones"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTClasificacionesCliente") = value
- End Set
+ Property GlobalDTCliente(CveEmpresa As Integer, Optional Estatus As Integer = 1) As DataTable
+ Get
+ Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If HttpContext.Current.Application(AppNombre) Is Nothing Then
+ Dim ObjClientes As New ClsClientes
+ If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then HttpContext.Current.Application(AppNombre) = ObjClientes.DtResultados
+ ObjClientes.Dispose()
+ End If
+
+
+ If CveEmpresa <> -1 Then
+
+ Dim StrSQL As New StringBuilder
+ StrSQL.AppendFormat("CveEmpresa = {0}", CveEmpresa)
+ If Estatus >= 0 Then StrSQL.AppendFormat(" AND EstatusBool = {0} ", Estatus)
+
+ Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), StrSQL.ToString, "", DataViewRowState.CurrentRows)
+ GlobalDTCliente = Dv.ToTable
+ Dv.Dispose()
+
+ Else
+ GlobalDTCliente = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ End If
+ End Get
+ Set(value As DataTable)
+ Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
+ HttpContext.Current.Application(AppNombre) = value
+ 'Dim ObjClientes As New ClsClientes
+ 'If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then Application(AppNombre) = ObjClientes.DtResultados
+ 'ObjClientes.Dispose()
+ End Set
+ End Property
+ Property GlobalDTClienteClasificaciones(CveEmpresa As Integer) As DataTable
+ Get
+ Dim AppNombre As String = String.Format("GlobalDTClienteClasificaciones{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If HttpContext.Current.Application(AppNombre) Is Nothing Then
+ Dim ObjClientes As New ClsClientes
+ If ObjClientes.GetClienteClasificacion(CveEmpresa) Then HttpContext.Current.Application(AppNombre) = ObjClientes.DtResultados
+ ObjClientes.Dispose()
+ End If
+ If CveEmpresa <> -1 Then
+
+ Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
+ GlobalDTClienteClasificaciones = Dv.ToTable
+ Dv.Dispose()
+ Else
+ GlobalDTClienteClasificaciones = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
+ End If
+ End Get
+ Set(value As DataTable)
+ Dim AppNombre As String = String.Format("GlobalDTClienteClasificaciones{0}", CveEmpresa)
+ HttpContext.Current.Application(AppNombre) = value
+ 'Dim ObjClientes As New ClsClientes
+ 'If ObjClientes.GetClienteClasificacion(CveEmpresa) Then Application(AppNombre) = ObjClientes.DtResultados
+ 'ObjClientes.Dispose()
+ End Set
End Property
Property GlobalDTEstatusOrdenServicios(CveEmpresa As Integer) As DataTable
Get
diff --git a/App_Code/Timbrado.vb b/App_Code/Timbrado.vb
index dbb113a45..eb476418f 100644
--- a/App_Code/Timbrado.vb
+++ b/App_Code/Timbrado.vb
@@ -356,13 +356,15 @@ Public Class Timbrado
Else
conector.EstableceCredenciales("vSGxMFWnNRy/nDoowxqrqw==|Sia123654")
End If
-
+ MsgCancelacion.AppendFormat("-3.2")
Dim resultadoCancelacion As Profact.TimbraCFDI.ResultadoCancelacionAck
resultadoCancelacion = conector.CancelaCFDIAck(RFCEmisor, FolioFiscal)
CancelacionFecha = Now
Dim resp As Profact.TimbraCFDI.ResultadoConsulta
resp = conector.ObtieneCFDI(RFCEmisor, FolioFiscal)
+ MsgCancelacion.AppendFormat("-3.3")
If resultadoCancelacion.Exitoso Then
+ MsgCancelacion.AppendFormat("-3.4")
CancelacionMensaje = resultadoCancelacion.Descripcion
Dim xmlDoc As New System.Xml.XmlDocument()
@@ -372,20 +374,22 @@ Public Class Timbrado
xmlDoc.LoadXml(resp.Xml)
End Try
-
+ MsgCancelacion.AppendFormat("-3.4.1")
Dim xpath As String = "Acuse/Folios"
Dim nodes = xmlDoc.SelectNodes(xpath)
CancelacionState = xmlDoc.GetElementsByTagName("EstatusUUID")(0).InnerText.ToEntero
-
+ MsgCancelacion.AppendFormat("-3.4.2")
xpath = "Acuse/Signature"
nodes = xmlDoc.SelectNodes(xpath)
-
+ MsgCancelacion.AppendFormat("-3.4.3")
CancelacionAcuse = xmlDoc.GetElementsByTagName("SignatureValue")(0).InnerText
CancelacionFecha = xmlDoc.SelectSingleNode("Acuse").Attributes("Fecha").Value.ToDate
Retorno = True
Else
+ MsgCancelacion.AppendFormat("-3.5")
CancelacionAcuse = resp.NumeroError
+ CancelacionMensaje = resultadoCancelacion.Xml
Retorno = False
End If
diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb
index 1aa05cd8a..9832061b6 100644
--- a/App_Code/modExtensiones.vb
+++ b/App_Code/modExtensiones.vb
@@ -50,10 +50,10 @@ Namespace Extensiones
Public Function CadenaConexion() As String
Dim BaseDatos As String = "Ventas"
- If Not IsNothing(System.Web.HttpContext.Current) AndAlso Not IsNothing(System.Web.HttpContext.Current.Session) Then
+ 'If Not IsNothing(System.Web.HttpContext.Current) AndAlso Not IsNothing(System.Web.HttpContext.Current.Session) Then
- BaseDatos = CType(System.Web.HttpContext.Current.Session("UsuarioSIG"), Usuario).Empresa.BaseDatosNombre
- End If
+ ' BaseDatos = CType(System.Web.HttpContext.Current.Session("UsuarioSIG"), Usuario).Empresa.BaseDatosNombre
+ 'End If
Return String.Format("Data Source=192.168.0.2;Initial Catalog={0};User Id=JCaudillo;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;", BaseDatos)
diff --git a/Ashx/SIGFacturacion.ashx b/Ashx/SIGFacturacion.ashx
index 97adc819d..8a81cd9fa 100644
--- a/Ashx/SIGFacturacion.ashx
+++ b/Ashx/SIGFacturacion.ashx
@@ -1562,34 +1562,34 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
HttpContext.Current.Application("GlobalDTSATUsosCFDI") = value
End Set
End Property
- Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
- Get
- If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
- GlobalDTUnidadesMedida = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTUnidadesMedida = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTUnidadesMedida") = value
- End Set
- End Property
- Property GlobalDTUnidadesMedidaAlias(Optional CveEmpresa As Integer = -1) As DataTable
- Get
- If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
- GlobalDTUnidadesMedidaAlias = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTUnidadesMedidaAlias = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias") = value
- End Set
- End Property
+ 'Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
+ ' Get
+ ' If CveEmpresa <> -1 Then
+ ' Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
+ ' GlobalDTUnidadesMedida = Dv.ToTable
+ ' Dv.Dispose()
+ ' Else
+ ' GlobalDTUnidadesMedida = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedida"), DataTable)
+ ' End If
+ ' End Get
+ ' Set(value As DataTable)
+ ' HttpContext.Current.Application("GlobalDTUnidadesMedida") = value
+ ' End Set
+ 'End Property
+ 'Property GlobalDTUnidadesMedidaAlias(Optional CveEmpresa As Integer = -1) As DataTable
+ ' Get
+ ' If CveEmpresa <> -1 Then
+ ' Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
+ ' GlobalDTUnidadesMedidaAlias = Dv.ToTable
+ ' Dv.Dispose()
+ ' Else
+ ' GlobalDTUnidadesMedidaAlias = DirectCast(HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias"), DataTable)
+ ' End If
+ ' End Get
+ ' Set(value As DataTable)
+ ' HttpContext.Current.Application("GlobalDTUnidadesMedidaAlias") = value
+ ' End Set
+ 'End Property
Property GlobalDTEstatusOrdenCompra() As DataTable
Get
GlobalDTEstatusOrdenCompra = DirectCast(HttpContext.Current.Application("GlobalDTEstatusOrdenCompra"), DataTable)
@@ -1657,44 +1657,44 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
HttpContext.Current.Application("GlobalDTProyectos") = value
End Set
End Property
- Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
- Get
+ 'Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
+ ' Get
- If DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable) Is Nothing Or (DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable) IsNot Nothing AndAlso DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable).Rows.Count = 0) Then
- Dim P As New ClsSubProyectos
- If P.GetSubProyectos Then
- HttpContext.Current.Application("GlobalDTSubProyectos") = P.DtResultados
- End If
- P.Dispose()
+ ' If DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable) Is Nothing Or (DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable) IsNot Nothing AndAlso DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable).Rows.Count = 0) Then
+ ' Dim P As New ClsSubProyectos
+ ' If P.GetSubProyectos Then
+ ' HttpContext.Current.Application("GlobalDTSubProyectos") = P.DtResultados
+ ' End If
+ ' P.Dispose()
- Dim msg As String = "aqui no se carga subproyectos"
+ ' Dim msg As String = "aqui no se carga subproyectos"
- End If
+ ' End If
- If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
- Dim StrSQL As New StringBuilder
- If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
- If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
- If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
- If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
+ ' If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
+ ' Dim StrSQL As New StringBuilder
+ ' If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
+ ' If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
+ ' If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
+ ' If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
- GlobalDTSubProyectos = Dv.ToTable
- Dv.Dispose()
+ ' Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ ' GlobalDTSubProyectos = Dv.ToTable
+ ' Dv.Dispose()
- Else
- GlobalDTSubProyectos = DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable)
- End If
+ ' Else
+ ' GlobalDTSubProyectos = DirectCast(HttpContext.Current.Application("GlobalDTSubProyectos"), DataTable)
+ ' End If
- End Get
- Set(ByVal value As DataTable)
- If value Is Nothing OrElse value.Rows.Count = 0 Then
- Dim msg As String = "aqui no se carga subproyectos"
+ ' End Get
+ ' Set(ByVal value As DataTable)
+ ' If value Is Nothing OrElse value.Rows.Count = 0 Then
+ ' Dim msg As String = "aqui no se carga subproyectos"
- End If
- HttpContext.Current.Application("GlobalDTSubProyectos") = value
- End Set
- End Property
+ ' End If
+ ' HttpContext.Current.Application("GlobalDTSubProyectos") = value
+ ' End Set
+ 'End Property
Property GlobalDTSubProyectosUsuarios(CveUsuario As Integer, CveProyecto As Integer, CveEmpresa As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEstatus As Integer = -1) As DataTable
Get
@@ -2085,48 +2085,61 @@ Public Class SIGFacturacion : Implements IHttpHandler, IRequiresSessionState
'Cliente
Property GlobalDTCliente(CveEmpresa As Integer, Optional Estatus As Integer = 1) As DataTable
Get
+ Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If HttpContext.Current.Application(AppNombre) Is Nothing Then
+ Dim ObjClientes As New ClsClientes
+ If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then HttpContext.Current.Application(AppNombre) = ObjClientes.DtResultados
+ ObjClientes.Dispose()
+ End If
+
+
If CveEmpresa <> -1 Then
Dim StrSQL As New StringBuilder
StrSQL.AppendFormat("CveEmpresa = {0}", CveEmpresa)
If Estatus >= 0 Then StrSQL.AppendFormat(" AND EstatusBool = {0} ", Estatus)
- If HttpContext.Current.Application("GlobalDTCliente") Is Nothing Then
- Dim ObjClientes As New ClsClientes
- If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1) Then HttpContext.Current.Application("GlobalDTCliente") = ObjClientes.DtResultados Else HttpContext.Current.Application("GlobalDTCliente") = Nothing
- ObjClientes.Dispose()
-
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTCliente"), DataTable), StrSQL.ToString, "", DataViewRowState.CurrentRows)
- GlobalDTCliente = Dv.ToTable
- Dv.Dispose()
-
- Else
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTCliente"), DataTable), StrSQL.ToString, "", DataViewRowState.CurrentRows)
- GlobalDTCliente = Dv.ToTable
- Dv.Dispose()
- End If
+ Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), StrSQL.ToString, "", DataViewRowState.CurrentRows)
+ GlobalDTCliente = Dv.ToTable
+ Dv.Dispose()
Else
- GlobalDTCliente = DirectCast(HttpContext.Current.Application("GlobalDTCliente"), DataTable)
+ GlobalDTCliente = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
End If
End Get
Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTCliente") = value
+ Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
+ HttpContext.Current.Application(AppNombre) = value
+ 'Dim ObjClientes As New ClsClientes
+ 'If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then Application(AppNombre) = ObjClientes.DtResultados
+ 'ObjClientes.Dispose()
End Set
End Property
Property GlobalDTClienteClasificaciones(CveEmpresa As Integer) As DataTable
Get
+ Dim AppNombre As String = String.Format("GlobalDTClienteClasificaciones{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If HttpContext.Current.Application(AppNombre) Is Nothing Then
+ Dim ObjClientes As New ClsClientes
+ If ObjClientes.GetClienteClasificacion(CveEmpresa) Then HttpContext.Current.Application(AppNombre) = ObjClientes.DtResultados
+ ObjClientes.Dispose()
+ End If
If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(HttpContext.Current.Application("GlobalDTClienteClasificaciones"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
+ Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
GlobalDTClienteClasificaciones = Dv.ToTable
Dv.Dispose()
Else
- GlobalDTClienteClasificaciones = DirectCast(HttpContext.Current.Application("GlobalDTClienteClasificaciones"), DataTable)
+ GlobalDTClienteClasificaciones = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
End If
End Get
Set(value As DataTable)
- HttpContext.Current.Application("GlobalDTClasificacionesCliente") = value
+ Dim AppNombre As String = String.Format("GlobalDTClienteClasificaciones{0}", CveEmpresa)
+ HttpContext.Current.Application(AppNombre) = value
+ 'Dim ObjClientes As New ClsClientes
+ 'If ObjClientes.GetClienteClasificacion(CveEmpresa) Then Application(AppNombre) = ObjClientes.DtResultados
+ 'ObjClientes.Dispose()
End Set
End Property
Property GlobalDTEstatusOrdenServicios(CveEmpresa As Integer) As DataTable
diff --git a/Ashx/SIGWeb.ashx b/Ashx/SIGWeb.ashx
index 0dc50dcd3..a1d1c9720 100644
--- a/Ashx/SIGWeb.ashx
+++ b/Ashx/SIGWeb.ashx
@@ -1,72 +1,72 @@
<%@ WebHandler Language="VB" Class="SIGWeb" %>
-Imports System
-Imports System.Web
-Imports System.Data
-Imports Newtonsoft.Json
-Imports Extensiones
-Imports System.IO
-
-Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
-
- Public Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest
- context.Response.ContentType = "text/plain"
- Try
- Select Case context.Request("metodo")
- Case "getps"
- GETPS(context)
- Case "getps2"
- GETPS(context, "PSCodigoClasificacion")
- Case "getpsalmacen"
- getpsalmacen(context)
- Case "Uploadfile"
- uploadfile(context)
- Case "Downfile"
- Downfile(context)
- Case "GetImg"
- GetImg(context)
- Case "getpssat"
- GETPSSAT(context)
- Case "getpsusados"
- GETPSUSADOS(context)
- Case "getumsat"
- GETUMSAT(context)
- Case "getcliente"
- GetClientes(context)
- Case "getproveedores"
- GetProveedores(context)
- Case "getfraccionarancelaria"
- GetFraccionArancelaria(context)
- Case "GetUser"
+Imports System
+Imports System.Web
+Imports System.Data
+Imports Newtonsoft.Json
+Imports Extensiones
+Imports System.IO
+
+Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
+
+ Public Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest
+ context.Response.ContentType = "text/plain"
+ Try
+ Select Case context.Request("metodo")
+ Case "getps"
+ GETPS(context)
+ Case "getps2"
+ GETPS(context, "PSCodigoClasificacion")
+ Case "getpsalmacen"
+ getpsalmacen(context)
+ Case "Uploadfile"
+ uploadfile(context)
+ Case "Downfile"
+ Downfile(context)
+ Case "GetImg"
+ GetImg(context)
+ Case "getpssat"
+ GETPSSAT(context)
+ Case "getpsusados"
+ GETPSUSADOS(context)
+ Case "getumsat"
+ GETUMSAT(context)
+ Case "getcliente"
+ GetClientes(context)
+ Case "getproveedores"
+ GetProveedores(context)
+ Case "getfraccionarancelaria"
+ GetFraccionArancelaria(context)
+ Case "GetUser"
GetUser(context)
- Case "ActualizaPreP"
- ActualizaPrePoliza(context)
-
- End Select
- Catch ex As Exception
- ex.GuardaLog(ex.Message)
- End Try
- End Sub
-
-
- Private Sub GetUser(ByVal context As HttpContext)
- Dim usuario As String = context.Request("usuario").ToString()
- Dim CveUsuario As Integer = -1
- Dim objs As New ClsSisUsuarios
- objs.GetWSusuarios(usuario)
- If objs.DtResultados.Rows.Count > 0 Then
- CveUsuario = objs.DtResultados.Rows(0)("CveUsuario").ToString().ToEntero()
- End If
- objs.Dispose()
- If CveUsuario > 0 Then
- CveUsuario = 1
- End If
-
- context.Response.Write(CveUsuario.ToString())
- context.Response.StatusCode = 200
+ Case "ActualizaPreP"
+ ActualizaPrePoliza(context)
+
+ End Select
+ Catch ex As Exception
+ ex.GuardaLog(ex.Message)
+ End Try
End Sub
- Private Sub ActualizaPrePoliza(ByVal context As HttpContext)
+
+ Private Sub GetUser(ByVal context As HttpContext)
+ Dim usuario As String = context.Request("usuario").ToString()
+ Dim CveUsuario As Integer = -1
+ Dim objs As New ClsSisUsuarios
+ objs.GetWSusuarios(usuario)
+ If objs.DtResultados.Rows.Count > 0 Then
+ CveUsuario = objs.DtResultados.Rows(0)("CveUsuario").ToString().ToEntero()
+ End If
+ objs.Dispose()
+ If CveUsuario > 0 Then
+ CveUsuario = 1
+ End If
+
+ context.Response.Write(CveUsuario.ToString())
+ context.Response.StatusCode = 200
+ End Sub
+
+ Private Sub ActualizaPrePoliza(ByVal context As HttpContext)
Dim CvePrePoliza As Integer = context.Request("CvePrePoliza").ToString.ToEntero
Dim CveEmpresa As Integer = context.Request("CveEmpresa").ToString.ToEntero
Dim CveUsuario As Integer = context.Request("CveUsuario").ToString.ToEntero
@@ -96,555 +96,594 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
ObjConta.Dispose()
'context.Response.Write(CveUsuario.ToString())
- context.Response.StatusCode = Retorno
- End Sub
-
- Private Sub GetImg(ByVal context As HttpContext)
- Dim Url As String = Decripta(context.Request("r").ToString)
-
- Dim usuario As Usuario = UsuarioActual(context)
- If Not IsNothing(usuario) Then
- Url = String.Format("{0}Empresas\{1}\{2}", AppDomain.CurrentDomain.BaseDirectory, usuario.CveEmpresa, Url)
- Dim FileInfo As FileInfo = New FileInfo(Url)
- If FileInfo.Exists Then
- context.Response.ContentType = "image/png"
- context.Response.Flush()
- context.Response.WriteFile(FileInfo.FullName)
- context.Response.End()
- End If
-
- End If
+ context.Response.StatusCode = Retorno
End Sub
-#Region "File"
+ Private Sub GetImg(ByVal context As HttpContext)
+ Dim Url As String = Decripta(context.Request("r").ToString)
- Private Sub Downfile(ByVal context As HttpContext)
- Dim savepath As String = ""
- Dim tempPath As String = ""
- tempPath = String.Format("{0}{1}", System.Configuration.ConfigurationManager.AppSettings("FolderPath"), "/Temp")
- savepath = context.Server.MapPath(tempPath)
- Dim nombre As String = String.Format("{0}\{1}", savepath, context.Request("nombre"))
- File.Delete(nombre)
- context.Response.StatusCode = 200
- End Sub
-
- Private Sub uploadfile(ByVal context As HttpContext)
- Dim postedFile As HttpPostedFile
- Dim savepath As String = ""
- Dim tempPath As String = ""
- tempPath = String.Format("{0}{1}", System.Configuration.ConfigurationManager.AppSettings("FolderPath"), "/Temp")
- savepath = context.Server.MapPath(tempPath)
- Dim filename As String
- Dim tick As String
- tick = (DateTime.Now.Ticks + 1).ToString()
- If Not Directory.Exists(savepath) Then
- Directory.CreateDirectory(savepath)
- End If
- If context.Request.Files.Count = 0 Then
- Dim copyFile As String = context.Request("File")
- Dim Cve As String = context.Request("Cve")
-
- If copyFile <> "" Then
- Dim ext As Integer = copyFile.IndexOf(","c) + 1
-
- Dim extncion As String = copyFile.Substring(5, ext - 5)
- If extncion.Contains("image/") Then extncion = extncion.Replace("image/", "").Replace(";base64,", "")
- 'Dim extncion As String =
- filename = String.Format("{0}-{1}.{2}", tick, Cve, extncion)
-
- Dim msf As New MemoryStream(Convert.FromBase64String(copyFile.Substring(ext)))
- Dim stem As Stream = New FileStream(String.Format("{0}\{1}", savepath, filename), FileMode.Create)
- msf.WriteTo(stem)
- msf.Close()
- stem.Close()
-
- End If
- Else
-
- postedFile = context.Request.Files(0)
- filename = String.Format("{0}-{1}", tick, postedFile.FileName)
-
- postedFile.SaveAs((savepath & "\") + filename)
- End If
- context.Response.Write(tick)
- context.Response.StatusCode = 200
+ Dim usuario As Usuario = UsuarioActual(context)
+ If Not IsNothing(usuario) Then
+ Url = String.Format("{0}Empresas\{1}\{2}", AppDomain.CurrentDomain.BaseDirectory, usuario.CveEmpresa, Url)
+ Dim FileInfo As FileInfo = New FileInfo(Url)
+ If FileInfo.Exists Then
+ context.Response.ContentType = "image/png"
+ context.Response.Flush()
+ context.Response.WriteFile(FileInfo.FullName)
+ context.Response.End()
+ End If
+
+ End If
End Sub
-#End Region
-#Region "Get Cliente"
- Private Function GetClientes(ByVal context As HttpContext) As String
- Dim retorno As String = ""
- Dim DtRetorno As DataTable = Nothing
-
- Dim usuario As Usuario = UsuarioActual(context)
- Dim CveEmpresa As String
- If IsNothing(usuario) Then
- context.Response.Write("")
- Else
- CveEmpresa = usuario.CveEmpresa
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
- Dim dt As DataTable = DirectCast(context.Application("GlobalDTCliente"), DataTable).FiltraParametros($"CveEmpresa = {CveEmpresa}")
- If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
- DtRetorno = dt.FiltraParametros($"NombreComercial like '%{Name}%'")
- End If
- End If
-
- If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then
- DtRetorno.Columns("CveCliente").ColumnName = "id"
- DtRetorno.Columns("NombreComercial").ColumnName = "text"
- retorno = JsonConvert.SerializeObject(DtRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
-
- Return retorno
+#Region "File"
+
+ Private Sub Downfile(ByVal context As HttpContext)
+ Dim savepath As String = ""
+ Dim tempPath As String = ""
+ tempPath = String.Format("{0}{1}", System.Configuration.ConfigurationManager.AppSettings("FolderPath"), "/Temp")
+ savepath = context.Server.MapPath(tempPath)
+ Dim nombre As String = String.Format("{0}\{1}", savepath, context.Request("nombre"))
+ File.Delete(nombre)
+ context.Response.StatusCode = 200
+ End Sub
+
+ Private Sub uploadfile(ByVal context As HttpContext)
+ Dim postedFile As HttpPostedFile
+ Dim savepath As String = ""
+ Dim tempPath As String = ""
+ tempPath = String.Format("{0}{1}", System.Configuration.ConfigurationManager.AppSettings("FolderPath"), "/Temp")
+ savepath = context.Server.MapPath(tempPath)
+ Dim filename As String
+ Dim tick As String
+ tick = (DateTime.Now.Ticks + 1).ToString()
+ If Not Directory.Exists(savepath) Then
+ Directory.CreateDirectory(savepath)
+ End If
+ If context.Request.Files.Count = 0 Then
+ Dim copyFile As String = context.Request("File")
+ Dim Cve As String = context.Request("Cve")
+
+ If copyFile <> "" Then
+ Dim ext As Integer = copyFile.IndexOf(","c) + 1
+
+ Dim extncion As String = copyFile.Substring(5, ext - 5)
+ If extncion.Contains("image/") Then extncion = extncion.Replace("image/", "").Replace(";base64,", "")
+ 'Dim extncion As String =
+ filename = String.Format("{0}-{1}.{2}", tick, Cve, extncion)
+
+ Dim msf As New MemoryStream(Convert.FromBase64String(copyFile.Substring(ext)))
+ Dim stem As Stream = New FileStream(String.Format("{0}\{1}", savepath, filename), FileMode.Create)
+ msf.WriteTo(stem)
+ msf.Close()
+ stem.Close()
+
+ End If
+ Else
+
+ postedFile = context.Request.Files(0)
+ filename = String.Format("{0}-{1}", tick, postedFile.FileName)
+
+ postedFile.SaveAs((savepath & "\") + filename)
+ End If
+ context.Response.Write(tick)
+ context.Response.StatusCode = 200
+ End Sub
+#End Region
+
+#Region "Get Cliente"
+ Private Function GetClientes(ByVal context As HttpContext) As String
+ Dim retorno As String = ""
+ Dim DtRetorno As DataTable = Nothing
+
+ Dim usuario As Usuario = UsuarioActual(context)
+ Dim CveEmpresa As String
+ If IsNothing(usuario) Then
+ context.Response.Write("")
+ Else
+ CveEmpresa = usuario.CveEmpresa
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+ Dim AppNombre As String = String.Format("GlobalDTCliente{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If context.Application(AppNombre) Is Nothing Then
+ Dim ObjClientes As New ClsClientes
+ If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then
+ context.Application(AppNombre) = ObjClientes.DtResultados
+ End If
+ ObjClientes.Dispose()
+ End If
+
+ 'Dim ObjClientes As New ClsClientes
+ 'If ObjClientes.GetClientes(-1, Name, "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa, Estatus:=-1) Then
+ ' DtRetorno = ObjClientes.DtResultados
+ 'End If
+ 'ObjClientes.Dispose()
+
+ Dim dt As DataTable = DirectCast(context.Application(AppNombre), DataTable).FiltraParametros($"CveEmpresa = {CveEmpresa}")
+ If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+ DtRetorno = dt.FiltraParametros($"NombreComercial like '%{Name}%'")
+ End If
+ End If
+
+ If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then
+ DtRetorno.Columns("CveCliente").ColumnName = "id"
+ DtRetorno.Columns("NombreComercial").ColumnName = "text"
+ retorno = JsonConvert.SerializeObject(DtRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+
+ Return retorno
End Function
-#End Region
+#End Region
-#Region "Get Proveedor"
- Private Function GetProveedores(ByVal context As HttpContext) As String
- Dim retorno As String = ""
- Dim DtRetorno As DataTable = Nothing
-
- Dim usuario As Usuario = UsuarioActual(context)
- Dim CveEmpresa As String
- If IsNothing(usuario) Then
- context.Response.Write("")
- Else
- CveEmpresa = usuario.CveEmpresa
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
- Dim dt As DataTable = DirectCast(context.Application("GlobalDTCompProveedores"), DataTable).FiltraParametros($"CveEmpresa = {CveEmpresa}")
- If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
- DtRetorno = dt.FiltraParametros($"RazonSocial like '%{Name}%'")
- End If
- End If
-
- If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then
- DtRetorno.Columns("CveProveedor").ColumnName = "id"
- DtRetorno.Columns("RazonSocial").ColumnName = "text"
- retorno = JsonConvert.SerializeObject(DtRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
-
- Return retorno
+#Region "Get Proveedor"
+ Private Function GetProveedores(ByVal context As HttpContext) As String
+ Dim retorno As String = ""
+ Dim DtRetorno As DataTable = Nothing
+
+ Dim usuario As Usuario = UsuarioActual(context)
+ Dim CveEmpresa As String
+ If IsNothing(usuario) Then
+ context.Response.Write("")
+ Else
+ CveEmpresa = usuario.CveEmpresa
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+ Dim AppNombre As String = String.Format("GlobalDTCompProveedores{0}", CveEmpresa)
+ 'sino existe, recarga los datos
+ If context.Application(AppNombre) Is Nothing Then
+ Dim ObjProveedores As New ClsCompProveedores
+ If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa) Then
+ context.Application(AppNombre) = ObjProveedores.DtResultados
+ End If
+ ObjProveedores.Dispose()
+ End If
+
+ 'Dim ObjProveedores As New ClsCompProveedores
+ 'If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaUsoEnEmpresa, -1, "-1", Name, "-1", "-1", "-1", "-1", "-1", -1, CveEmpresa) Then
+ ' DtRetorno = ObjProveedores.DtResultados
+ 'End If
+ 'ObjProveedores.Dispose()
+ Dim dt As DataTable = DirectCast(context.Application(AppNombre), DataTable).FiltraParametros($"CveEmpresa = {CveEmpresa}")
+ If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+ DtRetorno = dt.FiltraParametros($"RazonSocial like '%{Name}%'")
+ End If
+ End If
+
+ If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then
+ DtRetorno.Columns("CveProveedor").ColumnName = "id"
+ DtRetorno.Columns("RazonSocial").ColumnName = "text"
+ retorno = JsonConvert.SerializeObject(DtRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+
+ Return retorno
End Function
-#End Region
+#End Region
-#Region " GET PS "
- Private Function getpsalmacen(ByVal context As HttpContext) As String
-
- Dim usuario As Usuario = UsuarioActual(context)
- Dim CveEmpresa As String
- Dim retorno As String = ""
- Dim DtPSRetorno As DataTable = Nothing
-
- If IsNothing(usuario) Then
- context.Response.Write("")
- Else
- CveEmpresa = usuario.CveEmpresa
-
- DtPSRetorno = New DataTable
- DtPSRetorno.Columns.Add(New DataColumn("id", System.Type.GetType("System.Int32")))
- DtPSRetorno.Columns.Add(New DataColumn("existencia", System.Type.GetType("System.Int32")))
- DtPSRetorno.Columns.Add(New DataColumn("almacen", System.Type.GetType("System.String")))
-
- Dim CvePS = IfNull(context.Request("cveps"), "0").ToString.ToEntero
- Dim objInv As New ClsInventarios
- If objInv.GetExistenciasProducto(CvePS, -1, CveEmpresa, -1, FechaMovto:=DateTime.Today.AddDays(1).ToString("yyyy/MM/dd HH:mm")) Then
-
- ' limpio los almacenes donde no tiene ningun producto existencia
- For i = objInv.DtResultados.Columns.Count - 1 To 1 Step -1
-
- If Not objInv.DtResultados.Columns(i).ColumnName.Contiene("CveAlmacen", "Almacen", "Existencia") Then
- objInv.DtResultados.Columns.RemoveAt(i)
- End If
- Next
-
- DtPSRetorno = objInv.DtResultados.FiltraParametros("CveAlmacen > 0 and Existencia > 0")
- End If
-
- objInv.Dispose()
-
- End If
-
- If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
- DtPSRetorno.Columns("CveAlmacen").ColumnName = "id"
- DtPSRetorno.Columns("Almacen").ColumnName = "almacen"
- DtPSRetorno.Columns("Existencia").ColumnName = "existencia"
- retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
-
- Return retorno
- End Function
-
- Private Function GETPS(ByVal context As HttpContext, Optional PSCodigoDescripcion As String = "PSCodigo") As String
- Dim retorno As String = ""
- Dim DtPSRetorno As DataTable = Nothing
-
- 'NOTA:
- ' EN EL WHERE DE LINQ NO SE DEBE USAS EL OPERADOR 'AND' SABE PORQUE FUNCIONA DIFERENTE SE DEBE USAR 'ANDALSO',
- ' EJEMPLO UNA CONDICION AND DE DOS CAMPOS ARROJA CERO RESULTADOS PERO SI SE PONE ESTAS DOS CONDICIONES POR SEPARADO ARROJA DATOS
- Dim usuario As Usuario = UsuarioActual(context)
- Dim CveEmpresa As String
- If IsNothing(usuario) Then
- context.Response.Write("")
- Else
- CveEmpresa = usuario.CveEmpresa
- Dim FuePorXml = IfNull(context.Request("FuePorXml"), "-1").ToString.ToEntero
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
- Dim CveClasificacion = IfNull(context.Request("CveClasificacion"), "-1").ToString.ToEntero
- Dim CveSubFamilia = IfNull(context.Request("CveSubFamilia"), "-1").ToString.ToEntero
- Dim CveClasificacionPresupuesto = IfNull(context.Request("CveClasificacionPresupuesto"), "-1").ToString.ToEntero
- Dim Pagina = IfNull(context.Request("Pagina"), "-1").ToString
- Dim Estatus = IfNull(context.Request("Estatus"), "1").ToString
- Dim CveSucursal = IfNull(context.Request("cvesucursal"), "-1").ToString.ToEntero
- Dim CveSubProyecto = IfNull(context.Request("cvesubproyecto"), "-1").ToString.ToEntero
- Dim UsoClasificacion = IfNull(context.Request("usoclasificacion"), "-1").ToString.ToEntero
- Dim AplicaParaVenta = IfNull(context.Request("aplicaparaventa"), "-1").ToString.ToEntero
-
- Dim UsaGlobal As Boolean = True
-
-
- 'verifica existencias
- If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141) Then
- UsaGlobal = False
-
- Dim objInv As New ClsInventarios
- If objInv.GetExistenciasProductosLike(Name, CveClasificacion, CveSubProyecto, Estatus.ToEntero, AplicaParaVenta, CveEmpresa) Then
-
- ' limpio los almacenes donde no tiene ningun producto existencia
- For i = objInv.DtResultados.Columns.Count - 1 To 1 Step -1
+#Region " GET PS "
+ Private Function getpsalmacen(ByVal context As HttpContext) As String
- If Not objInv.DtResultados.Columns(i).ColumnName.Contiene("CvePS", "PSCodigo", "PSCodigoClasificacion") AndAlso objInv.DtResultados.SUM(String.Format("[{0}]", objInv.DtResultados.Columns(i).ColumnName)) = 0 Then
- objInv.DtResultados.Columns.RemoveAt(i)
- End If
- Next
+ Dim usuario As Usuario = UsuarioActual(context)
+ Dim CveEmpresa As String
+ Dim retorno As String = ""
+ Dim DtPSRetorno As DataTable = Nothing
+
+ If IsNothing(usuario) Then
+ context.Response.Write("")
+ Else
+ CveEmpresa = usuario.CveEmpresa
+
+ DtPSRetorno = New DataTable
+ DtPSRetorno.Columns.Add(New DataColumn("id", System.Type.GetType("System.Int32")))
+ DtPSRetorno.Columns.Add(New DataColumn("existencia", System.Type.GetType("System.Int32")))
+ DtPSRetorno.Columns.Add(New DataColumn("almacen", System.Type.GetType("System.String")))
+
+ Dim CvePS = IfNull(context.Request("cveps"), "0").ToString.ToEntero
+ Dim objInv As New ClsInventarios
+ If objInv.GetExistenciasProducto(CvePS, -1, CveEmpresa, -1, FechaMovto:=DateTime.Today.AddDays(1).ToString("yyyy/MM/dd HH:mm")) Then
+
+ ' limpio los almacenes donde no tiene ningun producto existencia
+ For i = objInv.DtResultados.Columns.Count - 1 To 1 Step -1
+
+ If Not objInv.DtResultados.Columns(i).ColumnName.Contiene("CveAlmacen", "Almacen", "Existencia") Then
+ objInv.DtResultados.Columns.RemoveAt(i)
+ End If
+ Next
+
+ DtPSRetorno = objInv.DtResultados.FiltraParametros("CveAlmacen > 0 and Existencia > 0")
+ End If
+
+ objInv.Dispose()
+
+ End If
+
+ If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
+ DtPSRetorno.Columns("CveAlmacen").ColumnName = "id"
+ DtPSRetorno.Columns("Almacen").ColumnName = "almacen"
+ DtPSRetorno.Columns("Existencia").ColumnName = "existencia"
+ retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+
+ Return retorno
+ End Function
+
+ Private Function GETPS(ByVal context As HttpContext, Optional PSCodigoDescripcion As String = "PSCodigo") As String
+ Dim retorno As String = ""
+ Dim DtPSRetorno As DataTable = Nothing
+
+ 'NOTA:
+ ' EN EL WHERE DE LINQ NO SE DEBE USAS EL OPERADOR 'AND' SABE PORQUE FUNCIONA DIFERENTE SE DEBE USAR 'ANDALSO',
+ ' EJEMPLO UNA CONDICION AND DE DOS CAMPOS ARROJA CERO RESULTADOS PERO SI SE PONE ESTAS DOS CONDICIONES POR SEPARADO ARROJA DATOS
+ Dim usuario As Usuario = UsuarioActual(context)
+ Dim CveEmpresa As String
+ If IsNothing(usuario) Then
+ context.Response.Write("")
+ Else
+ CveEmpresa = usuario.CveEmpresa
+ Dim FuePorXml = IfNull(context.Request("FuePorXml"), "-1").ToString.ToEntero
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+ Dim CveClasificacion = IfNull(context.Request("CveClasificacion"), "-1").ToString.ToEntero
+ Dim CveSubFamilia = IfNull(context.Request("CveSubFamilia"), "-1").ToString.ToEntero
+ Dim CveClasificacionPresupuesto = IfNull(context.Request("CveClasificacionPresupuesto"), "-1").ToString.ToEntero
+ Dim Pagina = IfNull(context.Request("Pagina"), "-1").ToString
+ Dim Estatus = IfNull(context.Request("Estatus"), "1").ToString
+ Dim CveSucursal = IfNull(context.Request("cvesucursal"), "-1").ToString.ToEntero
+ Dim CveSubProyecto = IfNull(context.Request("cvesubproyecto"), "-1").ToString.ToEntero
+ Dim UsoClasificacion = IfNull(context.Request("usoclasificacion"), "-1").ToString.ToEntero
+ Dim AplicaParaVenta = IfNull(context.Request("aplicaparaventa"), "-1").ToString.ToEntero
+
+ Dim UsaGlobal As Boolean = True
+
+
+ 'verifica existencias
+ If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141) Then
+ UsaGlobal = False
+
+ Dim objInv As New ClsInventarios
+ If objInv.GetExistenciasProductosLike(Name, CveClasificacion, CveSubProyecto, Estatus.ToEntero, AplicaParaVenta, CveEmpresa) Then
+
+ ' limpio los almacenes donde no tiene ningun producto existencia
+
+ Dim i As Integer = 0
+ While i < objInv.DtResultados.Columns.Count
+
+ If Not objInv.DtResultados.Columns(i).ColumnName.Contiene("CvePS", "PSCodigo", "PSCodigoClasificacion") AndAlso objInv.DtResultados.SUM(String.Format("[{0}]", objInv.DtResultados.Columns(i).ColumnName)) = 0 Then
+ objInv.DtResultados.Columns.RemoveAt(i)
+ Else
+ i = i + 1
+ End If
+ End While
DtPSRetorno = objInv.DtResultados
- End If
-
- objInv.Dispose()
-
+ End If
+
+ objInv.Dispose()
+
End If
If usuario.Empresa.Funcionalidad(558) = "1" Then
Try
- Dim NobreFiltroColumna As String = DtPSRetorno.Columns(3).ColumnName
- DtPSRetorno = DtPSRetorno.FiltraParametros($"{NobreFiltroColumna} > 0")
+ Dim NombreFiltroColumna As String = DtPSRetorno.Columns(3).ColumnName
+ DtPSRetorno = DtPSRetorno.FiltraParametros("", String.Format("{0} DESC,PSCodigo", NombreFiltroColumna))
Catch ex As Exception
End Try
- End If
-
+ End If
+
+ If UsaGlobal Then
+ 'se recarga el global, y el clspaginas, son los unicos 2 lugares
+ Dim AppNombre As String = String.Format("GlobalDTPSSimplificado{0}", CveEmpresa)
+ If context.Application(String.Format("GlobalDTPSSimplificado{0}", CveEmpresa)) Is Nothing Then
+ Dim ObjPS As New ClsProductosServicios
+ If ObjPS.GetPSSimplificado(CveEmpresa) Then context.Application(AppNombre) = ObjPS.DtResultados.AsEnumerable()
+ ObjPS.Dispose()
+
+ End If
+
+
+ Dim DTPS = DirectCast(context.Application(AppNombre), EnumerableRowCollection(Of DataRow))
+ 'Dim DTPS = ClsPaginas.GlobalDTPSSimplificado(CveEmpresa).AsEnumerable
+
+ If DTPS IsNot Nothing Then
+
+
+ 'APLICACION DE FILTROS
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEmpresa) = CveEmpresa))
+ If Estatus = 1 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEstado) = 1))
+ ElseIf Estatus = -1 Then
+
+ End If
+
+ 'If FuePorXml >= 0 Then
+ ' DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!FuePorXML) = FuePorXml))
+ 'End If
+
+ If Name <> "-1" Then
+ If PSCodigoDescripcion = "PSCodigo" Then
+ DTPS = DTPS.Where((Function(a) a!PSCodigo.ToString.ToLower Like ("*" + Name.ToLower + "*")))
+ Else
+ DTPS = DTPS.Where((Function(a) a!PSCodigoClasificacion.ToString.ToLower Like ("*" + Name.ToLower + "*")))
+ End If
+ End If
+
+ If CveClasificacion > 0 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) = CveClasificacion))
+ ElseIf CveClasificacion = -1 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) >= 0))
+ End If
+
+ If AplicaParaVenta > 0 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!AplicaParaVenta) = 1))
+ End If
+
+ 'If CveSubFamilia > 0 Then
+ ' DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveSubFamilia) = CveSubFamilia))
+ ' 'ElseIf CveSubFamilia = -1 Then
+ ' 'DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveSubFamilia) > 0))
+ 'End If
+
+ If CveClasificacionPresupuesto > 0 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacionPresupuesto) = CveClasificacionPresupuesto))
+ End If
+
+ If UsoClasificacion > 0 Then DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!UsoClasificacion) = UsoClasificacion))
+
+ If Pagina <> "-1" Then
+ If Pagina = "Compras" Then
+ DTPS = DTPS.Where((Function(a) a!CveTipoPS = 1 AndAlso a!CveEstado = 1))
+ ElseIf Pagina = "Compras2" Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 1 AndAlso (Convert.ToInt32(a!CveEstado) = 1 OrElse Convert.ToInt32(a!CveEstado) = 2)))
+ ElseIf Pagina = "Inventarios" Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 2))
+ End If
+ End If
+
+ 'Try, generado para cuando el resultado no tiene valores(The source contains no DataRows.), no detenga la ejecucion, no se le puso un count previo, porque el costo se duplica, al preguntar y luego ordenar y convertir a datatable
+ Try
+ DtPSRetorno = New DataView(DTPS.OrderBy(Function(a) a!PSCodigo).CopyToDataTable).ToTable(True, {"CvePS", "PSCodigo", "PSCodigoClasificacion"})
+
+ Catch ex As Exception
+ DtPSRetorno = Nothing
+ End Try
+
+ End If
+ End If
+ If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
+ DtPSRetorno.Columns("CvePS").ColumnName = "id"
+ DtPSRetorno.Columns(PSCodigoDescripcion).ColumnName = "text"
+ If PSCodigoDescripcion = "PSCodigo" Then
+ DtPSRetorno.Columns().Remove("PSCodigoClasificacion")
+ Else
+ DtPSRetorno.Columns().Remove("PSCodigo")
+ End If
+ retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+ End If
+
+ Return retorno
+ End Function
+#End Region
+
+
+
+ Public ReadOnly Property IsReusable() As Boolean Implements IHttpHandler.IsReusable
+ Get
+ Return False
+ End Get
+ End Property
+
+
+
+#Region "Funciones"
+ Public Function GetJson(ByVal dt As DataTable) As String
+
+ Dim serializer As System.Web.Script.Serialization.JavaScriptSerializer = New System.Web.Script.Serialization.JavaScriptSerializer()
+ Dim rows As New List(Of Dictionary(Of String, Object))
+ Dim row As Dictionary(Of String, Object)
+
+ For Each dr As DataRow In dt.Rows
+ row = New Dictionary(Of String, Object)
+ For Each col As DataColumn In dt.Columns
+ row.Add(col.ColumnName, dr(col))
+ Next
+ rows.Add(row)
+ Next
+ Return serializer.Serialize(rows)
+ End Function
+ ReadOnly Property UsuarioActual(ByVal context As HttpContext) As Usuario
+ Get
+ UsuarioActual = DirectCast(context.Session("UsuarioSIG"), Usuario)
+ End Get
+ End Property
+#End Region
+
+
+#Region " GET PS SAT "
+ Private Function GETPSSAT(ByVal context As HttpContext) As String
+ Dim retorno As String = ""
+
+ Dim DTPS = DirectCast(context.Application("GlobalDTPSATPS"), EnumerableRowCollection(Of DataRow))
+ Dim DtPSRetorno As DataTable
+
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+
+ If Name <> "-1" Then
+ DTPS = DTPS.Where((Function(a) a!SATClaveProductoServicio.ToString.ToLower Like ($"*{Name.ToLower}*")))
+ End If
+
+ DtPSRetorno = New DataView(DTPS.OrderBy(Function(a) a!SATClavePS).CopyToDataTable).ToTable(True, {"CveSATPS", "SATClaveProductoServicio"})
+
+ If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
+ DtPSRetorno.Columns("CveSATPS").ColumnName = "id"
+ DtPSRetorno.Columns("SATClaveProductoServicio").ColumnName = "text"
+ retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+ DtPSRetorno.Dispose()
+ Return retorno
+ End Function
+#End Region
+
+
+#Region " GET UM SAT "
+ Private Function GETUMSAT(ByVal context As HttpContext) As String
+ Dim retorno As String = ""
+
+ Dim DTUM = DirectCast(context.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow))
+ Dim DtPSRetorno As DataTable
+
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+
+ If Name <> "-1" Then
+ DTUM = DTUM.Where((Function(a) a!ClaveNombre.ToString.ToLower Like ("*" + Name.ToLower + "*")))
+ End If
+
+ DtPSRetorno = New DataView(DTUM.OrderBy(Function(a) a!Nombre).CopyToDataTable).ToTable(True, {"CveSATUnidadMedida", "ClaveNombre"})
+
+ If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
+ DtPSRetorno.Columns("CveSATUnidadMedida").ColumnName = "id"
+ DtPSRetorno.Columns("ClaveNombre").ColumnName = "text"
+ retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+ Return retorno
+ End Function
+#End Region
+
+#Region " GET FRACCION ARANCELARIA "
+ Private Function GetFraccionArancelaria(ByVal context As HttpContext) As String
+ Dim retorno As String = ""
+
+ Dim DT = DirectCast(context.Application("GlobalDTFraccionArancelaria"), EnumerableRowCollection(Of DataRow))
+ Dim DtRetorno As DataTable
+
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+
+ If Name <> "-1" Then
+ DT = DT.Where((Function(a) a!ClaveSATFraccionArancelariaDescripcion.ToString.ToLower Like ($"*{Name.ToLower}*")))
+ End If
+
+ DtRetorno = New DataView(DT.OrderBy(Function(a) a!ClaveSATFraccionArancelaria).CopyToDataTable).ToTable(True, {"CveFraccionArancelaria", "ClaveSATFraccionArancelariaDescripcion"})
+
+ If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then
+ DtRetorno.Columns("CveFraccionArancelaria").ColumnName = "id"
+ DtRetorno.Columns("ClaveSATFraccionArancelariaDescripcion").ColumnName = "text"
+ retorno = JsonConvert.SerializeObject(DtRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+ DtRetorno.Dispose()
+ Return retorno
+ End Function
+#End Region
+
+
+#Region "USADOS"
+
+ Private Function GETPSUSADOS(ByVal context As HttpContext) As String
+ Dim retorno As String = ""
+ Dim DtPSRetorno As DataTable = Nothing
+
+ Dim usuario As Usuario = UsuarioActual(context)
+ Dim CveEmpresa As String
+ If IsNothing(usuario) Then
+ context.Response.Write("")
+ Else
+ CveEmpresa = usuario.CveEmpresa
+ Dim FuePorXml = IfNull(context.Request("FuePorXml"), "-1").ToString.ToEntero
+ Dim Name = IfNull(context.Request("Name"), "-1").ToString
+ Dim CveClasificacion = IfNull(context.Request("CveClasificacion"), "-1").ToString.ToEntero
+ Dim CveSubFamilia = IfNull(context.Request("CveSubFamilia"), "-1").ToString.ToEntero
+ Dim CveClasificacionPresupuesto = IfNull(context.Request("CveClasificacionPresupuesto"), "-1").ToString.ToEntero
+ Dim Pagina = IfNull(context.Request("Pagina"), "-1").ToString
+ Dim Estatus = IfNull(context.Request("Estatus"), "1").ToString
+ Dim CveSucursal = IfNull(context.Request("cvesucursal"), "-1").ToString.ToEntero
+ Dim CveSubProyecto = IfNull(context.Request("cvesubproyecto"), "-1").ToString.ToEntero
+ Dim UsoClasificacion = IfNull(context.Request("usoclasificacion"), "-1").ToString.ToEntero
+ Dim UsaGlobal As Boolean = True
+
+
If UsaGlobal Then
- 'Dim DTPS = DirectCast(context.Application("GlobalDTPSSimplificado"), EnumerableRowCollection(Of DataRow))
- Dim DTPS = ClsPaginas.GlobalDTPSSimplificado(CveEmpresa).AsEnumerable
-
- If DTPS IsNot Nothing Then
-
-
- 'APLICACION DE FILTROS
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEmpresa) = CveEmpresa))
- If Estatus = 1 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEstado) = 1))
- ElseIf Estatus = -1 Then
-
- End If
-
- 'If FuePorXml >= 0 Then
- ' DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!FuePorXML) = FuePorXml))
- 'End If
-
- If Name <> "-1" Then
- If PSCodigoDescripcion = "PSCodigo" Then
- DTPS = DTPS.Where((Function(a) a!PSCodigo.ToString.ToLower Like ("*" + Name.ToLower + "*")))
- Else
- DTPS = DTPS.Where((Function(a) a!PSCodigoClasificacion.ToString.ToLower Like ("*" + Name.ToLower + "*")))
- End If
- End If
-
- If CveClasificacion > 0 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) = CveClasificacion))
- ElseIf CveClasificacion = -1 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) >= 0))
- End If
-
- If AplicaParaVenta > 0 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!AplicaParaVenta) = 1))
- End If
-
- 'If CveSubFamilia > 0 Then
- ' DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveSubFamilia) = CveSubFamilia))
- ' 'ElseIf CveSubFamilia = -1 Then
- ' 'DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveSubFamilia) > 0))
- 'End If
-
- If CveClasificacionPresupuesto > 0 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacionPresupuesto) = CveClasificacionPresupuesto))
- End If
-
- If UsoClasificacion > 0 Then DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!UsoClasificacion) = UsoClasificacion))
-
- If Pagina <> "-1" Then
- If Pagina = "Compras" Then
- DTPS = DTPS.Where((Function(a) a!CveTipoPS = 1 AndAlso a!CveEstado = 1))
- ElseIf Pagina = "Compras2" Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 1 AndAlso (Convert.ToInt32(a!CveEstado) = 1 OrElse Convert.ToInt32(a!CveEstado) = 2)))
- ElseIf Pagina = "Inventarios" Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 2))
- End If
- End If
-
- 'Try, generado para cuando el resultado no tiene valores(The source contains no DataRows.), no detenga la ejecucion, no se le puso un count previo, porque el costo se duplica, al preguntar y luego ordenar y convertir a datatable
- Try
- DtPSRetorno = New DataView(DTPS.OrderBy(Function(a) a!PSCodigo).CopyToDataTable).ToTable(True, {"CvePS", "PSCodigo", "PSCodigoClasificacion"})
-
- Catch ex As Exception
- DtPSRetorno = Nothing
- End Try
-
- End If
- End If
- If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
- DtPSRetorno.Columns("CvePS").ColumnName = "id"
- DtPSRetorno.Columns(PSCodigoDescripcion).ColumnName = "text"
- If PSCodigoDescripcion = "PSCodigo" Then
- DtPSRetorno.Columns().Remove("PSCodigoClasificacion")
- Else
- DtPSRetorno.Columns().Remove("PSCodigo")
- End If
- retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
- End If
-
- Return retorno
- End Function
-#End Region
+ Dim DTPS = DirectCast(context.Application(String.Format("GlobalDTPSSimplificado{0}", CveEmpresa)), EnumerableRowCollection(Of DataRow))
+ If DTPS IsNot Nothing Then
+ 'APLICACION DE FILTROS
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEmpresa) = CveEmpresa))
+ If Estatus = 1 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEstado) = 1))
+ ElseIf Estatus = -1 Then
- Public ReadOnly Property IsReusable() As Boolean Implements IHttpHandler.IsReusable
- Get
- Return False
- End Get
- End Property
+ End If
+ If Name <> "-1" Then
+ DTPS = DTPS.Where((Function(a) a!PSCodigo.ToString.ToLower Like ("*" + Name.ToLower + "*")))
+ End If
+ If CveClasificacion > 0 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) = CveClasificacion))
+ ElseIf CveClasificacion = -1 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) >= 0))
+ End If
-#Region "Funciones"
- Public Function GetJson(ByVal dt As DataTable) As String
-
- Dim serializer As System.Web.Script.Serialization.JavaScriptSerializer = New System.Web.Script.Serialization.JavaScriptSerializer()
- Dim rows As New List(Of Dictionary(Of String, Object))
- Dim row As Dictionary(Of String, Object)
-
- For Each dr As DataRow In dt.Rows
- row = New Dictionary(Of String, Object)
- For Each col As DataColumn In dt.Columns
- row.Add(col.ColumnName, dr(col))
- Next
- rows.Add(row)
- Next
- Return serializer.Serialize(rows)
- End Function
- ReadOnly Property UsuarioActual(ByVal context As HttpContext) As Usuario
- Get
- UsuarioActual = DirectCast(context.Session("UsuarioSIG"), Usuario)
- End Get
- End Property
-#End Region
+ If CveClasificacionPresupuesto > 0 Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacionPresupuesto) = CveClasificacionPresupuesto))
+ End If
+ If UsoClasificacion > 0 Then DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!UsoClasificacion) = UsoClasificacion))
-#Region " GET PS SAT "
- Private Function GETPSSAT(ByVal context As HttpContext) As String
- Dim retorno As String = ""
-
- Dim DTPS = DirectCast(context.Application("GlobalDTPSATPS"), EnumerableRowCollection(Of DataRow))
- Dim DtPSRetorno As DataTable
-
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
-
- If Name <> "-1" Then
- DTPS = DTPS.Where((Function(a) a!SATClaveProductoServicio.ToString.ToLower Like ($"*{Name.ToLower}*")))
- End If
-
- DtPSRetorno = New DataView(DTPS.OrderBy(Function(a) a!SATClavePS).CopyToDataTable).ToTable(True, {"CveSATPS", "SATClaveProductoServicio"})
-
- If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
- DtPSRetorno.Columns("CveSATPS").ColumnName = "id"
- DtPSRetorno.Columns("SATClaveProductoServicio").ColumnName = "text"
- retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
- DtPSRetorno.Dispose()
- Return retorno
- End Function
-#End Region
+ If Pagina <> "-1" Then
+ If Pagina = "Compras" Then
+ DTPS = DTPS.Where((Function(a) a!CveTipoPS = 1 AndAlso a!CveEstado = 1))
+ ElseIf Pagina = "Compras2" Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 1 AndAlso (Convert.ToInt32(a!CveEstado) = 1 OrElse Convert.ToInt32(a!CveEstado) = 2)))
+ ElseIf Pagina = "Inventarios" Then
+ DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 2))
+ End If
+ End If
+ Try
+ DtPSRetorno = New DataView(DTPS.OrderBy(Function(a) a!PSCodigo).CopyToDataTable).ToTable(True, {"CvePS", "PSCodigo", "CveTamaño"})
+ DtPSRetorno = DtPSRetorno.FiltraParametros("CveTamaño > 0")
+ Catch ex As Exception
+ DtPSRetorno = Nothing
+ End Try
+ End If
-#Region " GET UM SAT "
- Private Function GETUMSAT(ByVal context As HttpContext) As String
- Dim retorno As String = ""
-
- Dim DTUM = DirectCast(context.Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow))
- Dim DtPSRetorno As DataTable
-
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
-
- If Name <> "-1" Then
- DTUM = DTUM.Where((Function(a) a!ClaveNombre.ToString.ToLower Like ("*" + Name.ToLower + "*")))
- End If
-
- DtPSRetorno = New DataView(DTUM.OrderBy(Function(a) a!Nombre).CopyToDataTable).ToTable(True, {"CveSATUnidadMedida", "ClaveNombre"})
-
- If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
- DtPSRetorno.Columns("CveSATUnidadMedida").ColumnName = "id"
- DtPSRetorno.Columns("ClaveNombre").ColumnName = "text"
- retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
- Return retorno
- End Function
-#End Region
+ End If
+ If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
+ DtPSRetorno.Columns("CvePS").ColumnName = "id"
+ DtPSRetorno.Columns("PSCodigo").ColumnName = "text"
+ retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
+ context.Response.Write(retorno)
+ Else
+ context.Response.Write("[]")
+ End If
+ End If
-#Region " GET FRACCION ARANCELARIA "
- Private Function GetFraccionArancelaria(ByVal context As HttpContext) As String
- Dim retorno As String = ""
-
- Dim DT = DirectCast(context.Application("GlobalDTFraccionArancelaria"), EnumerableRowCollection(Of DataRow))
- Dim DtRetorno As DataTable
-
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
-
- If Name <> "-1" Then
- DT = DT.Where((Function(a) a!ClaveSATFraccionArancelariaDescripcion.ToString.ToLower Like ($"*{Name.ToLower}*")))
- End If
-
- DtRetorno = New DataView(DT.OrderBy(Function(a) a!ClaveSATFraccionArancelaria).CopyToDataTable).ToTable(True, {"CveFraccionArancelaria", "ClaveSATFraccionArancelariaDescripcion"})
-
- If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then
- DtRetorno.Columns("CveFraccionArancelaria").ColumnName = "id"
- DtRetorno.Columns("ClaveSATFraccionArancelariaDescripcion").ColumnName = "text"
- retorno = JsonConvert.SerializeObject(DtRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
- DtRetorno.Dispose()
- Return retorno
- End Function
-#End Region
-
-
-#Region "USADOS"
-
- Private Function GETPSUSADOS(ByVal context As HttpContext) As String
- Dim retorno As String = ""
- Dim DtPSRetorno As DataTable = Nothing
-
- Dim usuario As Usuario = UsuarioActual(context)
- Dim CveEmpresa As String
- If IsNothing(usuario) Then
- context.Response.Write("")
- Else
- CveEmpresa = usuario.CveEmpresa
- Dim FuePorXml = IfNull(context.Request("FuePorXml"), "-1").ToString.ToEntero
- Dim Name = IfNull(context.Request("Name"), "-1").ToString
- Dim CveClasificacion = IfNull(context.Request("CveClasificacion"), "-1").ToString.ToEntero
- Dim CveSubFamilia = IfNull(context.Request("CveSubFamilia"), "-1").ToString.ToEntero
- Dim CveClasificacionPresupuesto = IfNull(context.Request("CveClasificacionPresupuesto"), "-1").ToString.ToEntero
- Dim Pagina = IfNull(context.Request("Pagina"), "-1").ToString
- Dim Estatus = IfNull(context.Request("Estatus"), "1").ToString
- Dim CveSucursal = IfNull(context.Request("cvesucursal"), "-1").ToString.ToEntero
- Dim CveSubProyecto = IfNull(context.Request("cvesubproyecto"), "-1").ToString.ToEntero
- Dim UsoClasificacion = IfNull(context.Request("usoclasificacion"), "-1").ToString.ToEntero
- Dim UsaGlobal As Boolean = True
-
-
-
-
- If UsaGlobal Then
-
-
-
- Dim DTPS = ClsPaginas.GlobalDTPSSimplificado(CveEmpresa).AsEnumerable ' DirectCast(context.Application("GlobalDTPSSimplificado"), EnumerableRowCollection(Of DataRow))
-
-
- If DTPS IsNot Nothing Then
-
- 'APLICACION DE FILTROS
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEmpresa) = CveEmpresa))
- If Estatus = 1 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveEstado) = 1))
- ElseIf Estatus = -1 Then
-
- End If
-
- If Name <> "-1" Then
- DTPS = DTPS.Where((Function(a) a!PSCodigo.ToString.ToLower Like ("*" + Name.ToLower + "*")))
- End If
-
- If CveClasificacion > 0 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) = CveClasificacion))
- ElseIf CveClasificacion = -1 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacion) >= 0))
- End If
-
- If CveClasificacionPresupuesto > 0 Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveClasificacionPresupuesto) = CveClasificacionPresupuesto))
- End If
-
- If UsoClasificacion > 0 Then DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!UsoClasificacion) = UsoClasificacion))
-
- If Pagina <> "-1" Then
- If Pagina = "Compras" Then
- DTPS = DTPS.Where((Function(a) a!CveTipoPS = 1 AndAlso a!CveEstado = 1))
- ElseIf Pagina = "Compras2" Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 1 AndAlso (Convert.ToInt32(a!CveEstado) = 1 OrElse Convert.ToInt32(a!CveEstado) = 2)))
- ElseIf Pagina = "Inventarios" Then
- DTPS = DTPS.Where((Function(a) Convert.ToInt32(a!CveTipoPS) = 2))
- End If
- End If
-
- Try
- DtPSRetorno = New DataView(DTPS.OrderBy(Function(a) a!PSCodigo).CopyToDataTable).ToTable(True, {"CvePS", "PSCodigo", "CveTamaño"})
- DtPSRetorno = DtPSRetorno.FiltraParametros("CveTamaño > 0")
- Catch ex As Exception
- DtPSRetorno = Nothing
- End Try
- End If
-
- End If
- If DtPSRetorno IsNot Nothing AndAlso DtPSRetorno.Rows.Count > 0 Then
- DtPSRetorno.Columns("CvePS").ColumnName = "id"
- DtPSRetorno.Columns("PSCodigo").ColumnName = "text"
- retorno = JsonConvert.SerializeObject(DtPSRetorno).ToString
- context.Response.Write(retorno)
- Else
- context.Response.Write("[]")
- End If
- End If
-
- Return retorno
+ Return retorno
End Function
-#End Region
+#End Region
End Class
\ No newline at end of file
diff --git a/Bancos/ProveedoresAbonar.aspx.vb b/Bancos/ProveedoresAbonar.aspx.vb
index 5e5d27d25..c86542405 100644
--- a/Bancos/ProveedoresAbonar.aspx.vb
+++ b/Bancos/ProveedoresAbonar.aspx.vb
@@ -496,7 +496,7 @@ Partial Class Bancos_ProveedoresAbonar
ViewState("CveCuentaComplementaria") = ObjProveedor.CveCuentaProveedoresComplementaria
If Serie <> "" AndAlso Serie <> "-1" Then
- Dim dr As DataRow = GlobalDTProveedorSucursales(CveProveedor).FiltroPrimero(String.Format("Serie = '{0}'", Serie))
+ Dim dr As DataRow = GlobalDTProveedorSucursales(CveProveedor, UsuarioActual.CveEmpresa).FiltroPrimero(String.Format("Serie = '{0}'", Serie))
If dr IsNot Nothing Then
TxtObservaciones.Text = String.Format("Suc. {0}", dr("ProveedorSucursal"))
HdnObs.Value = TxtObservaciones.Text
diff --git a/Bancos/RepCobradoDetalle.aspx.vb b/Bancos/RepCobradoDetalle.aspx.vb
index 049cdeff8..90671a616 100644
--- a/Bancos/RepCobradoDetalle.aspx.vb
+++ b/Bancos/RepCobradoDetalle.aspx.vb
@@ -112,7 +112,7 @@ Partial Class Ventas_RepRecuperacionDetalle
DivProveedores.Visible = True
Dim ObjProveedores As New ClsCompProveedores
- If ObjProveedores.GetSucursales(CveProveedor) Then
+ If ObjProveedores.GetSucursales(CveProveedor, UsuarioActual.CveEmpresa) Then
If ObjProveedores.DtResultados.Rows.Count > 0 Then
DdlProveedorSucursal.DataSource = ObjProveedores.DtResultados
End If
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index be31eebe3..5fac2308b 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -4134,8 +4134,9 @@ Partial Class Compras_Compras
'si hay necesidad de actualizar el globaldtps
If RegeneraPS Then
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
+ 'Hilo.Start()
+ GeneraGlobalDT(Nothing)
End If
Dim CvePlantillaPrePoliza As Integer
@@ -17498,15 +17499,17 @@ Partial Class Compras_Compras
End Sub
Private Sub RecargaGlobalEquivalencias()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalEquivalencias)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalEquivalencias)
+ 'Hilo.Start()
+ GeneraGlobalEquivalencias()
End Sub
Private Sub GeneraGlobalEquivalencias()
- Dim ObjPS = New ClsProductosServicios
- If ObjPS.GetPSEquivalencias(-1, -1) Then
- GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
- End If
- ObjPS.Dispose()
+ GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = Nothing
+ 'Dim ObjPS = New ClsProductosServicios
+ 'If ObjPS.GetPSEquivalencias(-1, -1) Then
+ ' GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
+ 'End If
+ 'ObjPS.Dispose()
End Sub
#End Region
@@ -17658,23 +17661,26 @@ Partial Class Compras_Compras
End Sub
Private Sub RecargaGlobalUM()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalUM)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalUM)
+ 'Hilo.Start()
+ GeneraGlobalUM()
End Sub
- Private Sub GeneraGlobalUM()
- Dim ObjPS = New ClsProductosServicios
- Dim OjbUM As New ClsUnidadesMedida
-
- If ObjPS.GetPSEquivalencias(-1, -1) Then
- GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
- End If
-
- If OjbUM.GetUnidadesMedidaAlias(-1) Then
- GlobalDTUnidadesMedidaAlias = OjbUM.DtResultados
- End If
-
- ObjPS.Dispose()
- OjbUM.Dispose()
+ Private Sub GeneraGlobalUM()
+ GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = Nothing
+ GlobalDTUnidadesMedidaAlias(UsuarioActual.CveEmpresa) = Nothing
+ 'Dim ObjPS = New ClsProductosServicios
+ 'Dim OjbUM As New ClsUnidadesMedida
+
+ 'If ObjPS.GetPSEquivalencias(-1, -1) Then
+ ' GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
+ 'End If
+
+ 'If OjbUM.GetUnidadesMedidaAlias(-1) Then
+ ' GlobalDTUnidadesMedidaAlias = OjbUM.DtResultados
+ 'End If
+
+ 'ObjPS.Dispose()
+ 'OjbUM.Dispose()
End Sub
#End Region
@@ -19062,7 +19068,7 @@ Partial Class Compras_Compras
RecargaPSGlobal()
End Sub
Private Sub RecargaPSGlobal()
- GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
+ 'GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
'Dim ObjPS As New ClsProductosServicios
'If ObjPS.GetPSSimplificado(-1) Then Application("GlobalDTPSSimplificado") = ObjPS.DtResultados.AsEnumerable()
diff --git a/Compras/Proveedores.aspx.vb b/Compras/Proveedores.aspx.vb
index 389ffd36f..859af37e3 100644
--- a/Compras/Proveedores.aspx.vb
+++ b/Compras/Proveedores.aspx.vb
@@ -1498,7 +1498,7 @@ Partial Class Compras_Proveedores
Next
End If
- If ObjProveedores.GetSucursales(-1) Then Application("GlobalDTProveedorSucursales") = ObjProveedores.DtResultados
+ GlobalDTProveedorSucursales(-1, UsuarioActual.CveEmpresa) = Nothing
End If
Next
End If
@@ -1533,8 +1533,8 @@ Partial Class Compras_Proveedores
If ObjContaAC IsNot Nothing Then ObjContaAC.Commit()
'ACTUALIZAR GLOBAL
- If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then
- GlobalDTCompProveedores(-1) = ObjProveedores.DtResultados
+ If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa) Then
+ GlobalDTCompProveedores(UsuarioActual.CveEmpresa) = ObjProveedores.DtResultados
Else
ErrorBancos = True
End If
@@ -1617,8 +1617,8 @@ Partial Class Compras_Proveedores
If tIdContaProveedor > 0 AndAlso CreoCuenta Then ObjProveedores.UpdateProveedorIdCuentaAC(CveProveedor, tIdContaProveedor)
- If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then
- GlobalDTCompProveedores(-1) = ObjProveedores.DtResultados
+ If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa) Then
+ GlobalDTCompProveedores(UsuarioActual.CveEmpresa) = ObjProveedores.DtResultados
End If
Alert("Los cambios se guardaron correctamente.", TipoMensaje.MsgInformacion)
@@ -2016,7 +2016,7 @@ Partial Class Compras_Proveedores
Public Sub CargaProveedorSucursales()
CveTempSucursal = -1
- TempDTSucursales = GlobalDTProveedorSucursales(CveProveedor)
+ TempDTSucursales = GlobalDTProveedorSucursales(CveProveedor, UsuarioActual.CveEmpresa)
TempDTSucursales.Columns.Add("CveSucursalTemp", GetType(String))
TempDTSucursalesOrigin = TempDTSucursales.Copy()
GVSucursales.DataSource = TempDTSucursales
@@ -2081,7 +2081,7 @@ Partial Class Compras_Proveedores
If EsEditarSucursal = 0 Then
If ObjProveedor.AddSucursal(CveProveedor, TxtProveedorSucursal2.Text.Trim, TextSucursalDireccion.Text.Trim, TextSucursalTelefono.Text.Trim, TxtSucursalSerie.Text.Trim, TxtContactoSucursal.Text, TxtCorreoSucursal.Text, UsuarioActual.CveUsuario, TxtLimiteCreditoSuc.Text.ToDouble, TxtPlazoCobranzaSuc.Text.ToEntero) Then
'recargo el globaldt
- If ObjProveedor.GetSucursales(-1) Then Application("GlobalDTProveedorSucursales") = ObjProveedor.DtResultados
+ GlobalDTProveedorSucursales(-1, UsuarioActual.CveEmpresa) = Nothing
Alert("La nueva Sucursal del Proveedor se guardó correctamente.", TipoMensaje.MsgInformacion)
CargaProveedorSucursales()
End If
@@ -2089,7 +2089,7 @@ Partial Class Compras_Proveedores
If CveProveedorSucursal > 0 And ObjProveedor.UpdateSucursal(TxtProveedorSucursal2.Text, TextSucursalDireccion.Text.Trim, TextSucursalTelefono.Text.Trim, TxtSucursalSerie.Text, False, TxtCorreoSucursal.Text, TxtContactoSucursal.Text, CveProveedorSucursal, CveProveedor, TxtLimiteCreditoSuc.Text.ToDouble, TxtPlazoCobranzaSuc.Text.ToEntero) Then
'recargo el globaldt
- If ObjProveedor.GetSucursales(-1) Then Application("GlobalDTProveedorSucursales") = ObjProveedor.DtResultados
+ GlobalDTProveedorSucursales(-1, UsuarioActual.CveEmpresa) = Nothing
CargaProveedorSucursales()
Alert("Los cambios se guardaron correctamente.", TipoMensaje.MsgInformacion)
End If
@@ -2149,7 +2149,7 @@ Partial Class Compras_Proveedores
If ObjProveedor.RemoveProveedorContacto(-1, CveProveedorSucursal) Then
If ObjProveedor.RemoveSucursal(CveProveedor, CveProveedorSucursal) Then
'GVSucursales.EditIndex = -1
- If ObjProveedor.GetSucursales(-1) Then Application("GlobalDTProveedorSucursales") = ObjProveedor.DtResultados
+ GlobalDTProveedorSucursales(-1, UsuarioActual.CveEmpresa) = Nothing
CargaProveedorSucursales()
CargaContactos(ObjProveedor)
Alert("Los cambios se guardaron correctamente.", TipoMensaje.MsgInformacion)
@@ -3162,7 +3162,7 @@ Partial Class Compras_Proveedores
End Sub
Protected Sub MostrarFiltro()
- If GlobalDTProveedorSucursales(CveProveedor).Rows.Count > 1 Then
+ If GlobalDTProveedorSucursales(CveProveedor, UsuarioActual.CveEmpresa).Rows.Count > 1 Then
'tHistorial.Visible = True
'tCxP.Visible = True
'tAnticipos.Visible = True
@@ -3187,7 +3187,7 @@ Partial Class Compras_Proveedores
End If
End Sub
Protected Sub CargaRB(R As DropDownList)
- R.DataSource = GlobalDTProveedorSucursales(CveProveedor)
+ R.DataSource = GlobalDTProveedorSucursales(CveProveedor, UsuarioActual.CveEmpresa)
R.DataBind()
R.Items.Insert(0, New ListItem("Todas", "-1"))
If CveProveedorSucursal > 0 Then R.SelectedValue = CveProveedorSucursal.ToString Else R.SelectedValue = "-1"
diff --git a/Contratos/Contrato.aspx.vb b/Contratos/Contrato.aspx.vb
index 8e01e82c8..d4594f75c 100644
--- a/Contratos/Contrato.aspx.vb
+++ b/Contratos/Contrato.aspx.vb
@@ -1679,7 +1679,7 @@ Partial Class Contratos_Default
End Sub
Private Sub ElProductoChange()
DdlUM.Items.Clear()
- DdlUM.DataSource = GlobalDTProductosServiciosEquivalencias(DdlProductows.SelectedValue.ToEntero, -1)
+ DdlUM.DataSource = GlobalDTProductosServiciosEquivalencias(DdlProductows.SelectedValue.ToEntero, -1, UsuarioActual.CveEmpresa)
DdlUM.DataBind()
UpTitulos.Update()
End Sub
@@ -1711,7 +1711,7 @@ Partial Class Contratos_Default
End Sub
Private Sub ElProductoChangeInsumos()
DdlUMInsumos.Items.Clear()
- DdlUMInsumos.DataSource = GlobalDTProductosServiciosEquivalencias(DdlProductowsInsumos.SelectedValue.ToEntero, -1)
+ DdlUMInsumos.DataSource = GlobalDTProductosServiciosEquivalencias(DdlProductowsInsumos.SelectedValue.ToEntero, -1, UsuarioActual.CveEmpresa)
DdlUMInsumos.DataBind()
UpTitulos.Update()
End Sub
@@ -1913,7 +1913,7 @@ Partial Class Contratos_Default
End If
End If
If e.Row.RowState = DataControlRowState.Edit OrElse e.Row.RowState = 5 Then
- e.Row.FCDropDownList("DdlUMEdit").DataSource = GlobalDTProductosServiciosEquivalencias(e.Row.DataKey("CvePS").ToString.ToEntero, -1)
+ e.Row.FCDropDownList("DdlUMEdit").DataSource = GlobalDTProductosServiciosEquivalencias(e.Row.DataKey("CvePS").ToString.ToEntero, -1, UsuarioActual.CveEmpresa)
e.Row.FCDropDownList("DdlUMEdit").DataBind()
e.Row.FCDropDownList("DdlUMEdit").SelectedValue = e.Row.DataKey("CveUM")
End If
@@ -2099,7 +2099,7 @@ Partial Class Contratos_Default
End If
If e.Row.RowState = DataControlRowState.Edit OrElse e.Row.RowState = 5 Then
- e.Row.FCDropDownList("DdlUMEdit").DataSource = GlobalDTProductosServiciosEquivalencias(e.Row.DataKey("CvePS").ToString.ToEntero, -1)
+ e.Row.FCDropDownList("DdlUMEdit").DataSource = GlobalDTProductosServiciosEquivalencias(e.Row.DataKey("CvePS").ToString.ToEntero, -1, UsuarioActual.CveEmpresa)
e.Row.FCDropDownList("DdlUMEdit").DataBind()
e.Row.FCDropDownList("DdlUMEdit").SelectedValue = e.Row.DataKey("CveUM")
End If
diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb
index b78138a65..930cd697c 100644
--- a/General/SaldosIniciales.aspx.vb
+++ b/General/SaldosIniciales.aspx.vb
@@ -725,7 +725,7 @@ Partial Class General_SaldosIniciales
If Not CveUnidadMedida > 0 AndAlso UnidadMedida <> "" Then
If ObjUM.AddUnidadMedida(UnidadMedida, UnidadMedida, "", "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1).ToEntero > 0 Then
- If ObjUM.GetUnidadesMedida() Then Application("GlobalDTUnidadesMedida") = ObjUM.DtResultados
+ If ObjUM.GetUnidadesMedida(UsuarioActual.CveEmpresa) Then GlobalDTUnidadesMedida(UsuarioActual.CveEmpresa) = Nothing
CveUnidadMedida = GlobalDTUnidadesMedida(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveUnidadMedida", $"UnidadMedida = '{UnidadMedida}'").ToString.ToEntero
End If
End If
@@ -1179,8 +1179,9 @@ Partial Class General_SaldosIniciales
If Not ErrorClientes Then
- ObjClientes.Commit()
- If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then Application("GlobalDTCliente") = ObjClientes.DtResultados
+ ObjClientes.Commit()
+ 'If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then Application("GlobalDTCliente") = ObjClientes.DtResultados
+ GlobalDTCliente(UsuarioActual.CveEmpresa) = Nothing
If Contador > 0 Then
Alert(String.Format("Se agregaron: {0} Clientes correctamente. Se Omitieron: {1} Clientes ya que ya se encontraban registrados.", NumRows - Contador, Contador), TipoMensaje.MsgInformacion)
Else
diff --git a/Global.asax b/Global.asax
index b5dc90938..ebb88fa8b 100644
--- a/Global.asax
+++ b/Global.asax
@@ -480,8 +480,9 @@
Dim ObjAcumuladores As New ClsAcumuladores()
If ObjAcumuladores.TamañoGet(-1, -1) Then Application("GlobalDTAcumTamaños") = ObjAcumuladores.DtResultados Else Application("GlobalDTAcumTamaños") = Nothing
- If ObjAcumuladores.TiposDefectoGet(-1, -1) Then Application("GlobalDTAcumTiposDefecto") = ObjAcumuladores.DtResultados Else Application("GlobalDTAcumTiposDefecto") = Nothing
- If ObjAcumuladores.TiposUsoGet(-1, -1) Then Application("GlobalDTAcumTiposUso") = ObjAcumuladores.DtResultados Else Application("GlobalDTAcumTiposUso") = Nothing
+ If ObjAcumuladores.TiposDefectoGet(-1, -1) Then Application("GlobalDTAcumTiposDefecto") = ObjAcumuladores.DtResultados Else Application("GlobalDTAcumTiposDefecto") = Nothing
+ If ObjAcumuladores.TiposUsoGet(-1, -1) Then Application("GlobalDTAcumTiposUso") = ObjAcumuladores.DtResultados Else Application("GlobalDTAcumTiposUso") = Nothing
+ 'If ObjAcumuladores.GarantiasMesesGet(-1, -1) Then Application("GlobalDTAcumGarantiasMesesTipoUso") = ObjAcumuladores.DtResultados.FiltraParametros("", DistinctColumns:={"CveMarca", "CveTipoUso", "TipoUso"}) Else Application("GlobalDTAcumGarantiasMesesTipoUso") = Nothing
ObjAcumuladores.Dispose()
'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/Inventarios/Consignaciones.aspx.vb b/Inventarios/Consignaciones.aspx.vb
index 7706639b3..e39887743 100644
--- a/Inventarios/Consignaciones.aspx.vb
+++ b/Inventarios/Consignaciones.aspx.vb
@@ -1431,7 +1431,7 @@ Partial Class Inventarios_Consignaciones
HFProducto.Value = DdlProducto.SelectedValue
End If
- DdlUnidad.DataSource = GlobalDTProductosServiciosEquivalencias(HFProducto.Value.ToEntero, -1)
+ DdlUnidad.DataSource = GlobalDTProductosServiciosEquivalencias(HFProducto.Value.ToEntero, -1, UsuarioActual.CveEmpresa)
DdlUnidad.DataBind()
UpDatos.Update()
End Sub
diff --git a/Inventarios/Equivalencias.aspx.vb b/Inventarios/Equivalencias.aspx.vb
index 6ce650e01..b35114939 100644
--- a/Inventarios/Equivalencias.aspx.vb
+++ b/Inventarios/Equivalencias.aspx.vb
@@ -193,11 +193,11 @@ Partial Class Inventarios_Equivalencias
#Region " RECARGA GLOBAL "
Private Sub RecargaGlobal()
- Dim equivalencias As New ClsProductosServicios
- If equivalencias.GetPSEquivalencias(-1, -1) Then
- GlobalDTProductosServiciosEquivalencias(-1, -1) = equivalencias.DtResultados
- End If
- equivalencias.Dispose()
+ 'Dim equivalencias As New ClsProductosServicios
+ 'If equivalencias.GetPSEquivalencias(-1, -1) Then
+ ' GlobalDTProductosServiciosEquivalencias(-1, -1) = equivalencias.DtResultados
+ 'End If
+ 'equivalencias.Dispose()
End Sub
#End Region
diff --git a/Inventarios/KardexAlmacenHorizontal.aspx.vb b/Inventarios/KardexAlmacenHorizontal.aspx.vb
index 6a63652a6..229a2ddb1 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx.vb
+++ b/Inventarios/KardexAlmacenHorizontal.aspx.vb
@@ -128,7 +128,7 @@ Partial Class Inventarios_KardexAlmacen
Dim CveAlmacen As Integer = ddlAlmacen.SelectedValue.ToEntero
Dim CveProveedorCompra As Integer = If(DdlProveedor.SelectedValue.ToEntero > 0, DdlProveedor.SelectedValue.ToEntero, -1)
- If ObjMovimientos.GetKardexAlmacenHorizontal(CvePS, FechaF, CveAlmacen, DdlUnidadMedida.SelectedValue.ToEntero, CveProveedorCompra, DdlTipoAlmacen.SelectedValue.ToEntero(), If(ChkIncluyeTransitorios.Checked, 1, 0), DdlClasificacion_SelectedIndexChanged.selectedvalue.toentero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CondicionExistencias:=DdlExistencia.SelectedValue) Then
+ If ObjMovimientos.GetKardexAlmacenHorizontal(CvePS, FechaF, CveAlmacen, DdlUnidadMedida.SelectedValue.ToEntero, CveProveedorCompra, DdlTipoAlmacen.SelectedValue.ToEntero(), If(ChkIncluyeTransitorios.Checked, 1, 0), DdlClasificacion.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CondicionExistencias:=DdlExistencia.SelectedValue) Then
If ObjMovimientos.DtResultados IsNot Nothing AndAlso ObjMovimientos.DtResultados.Rows.Count > 0 Then
dt = ObjMovimientos.DtResultados
Dim ListaBorrar As New List(Of DataColumn)
diff --git a/Inventarios/RecepcionAlmacen.aspx.vb b/Inventarios/RecepcionAlmacen.aspx.vb
index 48d9ecba0..44e5f7e9c 100644
--- a/Inventarios/RecepcionAlmacen.aspx.vb
+++ b/Inventarios/RecepcionAlmacen.aspx.vb
@@ -2137,7 +2137,7 @@ Partial Class Inventarios_RecepcionAlmacen
If EntregaDirecta Then
If Not ErrorMovInv Then
Dim CveVenta As Integer = 0
- Dim Dt As DataTable
+ Dim Dt As DataTable = Nothing
If ObjInventario.GetMovimientosDetalle(CveMovimiento, UsuarioActual.CveEmpresa) Then
If ObjInventario.DtResultados.Rows.Count > 0 Then
diff --git a/Inventarios/TrasladoSolicitud.aspx.vb b/Inventarios/TrasladoSolicitud.aspx.vb
index ecb98f793..50115c258 100644
--- a/Inventarios/TrasladoSolicitud.aspx.vb
+++ b/Inventarios/TrasladoSolicitud.aspx.vb
@@ -863,7 +863,7 @@ Partial Class Inventarios_TrasladoSolicitud
Dim drPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=DdlProductoServicio.SelectedValue.ToEntero).FiltroPrimero("")
DdlUM.Items.Clear()
If UsuarioActual.Empresa.UsaInventarios Then
- DdlUM.DataSource = GlobalDTProductosServiciosEquivalencias(DdlProductoServicio.SelectedValue.ToEntero, -1)
+ DdlUM.DataSource = GlobalDTProductosServiciosEquivalencias(DdlProductoServicio.SelectedValue.ToEntero, -1, UsuarioActual.CveEmpresa)
Else
DdlUM.DataSource = GlobalDTUnidadesMedida(UsuarioActual.CveEmpresa)
End If
diff --git a/OC/OC.aspx.vb b/OC/OC.aspx.vb
index 32f164658..968a7bc62 100644
--- a/OC/OC.aspx.vb
+++ b/OC/OC.aspx.vb
@@ -1299,7 +1299,7 @@ Partial Class OC
'CARGAMOS LA SUCURSAL SI NO EXISTE SE AGREGA MATRIZ
Dim CveProveedorSucursal As Integer = IIf(objOC.CveProveedorSucursal.ToEntero = -1, 0, objOC.CveProveedorSucursal.ToEntero).ToString.ToEntero
DivProveedorSucursal.Visible = True
- DdlProveedorSucursal.DataSource = GlobalDTProveedorSucursales(objOC.CveProveedor)
+ DdlProveedorSucursal.DataSource = GlobalDTProveedorSucursales(objOC.CveProveedor, UsuarioActual.CveEmpresa)
DdlProveedorSucursal.DataBind()
DdlProveedorSucursal.Items.Insert(0, New ListItem("Matriz", "0"))
DdlProveedorSucursal.SelectedValueExist(CveProveedorSucursal)
@@ -1334,7 +1334,7 @@ Partial Class OC
If objOC.CveProveedorSucursal.ToEntero > 0 Then
DivProveedorSucursal.Visible = True
- DdlProveedorSucursal.DataSource = GlobalDTProveedorSucursales(objOC.CveProveedor)
+ DdlProveedorSucursal.DataSource = GlobalDTProveedorSucursales(objOC.CveProveedor, UsuarioActual.CveEmpresa)
DdlProveedorSucursal.DataBind()
DdlProveedorSucursal.SelectedValueExist(objOC.CveProveedorSucursal.ToString)
End If
@@ -1830,7 +1830,7 @@ Partial Class OC
If Cvepsgvd > 0 Then
Dim CboUM As DropDownList = Gvr.FCDropDownList("CboUnidadMedidaEdit")
Dim TxtPU As TextBox = Gvr.FCTextBox("TxtImporteEdit")
- CboUM.DataSource = GlobalDTProductosServiciosEquivalencias(Cvepsgvd, -1)
+ CboUM.DataSource = GlobalDTProductosServiciosEquivalencias(Cvepsgvd, -1, UsuarioActual.CveEmpresa)
CboUM.DataBind()
End If
End Sub
@@ -1879,7 +1879,7 @@ Partial Class OC
CboUnidadMedida.Items.Clear()
- CboUnidadMedida.DataSource = GlobalDTProductosServiciosEquivalencias(DdlP2.SelectedValue.ToEntero, -1)
+ CboUnidadMedida.DataSource = GlobalDTProductosServiciosEquivalencias(DdlP2.SelectedValue.ToEntero, -1, UsuarioActual.CveEmpresa)
CboUnidadMedida.DataBind()
If CveEmpresaActual = 119 Then
@@ -5131,7 +5131,7 @@ Partial Class OC
DivProveedorSucursal.Visible = False
DivProveedorContacto.Visible = False
Else
- If Objeto.GetSucursales(DdlProveedores.SelectedValue.ToEntero) Then
+ If Objeto.GetSucursales(DdlProveedores.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then
If Objeto.DtResultados.Rows.Count > 0 Then
DivProveedorSucursal.Visible = True
DdlProveedorSucursal.Items.Insert(0, New ListItem("Seleccione", "-1"))
@@ -5597,7 +5597,7 @@ Partial Class OC
Dim Body As String = GeneraCorreoProveedor(CveOrdenCompra, CveProveedor) 'genero los datos de la OC
Dim Correo As String = ""
'si tiene seleccionada una sucursal, obtengo su correo, sino tiene especificado tomo el correo principal del proveedor
- If DdlProveedorSucursal.SelectedValue.ToEntero > 0 Then Correo = GlobalDTProveedorSucursales(CveProveedor).FiltroPrimeroValor("Correo", $"CveProveedorSucursal={DdlProveedorSucursal.SelectedValue}")
+ If DdlProveedorSucursal.SelectedValue.ToEntero > 0 Then Correo = GlobalDTProveedorSucursales(CveProveedor, UsuarioActual.CveEmpresa).FiltroPrimeroValor("Correo", $"CveProveedorSucursal={DdlProveedorSucursal.SelectedValue}")
If Correo = "" Then Correo = GlobalDTCompProveedores(CveEmpresaActual).FiltraParametros($"CveProveedor = {CveProveedor}")(0)("ContactoMail").ToString
Try
@@ -7315,10 +7315,10 @@ Partial Class OC
RecargaPSGlobal()
End Sub
Private Sub RecargaPSGlobal()
- GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
+ 'GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
'Dim ObjPS As New ClsProductosServicios
- 'If ObjPS.GetPSSimplificado(-1) Then Application("GlobalDTPSSimplificado") = ObjPS.DtResultados.AsEnumerable()
+ 'If ObjPS.GetPSSimplificado(UsuarioActual.CveEmpresa) Then Application(String.Format("GlobalDTPSSimplificado{0}", UsuarioActual.CveEmpresa)) = ObjPS.DtResultados.AsEnumerable()
'ObjPS.Dispose()
End Sub
@@ -7329,11 +7329,12 @@ Partial Class OC
Hilo.Start()
End Sub
Private Sub GeneraGlobalEquivalencias()
- Dim ObjPS = New ClsProductosServicios
- If ObjPS.GetPSEquivalencias(-1, -1) Then
- GlobalDTProductosServiciosEquivalencias(-1, -1) = ObjPS.DtResultados
- End If
- ObjPS.Dispose()
+ 'Dim dtt As DataTable = GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa)
+ 'Dim ObjPS = New ClsProductosServicios
+ 'If ObjPS.GetPSEquivalencias(-1, UsuarioActual.CveEmpresa) Then
+ ' GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
+ 'End If
+ 'ObjPS.Dispose()
End Sub
#End Region
diff --git a/PyME/Sistemas/WizardRegistro.aspx.vb b/PyME/Sistemas/WizardRegistro.aspx.vb
index 23848c795..15c8a9d38 100644
--- a/PyME/Sistemas/WizardRegistro.aspx.vb
+++ b/PyME/Sistemas/WizardRegistro.aspx.vb
@@ -326,7 +326,7 @@ Partial Class Sistemas_WizardRegistro
End If
CargaGVClasificacion()
- If objunidadesMedida.GetUnidadesMedida() Then
+ If objunidadesMedida.GetUnidadesMedida(CveEmpresa) Then
DtUM = objunidadesMedida.DtResultados.FiltraParametros(String.Format("CveEmpresa = {0}", CveEmpresa))
GvUM.DataSource = DtUM
GvUM.DataBind()
@@ -1259,7 +1259,7 @@ Partial Class Sistemas_WizardRegistro
Else
Dim ObjFolio As New ClsGralFolios
If ModalidadModal = "Insertar" Then
- If ObjFolio.AddFolios(DdlSubProyecto.SelectedValue.ToEntero, DdlTipoDocto.SelectedValue, TxtFolioInicial.Text.ToEntero, TxtFolioInicial.Text.ToEntero, TxtFolioFinal.Text.ToEntero, "", 100, CveEmpresa) Then
+ If ObjFolio.AddFolios(DdlSubProyecto.SelectedValue.ToEntero, DdlTipoDocto.SelectedValue, "", TxtFolioInicial.Text.ToEntero, TxtFolioInicial.Text.ToEntero, TxtFolioFinal.Text.ToEntero, "", 100, CveEmpresa) Then
Alert("El Folio se agrego correctamente.", TipoMensaje.MsgInformacion)
RegistraScript(String.Format("$('#{0}').modal('hide');", "DivAgregarFolio"))
End If
@@ -1267,7 +1267,7 @@ Partial Class Sistemas_WizardRegistro
If ModalidadModal = "Actualizar" Then
If CveModal > 0 Then
Dim CveFolio = CveModal
- If ObjFolio.UpdateFolios(DdlSubProyecto.SelectedValue.ToEntero, DdlTipoDocto.SelectedValue, TxtFolioInicial.Text.ToEntero, TxtFolioActual.Text.ToEntero, TxtFolioFinal.Text.ToEntero, "", If(ChkEstatus.Checked, True, False), 100, CveFolio) Then
+ If ObjFolio.UpdateFolios(DdlSubProyecto.SelectedValue.ToEntero, DdlTipoDocto.SelectedValue, "", TxtFolioInicial.Text.ToEntero, TxtFolioActual.Text.ToEntero, TxtFolioFinal.Text.ToEntero, "", If(ChkEstatus.Checked, True, False), 100, CveFolio) Then
Alert("El Folio se actualizo correctamente.", TipoMensaje.MsgInformacion)
RegistraScript(String.Format("$('#{0}').modal('hide');", "DivAgregarFolio"))
End If
@@ -1781,7 +1781,7 @@ Partial Class Sistemas_WizardRegistro
Private Sub CargaDdlUM()
DdlUM.Items.Clear()
Dim ObjUM As New ClsUnidadesMedida
- If ObjUM.GetUnidadesMedida() Then
+ If ObjUM.GetUnidadesMedida(CveEmpresa) Then
DdlUM.Items.Insert(0, New ListItem("Seleccione", "-1"))
DdlUM.DataSource = ObjUM.DtResultados.FiltraParametros("CveEmpresa = " & CveEmpresa)
DdlUM.DataBind()
@@ -1852,7 +1852,7 @@ Partial Class Sistemas_WizardRegistro
Alert(String.Format("Se agregaron: {0} Unidades de Medida correctamente.", NumRows), TipoMensaje.MsgInformacion)
- If ObjUnidadesMedida.GetUnidadesMedida() Then
+ If ObjUnidadesMedida.GetUnidadesMedida(CveEmpresa) Then
GvUM.DataSource = ObjUnidadesMedida.DtResultados.FiltraParametros($"CveEmpresa = {CveEmpresa}")
GvUM.DataBind()
End If
@@ -1893,7 +1893,7 @@ Partial Class Sistemas_WizardRegistro
Private Sub CargaGVUM()
Dim ObjUM As New ClsUnidadesMedida
- If ObjUM.GetUnidadesMedida() Then
+ If ObjUM.GetUnidadesMedida(CveEmpresa) Then
GvUM.DataSource = ObjUM.DtResultados.FiltraParametros(String.Format("CveEmpresa={0}", CveEmpresa))
GvUM.DataBind()
End If
@@ -2063,7 +2063,7 @@ Partial Class Sistemas_WizardRegistro
'Obtengo Unidades de medida
Dim ObjUM As New ClsUnidadesMedida
Dim DTUM As New DataTable
- If ObjUM.GetUnidadesMedida() Then
+ If ObjUM.GetUnidadesMedida(CveEmpresa) Then
DTUM = ObjUM.DtResultados.FiltraParametros(String.Format("CveEmpresa={0}", CveEmpresa))
End If
ObjUM.Dispose()
@@ -2780,7 +2780,8 @@ Partial Class Sistemas_WizardRegistro
If Not ErrorClientes Then
ObjClientes.Commit()
- If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then Application("GlobalDTCliente") = ObjClientes.DtResultados
+ 'If ObjClientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then Application("GlobalDTCliente") = ObjClientes.DtResultados
+
If Contador > 0 Then
Alert(String.Format("Se agregaron: {0} Clientes correctamente. Se Omitieron: {1} Clientes ya que ya se encontraban registrados.", NumRows - Contador, Contador), TipoMensaje.MsgInformacion)
Else
@@ -2957,7 +2958,7 @@ Partial Class Sistemas_WizardRegistro
ObjPS.Dispose()
Dim ObjUM As New ClsUnidadesMedida
- If ObjUM.GetUnidadesMedida() Then
+ If ObjUM.GetUnidadesMedida(CveEmpresa) Then
CveUnidadMedida = ObjUM.DtResultados.FiltraParametros($"CveEmpresa={CveEmpresa}").FiltroPrimeroValor("CveUnidadMedida").ToString.ToEntero
End If
ObjUM.Dispose()
@@ -3061,7 +3062,7 @@ Partial Class Sistemas_WizardRegistro
ObjPS.Dispose()
Dim ObjUM As New ClsUnidadesMedida
- If ObjUM.GetUnidadesMedida() Then
+ If ObjUM.GetUnidadesMedida(CveEmpresa) Then
CveUnidadMedida = ObjUM.DtResultados.FiltraParametros($"CveEmpresa={CveEmpresa}").FiltroPrimeroValor("CveUnidadMedida").ToString.ToEntero
End If
ObjUM.Dispose()
diff --git a/Sistemas/CatSesiones.aspx.vb b/Sistemas/CatSesiones.aspx.vb
index c60aab305..ea507a6fc 100644
--- a/Sistemas/CatSesiones.aspx.vb
+++ b/Sistemas/CatSesiones.aspx.vb
@@ -221,6 +221,7 @@ Partial Class Sistemas_CatSesiones
Private Sub CargaProductosServiciosSimplificado()
GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
+ Dim dt As DataTable = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa)
'Dim ObjPS As New ClsProductosServicios
'If ObjPS.GetPSSimplificado(-1) Then Application("GlobalDTPSSimplificado") = ObjPS.DtResultados.AsEnumerable() Else Application("GlobalDTPSSimplificado") = Nothing
'ObjPS.Dispose()
@@ -321,12 +322,13 @@ Partial Class Sistemas_CatSesiones
Private Sub CargaSubProyectos()
'Carga SubProyectos
+ GlobalDTSubProyectos(-1, -1, UsuarioActual.CveEmpresa) = Nothing
Dim ObjSubProyectos As New ClsSubProyectos
- If ObjSubProyectos.GetSubProyectos Then
- Application("GlobalDTSubProyectos") = ObjSubProyectos.DtResultados
- Else
- Application("GlobalDTSubProyectos") = Nothing
- End If
+ 'If ObjSubProyectos.GetSubProyectos Then
+ ' Application("GlobalDTSubProyectos") = ObjSubProyectos.DtResultados
+ 'Else
+ ' Application("GlobalDTSubProyectos") = Nothing
+ 'End If
If ObjSubProyectos.GetSubProyectosUsuarios Then
Application("GlobalDTProyectosUsuarios") = ObjSubProyectos.DtResultados.FiltraParametros("", "", {"Proyecto", "CveProyecto", "CveUsuario", "CveEmpresa", "CveEstatusProyecto"})
Application("GlobalDTSubProyectosUsuarios") = ObjSubProyectos.DtResultados
@@ -447,7 +449,7 @@ Partial Class Sistemas_CatSesiones
Dim ObjProveedores As New ClsCompProveedores
If ObjProveedores.GetProveedores(ClsCompProveedores.TipoConsulta.ParaGlobalDT, -1, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, -1) Then Application("GlobalDTCompProveedores") = ObjProveedores.DtResultados Else Application("GlobalDTCompProveedores") = Nothing
If ObjProveedores.GetClasificacionProveedores Then Application("GlobalDTProveedorClasificacion") = ObjProveedores.DtResultados Else Application("GlobalDTProveedorClasificacion") = Nothing
- If ObjProveedores.GetSucursales(-1) Then Application("GlobalDTProveedorSucursales") = ObjProveedores.DtResultados Else Application("GlobalDTProveedorSucursales") = Nothing
+ If ObjProveedores.GetSucursales(-1, -1) Then Application("GlobalDTProveedorSucursales") = ObjProveedores.DtResultados Else Application("GlobalDTProveedorSucursales") = Nothing
ObjProveedores.Dispose()
End Sub
@@ -461,7 +463,15 @@ Partial Class Sistemas_CatSesiones
End Sub
Protected Sub BtnRefresh_Click(sender As Object, e As EventArgs) Handles BtnRefresh.Click
- Gv.DataSource = DirectCast(Application(DdlVariable.SelectedValue), DataTable)
+ Dim dt As DataTable = Nothing
+ Select Case DdlVariable.SelectedValue
+ Case ""
+ dt = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa)
+ Case Else
+ dt = DirectCast(Application(DdlVariable.SelectedValue & UsuarioActual.CveEmpresa), DataTable)
+ End Select
+
+ Gv.DataSource = dt
Gv.DataBind()
End Sub
diff --git a/Ventas/CatUnidadesMedida.aspx.vb b/Ventas/CatUnidadesMedida.aspx.vb
index 2120cc5da..6f6318edc 100644
--- a/Ventas/CatUnidadesMedida.aspx.vb
+++ b/Ventas/CatUnidadesMedida.aspx.vb
@@ -30,7 +30,7 @@ Partial Class CatUnidadesMedida
Dim ObjUnidadesMedida As New ClsUnidadesMedida
- If ObjUnidadesMedida.GetUnidadesMedida() Then
+ If ObjUnidadesMedida.GetUnidadesMedida(UsuarioActual.CveEmpresa) Then
GlobalDTUnidadesMedida = ObjUnidadesMedida.DtResultados
ViewState("DTUnidadesMedida") = ObjUnidadesMedida.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
GvDatos.DataSource = ViewState("DTUnidadesMedida")
@@ -81,7 +81,7 @@ Partial Class CatUnidadesMedida
Dim ObjUnidadesMedida As New ClsUnidadesMedida
- If ObjUnidadesMedida.GetUnidadesMedidaAlias(cve) Then
+ If ObjUnidadesMedida.GetUnidadesMedidaAlias(UsuarioActual.CveEmpresa, cve) Then
ViewState("DTUnidadesMedidaAlias") = ObjUnidadesMedida.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
Else
ViewState("DTUnidadesMedidaAlias") = Nothing
diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb
index 30ad1dc8b..d2d59eace 100644
--- a/Ventas/Clientes.aspx.vb
+++ b/Ventas/Clientes.aspx.vb
@@ -2597,19 +2597,21 @@ Partial Class Clientes
#Region "G L O B L A L"
Private Sub RecargaGlobal()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
+ 'Hilo.Start()
+ GeneraGlobalDT()
End Sub
Private Sub GeneraGlobalDT()
- Dim Objclientes As New ClsClientes
- If Objclientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1) Then
- Application("GlobalDTCliente") = Objclientes.DtResultados
- End If
- Objclientes.Dispose()
- End Sub
+ GlobalDTCliente(UsuarioActual.CveEmpresa) = Nothing
+ 'Dim Objclientes As New ClsClientes
+ 'If Objclientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1) Then
+ ' Application("GlobalDTCliente") = Objclientes.DtResultados
+ 'End If
+ 'Objclientes.Dispose()
+ End Sub
#End Region
-
-
+
+
#Region "G R I D V I E W S"
Protected Sub GVHistorial_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GVHistorial.RowDataBound
If e.Row.RowType = DataControlRowType.DataRow Then
diff --git a/Ventas/PV.aspx.vb b/Ventas/PV.aspx.vb
index c63687031..e00126eae 100644
--- a/Ventas/PV.aspx.vb
+++ b/Ventas/PV.aspx.vb
@@ -2866,6 +2866,10 @@ Partial Class PV
End If
End If
+ If ChkAjuste.Checked Then
+ CalculaMesesUso()
+ UpAjuste.Update()
+ End If
End If
@@ -4662,9 +4666,19 @@ Partial Class PV
RFVLocalidadC.Visible = False
RFVEstadoC.Visible = False
RFVPaisC.Visible = False
+ TxtNombreCliente.Focus()
DdlMetodoCliente.SelectedValueExist(1)
DdlFormaCliente.SelectedValueExist(1)
+ 'carga datos particulares de la sucursal
+ Dim dr As DataRow = GlobalDTSubProyectos(-1, CveSubProyecto:=DdlSubProyectoDatos.SelectedValue.ToEntero).FiltroPrimero("")
+
+ If dr IsNot Nothing Then
+ TxtCPCliente.Text = dr("CP").ToString
+ TxtEstadoCliente.Text = dr("Estado").ToString
+ TxtCiudadCliente.Text = dr("Municipio").ToString
+ TxtLocalidadCliente.Text = dr("Localidad").ToString
+ End If
Else
Dim ObjCliente As New ClsClientes
If ObjCliente.ValidaClienteRFC(TxtRFCCliente.Text, UsuarioActual.CveEmpresa) Then
@@ -4914,15 +4928,17 @@ Partial Class PV
End Sub
Private Sub RecargaGlobalCliente()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDTCliente)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDTCliente)
+ 'Hilo.Start()
+ GeneraGlobalDTCliente()
End Sub
- Private Sub GeneraGlobalDTCliente()
- Dim Objclientes As New ClsClientes
- If Objclientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1, TipoCliente:=-1) Then
- Application("GlobalDTCliente") = Objclientes.DtResultados
- End If
- Objclientes.Dispose()
+ Private Sub GeneraGlobalDTCliente()
+ GlobalDTCliente(UsuarioActual.CveEmpresa) = Nothing
+ 'Dim Objclientes As New ClsClientes
+ 'If Objclientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1, TipoCliente:=-1) Then
+ ' Application("GlobalDTCliente") = Objclientes.DtResultados
+ 'End If
+ 'Objclientes.Dispose()
End Sub
#End Region
@@ -5198,13 +5214,19 @@ Partial Class PV
Dim CvePSParametro As Integer = DdlPSAjuste.SelectedValue.ToEntero
Dim PrecioSugerido As Decimal = 0
Dim drPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSParametro).FiltroPrimero("")
+ Dim CveMarca As Integer
If drPS IsNot Nothing Then
PrecioSugerido = drPS("Precio").ToString.ToDecimal
+ CveMarca = drPS("CveMarca").ToString.ToEntero
End If
TxtPUFactura.Text = PrecioSugerido.FormatoNumero(2)
+ DdlTipoUso.Items.Clear()
+ DdlTipoUso.DataSource = GlobalDTAcumGarantiasMesesTipoUso(UsuarioActual.CveEmpresa, CveMarca)
+ DdlTipoUso.Items.Insert(0, New ListItem("Seleccione", "-1"))
+ DdlTipoUso.DataBind()
End If
If Not DdlPSAjuste.SelectedValue.ToEntero > 0 AndAlso DdlFacturas.SelectedValue.ToEntero > 0 Then
diff --git a/Ventas/ProductosServicios.aspx.vb b/Ventas/ProductosServicios.aspx.vb
index a0ae980b3..02e41c2ce 100644
--- a/Ventas/ProductosServicios.aspx.vb
+++ b/Ventas/ProductosServicios.aspx.vb
@@ -1326,11 +1326,12 @@ Partial Class ProductosyServicios
#Region "G L O B L A L"
Private Sub RecargaGlobal()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
+ 'Hilo.Start()
+ GeneraGlobalDT()
End Sub
Private Sub GeneraGlobalDT()
- GlobalDTPSAdicionales(-1, UsuarioActual.CveEmpresa) = Nothing
+
GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
GlobalDTProductosServiciosAlias(UsuarioActual.CveEmpresa) = Nothing
GlobalDTImpuestosLocales(-1, UsuarioActual.CveEmpresa) = Nothing
@@ -1339,23 +1340,23 @@ Partial Class ProductosyServicios
'Dim ObjPS As New ClsProductosServicios
- 'If ObjPS.GetPSSimplificado(-1) Then Application("GlobalDTPSSimplificado") = ObjPS.DtResultados.AsEnumerable()
+ 'If ObjPS.GetPSSimplificado(UsuarioActual.CveEmpresa) Then Application(String.Format("GlobalDTPSSimplificado{0}", UsuarioActual.CveEmpresa)) = ObjPS.DtResultados.AsEnumerable()
- 'If ObjPS.GetPSAlias(-1, -1) Then
- ' GlobalDTProductosServiciosAlias(-1) = ObjPS.DtResultados
+ ''If ObjPS.GetPSAlias(-1, UsuarioActual.CveEmpresa) Then
+ ' GlobalDTProductosServiciosAlias(UsuarioActual.CveEmpresa) = ObjPS.DtResultados
'End If
- 'If ObjPS.GetPSImpuestosLocales(-1, -1) Then
- ' GlobalDTImpuestosLocales(-1, -1) = ObjPS.DtResultados
+ 'If ObjPS.GetPSImpuestosLocales(-1, UsuarioActual.CveEmpresa) Then
+ ' GlobalDTImpuestosLocales(-1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
'End If
- 'If ObjPS.GetPSEquivalencias(-1, -1) Then
+ 'If ObjPS.GetPSEquivalencias(-1, UsuarioActual.CveEmpresa) Then
' GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
'End If
- ''If ObjPS.GetPSAdicionales(-1, -1) Then
- '' GlobalDTPSAdicionales(-1, -1) = ObjPS.DtResultados
- ''End If
+ 'If ObjPS.GetPSAdicionales(-1, UsuarioActual.CveEmpresa) Then
+ ' GlobalDTPSAdicionales(-1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
+ 'End If
'ObjPS.Dispose()
End Sub
@@ -1401,8 +1402,9 @@ Partial Class ProductosyServicios
End Sub
Private Sub RecargaGlobalEquivalencias()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalEquivalencias)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalEquivalencias)
+ 'Hilo.Start()
+ GeneraGlobalEquivalencias()
End Sub
Private Sub GeneraGlobalEquivalencias()
GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = Nothing
diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx
index cc817e97b..01639bdf5 100644
--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -5834,18 +5834,7 @@
-
-
-
-
-
-
-
- ó
-
-
-
-
+
@@ -7284,10 +7273,10 @@
$(".select2-container.select2-container--default.select2-container--open .select2-dropdown .select2anothertable").scrollTop(stop);
}
function CargaExistenciaAlmacenes(data, params) {
- var div = $('');
+ var div = $('');
$('.select2-container.select2-container--default.select2-container--open .select2-dropdown .select2anothertable').remove();
$('.select2-container.select2-container--default.select2-container--open .select2-dropdown').prepend(div);
- var table = $('
'); div.append(table);
+ var table = $('
'); div.append(table);
var tbody = $(''); table.append(tbody);
$(".select2-container--default .select2-results>.select2-results__options").off("scroll", scrollfuncion);
$(".select2-container--default .select2-results>.select2-results__options").scroll(scrollfuncion);
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 389ef21b7..41dcec827 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -5406,7 +5406,11 @@ Partial Class Ventas
Objeto.ddl.Items.Insert(0, New ListItem("*** Actualizar listado de Productos o Servicios ***", "-2"))
Objeto.ddl.Items.Insert(0, New ListItem("Seleccione el Producto", "-1"))
Else
- Objeto.Attributes.Add("data-cvesubproyecto", DdlSubProyectoDatos.SelectedValue)
+ Dim cvesubproyecto As String = DdlSubProyectoDatos.SelectedValue
+ If UsuarioActual.CveEmpresa = 141 Then
+ cvesubproyecto = "-1"
+ End If
+ Objeto.Attributes.Add("data-cvesubproyecto", cvesubproyecto)
Objeto.ddlWS.Attributes.Add("data-cveclasificacion", CveClasificacion.ToString)
Objeto.ddlWS.Attributes.Add("data-pagina", "ventas/ventas")
Objeto.ddlWS.Attributes.Add("data-Estatus", "1")
@@ -9847,7 +9851,7 @@ Partial Class Ventas
End If
End If
- If ObjConta.ValidacionPrePolizaCuadre(ObjFactura.CvePrePoliza, 5) Then
+ If ObjConta.ValidacionPrePolizaCuadre(ObjFactura.CvePrePoliza, 2) Then
If ObjConta.ValorPolizaDescuadre > 0 Then
'ErrorPrepoliza = True
GuardaLogAD($"Ventas/Ventas-ProcesoPrePolizas | Error:{ObjConta.MensajePolizaDescuadre} Diferencia:{ObjConta.ValorDiferencia} | CvePrePoliza:{ObjFactura.CvePrePoliza}", "LogPrePolizas")
@@ -15269,14 +15273,19 @@ Partial Class Ventas
DtMovimientos = ObjInventario.DtResultados.FiltraParametros("", DistinctColumns:={"CveMovimiento"})
'Si estamos facturando remisiones ajustamos por ventadetalle
- If RemisionesLista.Count > 0 Then
+ If RemisionesLista.Count > 0 AndAlso DtRemisionesTmpDT IsNot Nothing AndAlso DtRemisionesTmpDT.Rows.Count > 0 AndAlso ObjInventario.DtResultados.Rows.Count > 0 Then
Dim resultados = From DtRemisiones In DtRemisionesTmpDT
Join DtMovDet In ObjInventario.DtResultados.FiltraParametros("CvePS > 0") On DtRemisiones("CveVentaDetalleRemision").ToString.ToEntero Equals DtMovDet("CveVentaDetalle").ToString.ToEntero
Select DtMovDet
Try
- DtMovimientosDetalles = resultados.CopyToDataTable
+ If resultados.Count > 0 Then
+ DtMovimientosDetalles = resultados.CopyToDataTable
+ Else
+ DtMovimientosDetalles = New DataTable
+ End If
+
Catch ex As Exception
- GuardaLog($"LOG IPP: Ventas LN: 10033. - DtRemisionesTmpDT.Rows.Count: {DtRemisionesTmpDT.Rows.Count} - ObjInventario.DtResultados.FiltraParametros('CvePS > 0').Rows.Count: {ObjInventario.DtResultados.FiltraParametros("CvePS > 0").Rows.Count}")
+ GuardaLog($"LOG IPP: Ventas LN: 10033. - DtRemisionesTmpDT.Rows.Count: {DtRemisionesTmpDT.Rows.Count} - ObjInventario.DtResultados.FiltraParametros('CvePS > 0').Rows.Count: {ObjInventario.DtResultados.FiltraParametros("CvePS > 0").Rows.Count} Ex:{ex.Message}")
DtMovimientosDetalles = New DataTable
End Try
Else
@@ -17253,15 +17262,17 @@ Partial Class Ventas
End Sub
Private Sub RecargaGlobalCliente()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDTCliente)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDTCliente)
+ 'Hilo.Start()
+ GeneraGlobalDTCliente()
End Sub
Private Sub GeneraGlobalDTCliente()
- Dim Objclientes As New ClsClientes
- If Objclientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, -1, Estatus:=-1, TipoCliente:=-1) Then
- Application("GlobalDTCliente") = Objclientes.DtResultados
- End If
- Objclientes.Dispose()
+ GlobalDTCliente(UsuarioActual.CveEmpresa) = Nothing
+ 'Dim Objclientes As New ClsClientes
+ 'If Objclientes.GetClientes(-1, "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa, Estatus:=-1, TipoCliente:=-1) Then
+ ' Application("GlobalDTCliente" & UsuarioActual.CveEmpresa) = Objclientes.DtResultados
+ 'End If
+ 'Objclientes.Dispose()
End Sub
#End Region
@@ -19164,19 +19175,19 @@ Partial Class Ventas
RecargaGlobal()
End Sub
Private Sub RecargaGlobal()
- Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
- Hilo.Start()
+ 'Dim Hilo As New System.Threading.Thread(AddressOf GeneraGlobalDT)
+ 'Hilo.Start()
+ GeneraGlobalDT()
End Sub
Private Sub GeneraGlobalDT()
+ 'Dim dtt As DataTable
GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = Nothing
GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing
'Dim ObjPS As New ClsProductosServicios
- 'If (ObjPS.GetPSSimplificado(-1)) Then
- ' Application("GlobalDTPSSimplificado") = ObjPS.DtResultados.AsEnumerable 'Cargamos el GlobalDTPSSimplificado
- 'End If
+ 'If ObjPS.GetPSSimplificado(UsuarioActual.CveEmpresa) Then Application(String.Format("GlobalDTPSSimplificado{0}", UsuarioActual.CveEmpresa)) = ObjPS.DtResultados.AsEnumerable()
- 'If ObjPS.GetPSEquivalencias(-1, -1) Then
+ 'If ObjPS.GetPSEquivalencias(-1, UsuarioActual.CveEmpresa) Then
' GlobalDTProductosServiciosEquivalencias(-1, -1, UsuarioActual.CveEmpresa) = ObjPS.DtResultados
'End If
@@ -20922,6 +20933,7 @@ Partial Class Ventas
DtImpuestos.Columns.Add("ImporteIEPS", GetType(Decimal))
DtImpuestos.Columns.Add("CveSubProyecto", GetType(Integer))
DtImpuestos.AcceptChanges()
+ Dim AcumuladoNC As Decimal = 0
If AplicaNCMasiva Then
If NCDescuento Then
@@ -20929,10 +20941,12 @@ Partial Class Ventas
DtImpuestos.Merge(CargaDtImpuestosNC(RNC.CveVenta, RNC.TotalRemNCAplicado, NCDescuento:=True), True, MissingSchemaAction.Ignore)
Next
Else
+
For Each Gvr As GridViewRow In GvCxC.Rows
If Gvr.FCCheckBox("ChkCxC").Checked Then
DtImpuestos.Merge(CargaDtImpuestosNC(Gvr.DataKey("CveVenta").ToString.ToEntero, Gvr.FCTextBox("TxtImporte").Text.ToString.ToDecimal), True, MissingSchemaAction.Ignore)
'CARGA FACTURA A LA CUAL SE APLICA LA NC
+ AcumuladoNC += Gvr.FCTextBox("TxtImporte").Text.ToString.ToDecimal
CargaNCDT(Gvr.DataKey("CveVenta").ToString.ToEntero, Gvr.FCTextBox("TxtImporte").Text.ToString.ToDecimal)
End If
Next
@@ -20949,10 +20963,10 @@ Partial Class Ventas
Into x = Group
Select ImportePU = x.Sum(Function(s) s("ImportePU").ToString.ToDecimal),
ImporteTotal = x.Sum(Function(s) s("ImporteTotal").ToString.ToDecimal),
- ImporteIVA = x.Sum(Function(s) Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * (1 + PorcentajeIEPS) * PorcentajeIVA,
- ImporteRetIVA = x.Sum(Function(s) Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * PorcentajeRetIVA,
- ImporteRetISR = x.Sum(Function(s) Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * PorcentajeRetISR,
- ImporteIEPS = x.Sum(Function(s) Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * PorcentajeIEPS,
+ ImporteIVA = x.Sum(Function(s) Math.Round(s("ImporteIVA").ToString.ToDecimal, 2)), ' Math.Round(s("ImporteIVA").ToString.ToDecimal, 2)) * (1 + PorcentajeIEPS) * PorcentajeIVA,
+ ImporteRetIVA = x.Sum(Function(s) Math.Round(s("ImporteRetIVA").ToString.ToDecimal, 2)),' Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * PorcentajeRetIVA,
+ ImporteRetISR = x.Sum(Function(s) Math.Round(s("ImporteRetISR").ToString.ToDecimal, 2)),' Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * PorcentajeRetISR,
+ ImporteIEPS = x.Sum(Function(s) Math.Round(s("ImporteIEPS").ToString.ToDecimal, 2)), 'Math.Round(s("ImportePU").ToString.ToDecimal, 2)) * PorcentajeIEPS,
PorcentajeIVA = PorcentajeIVA,
PorcentajeRetIVA = PorcentajeRetIVA,
PorcentajeRetISR = PorcentajeRetISR,
@@ -21001,11 +21015,23 @@ Partial Class Ventas
If DdlTipoComprobante.SelectedValue = "Ant" Then CveAnticipo = CveVenta
DdlTipoComprobante.SelectedValueExist("Egs")
+ 'verifica el total de multiples facturas
+ Dim Acumulado12 As Decimal = 0
+ Dim UltimoRenglon As Integer = 1
+ Dim Ajuste As Decimal = 0
For Each Dr As DataRow In DtImpuestos.Rows
+ Acumulado12 += Dr("ImportePU").ToString.ToDecimal.RoundSQL + Dr("ImporteIVA").ToString.ToDecimal.RoundSQL + Dr("ImporteIEPS").ToString.ToDecimal
+ If UltimoRenglon = DtImpuestos.Rows.Count Then
+ 'ajusta 5 centavos de diferencia
+ If Acumulado12 <> AcumuladoNC And Math.Abs(Acumulado12 - AcumuladoNC) <= 0.05 Then
+ Ajuste = Acumulado12 - AcumuladoNC
+ End If
+ End If
+ UltimoRenglon += 1
AgregaTempDT(TmpDT, DrPS("CvePS").ToString.ToEntero, DrPS("PS").ToString, DrPS("Codigo").ToString, DrPS("PSCodigo").ToString, DrPS("CveTipoPS").ToString.ToEntero, DrPS("Inv_CveMetodoInventario").ToString.ToEntero,
DrPS("CveUM").ToString.ToEntero, DrPS("UnidadMedida").ToString, DrPS("CveClasificacion").ToString.ToEntero, DrPS("Clasificacion").ToString, CveProyecto, Proyecto, CveSubProyecto, SubProyecto,
- TxtNCObservaciones.Text.Trim, 1, Dr("ImportePU").ToString.ToDecimal, Dr("PorcentajeIVA").ToString.ToDecimal, Dr("ImporteIVA").ToString.ToDecimal, Dr("PorcentajeRetIVA").ToString.ToDecimal, Dr("ImporteRetIVA").ToString.ToDecimal,
+ TxtNCObservaciones.Text.Trim, 1, Dr("ImportePU").ToString.ToDecimal + Ajuste, Dr("PorcentajeIVA").ToString.ToDecimal, Dr("ImporteIVA").ToString.ToDecimal, Dr("PorcentajeRetIVA").ToString.ToDecimal, Dr("ImporteRetIVA").ToString.ToDecimal,
Dr("PorcentajeRetISR").ToString.ToDecimal, Dr("ImporteRetISR").ToString.ToDecimal, Dr("PorcentajeIEPS").ToString.ToDecimal, Dr("ImporteIEPS").ToString.ToDecimal, -1, 0.0, Dr("ImporteTotal").ToString.ToDecimal, "", "", -1, -1,
DrPS("SATClavePS").ToString, DrPS("SATClaveUnidadMedida").ToString, -1, -1, -1, -1, -1, -1)
Next
@@ -21017,6 +21043,7 @@ Partial Class Ventas
TrTipoRelacion.Visible = True
DdlTiposRelacion.SelectedValueExist("1")
+ DdlSubProyectoDatos.Enabled = False
'condicióon, en la que se verifica que el importe total de aplicación de la nota de crédito sea igual al del total de la nota de crédito, ej. saldo de la factura 1000.01 y la nota de crédito se generó po 1000.00
If Not AplicaNCMasiva Then
@@ -21077,22 +21104,24 @@ Partial Class Ventas
FiltroStr = String.Format("ISNULL(PorcentajeIVA,0) = {0} AND ISNULL(PorcentajeRetIVA,0) = {1} AND ISNULL(PorcentajeRetISR,0) = {2} AND ISNULL(PorcentajeIEPS,0) = {3} AND ISNULL(CveSubProyecto,0) = {4} ", Dr("PorcentajeIVA").ToString.ToDecimal, Dr("PorcentajeRetIVA").ToString.ToDecimal, Dr("PorcentajeRetISR").ToString.ToDecimal, Dr("PorcentajeIEPS").ToString.ToDecimal, Dr("CveSubProyecto"))
Dr("ImporteTotal") = Math.Round(Porcentaje * (TmpDT.SUM("TotalImporte", FiltroStr) - TmpDT.SUM("Descuento", FiltroStr)), 2)
- Dr("ImporteIVA") = (Dr("ImporteTotal").ToString().ToDecimal() * (1 + Dr("PorcentajeIEPS").ToString().ToDecimal()) * Dr("PorcentajeIVA").ToString().ToDecimal()).RoundSQL(2)
- Dr("ImporteRetIVA") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeRetIVA").ToString().ToDecimal()).RoundSQL(2)
- Dr("ImporteRetISR") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeRetISR").ToString().ToDecimal()).RoundSQL(2)
- Dr("ImporteIEPS") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeIEPS").ToString().ToDecimal()).RoundSQL(2)
+ 'Dr("ImporteIVA") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeIVA").ToString().ToDecimal()).RoundSQL(2)
+ 'Dr("ImporteRetIVA") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeRetIVA").ToString().ToDecimal()).RoundSQL(2)
+ 'Dr("ImporteRetISR") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeRetISR").ToString().ToDecimal()).RoundSQL(2)
+ 'Dr("ImporteIEPS") = (Dr("ImporteTotal").ToString().ToDecimal() * Dr("PorcentajeIEPS").ToString().ToDecimal()).RoundSQL(2)
- 'Dr("ImporteIVA") = Math.Round(Porcentaje * TmpDT.SUM("ImporteIVA", $"ISNULL(PorcentajeIVA,0) = {Dr("PorcentajeIVA").ToString.ToDecimal} AND ISNULL(PorcentajeRetIVA,0) = '{Dr("PorcentajeRetIVA").ToString.ToDecimal}' AND ISNULL(PorcentajeRetISR,0) = '{Dr("PorcentajeRetISR").ToString.ToDecimal}' AND ISNULL(PorcentajeIEPS,0) = '{Dr("PorcentajeIEPS").ToString.ToDecimal}' AND ISNULL(CveSubProyecto,0) = '{Dr("CveSubProyecto").ToString.ToEntero}' "), 2)
- 'Dr("ImporteRetIVA") = Math.Round(Porcentaje * TmpDT.SUM("ImporteRetIVA", $"ISNULL(PorcentajeIVA,0) = {Dr("PorcentajeIVA").ToString.ToDecimal} AND ISNULL(PorcentajeRetIVA,0) = '{Dr("PorcentajeRetIVA").ToString.ToDecimal}' AND ISNULL(PorcentajeRetISR,0) = '{Dr("PorcentajeRetISR").ToString.ToDecimal}' AND ISNULL(PorcentajeIEPS,0) = '{Dr("PorcentajeIEPS").ToString.ToDecimal}' AND ISNULL(CveSubProyecto,0) = '{Dr("CveSubProyecto").ToString.ToEntero}' "), 2)
- 'Dr("ImporteRetISR") = Math.Round(Porcentaje * TmpDT.SUM("ImporteRetISR", $"ISNULL(PorcentajeIVA,0) = {Dr("PorcentajeIVA").ToString.ToDecimal} AND ISNULL(PorcentajeRetIVA,0) = '{Dr("PorcentajeRetIVA").ToString.ToDecimal}' AND ISNULL(PorcentajeRetISR,0) = '{Dr("PorcentajeRetISR").ToString.ToDecimal}' AND ISNULL(PorcentajeIEPS,0) = '{Dr("PorcentajeIEPS").ToString.ToDecimal}' AND ISNULL(CveSubProyecto,0) = '{Dr("CveSubProyecto").ToString.ToEntero}'"), 2)
- 'Dr("ImporteIEPS") = Math.Round(Porcentaje * TmpDT.SUM("ImporteIEPS", $"ISNULL(PorcentajeIVA,0) = {Dr("PorcentajeIVA").ToString.ToDecimal} AND ISNULL(PorcentajeRetIVA,0) = '{Dr("PorcentajeRetIVA").ToString.ToDecimal}' AND ISNULL(PorcentajeRetISR,0) = '{Dr("PorcentajeRetISR").ToString.ToDecimal}' AND ISNULL(PorcentajeIEPS,0) = '{Dr("PorcentajeIEPS").ToString.ToDecimal}' AND ISNULL(CveSubProyecto,0) = '{Dr("CveSubProyecto").ToString.ToEntero}'"), 2)
+ Dr("ImporteIVA") = Math.Round(Porcentaje * TmpDT.SUM("ImporteIVA", FiltroStr), 2)
+ Dr("ImporteRetIVA") = Math.Round(Porcentaje * TmpDT.SUM("ImporteRetIVA", FiltroStr), 2)
+ Dr("ImporteRetISR") = Math.Round(Porcentaje * TmpDT.SUM("ImporteRetISR", FiltroStr), 2)
+ Dr("ImporteIEPS") = Math.Round(Porcentaje * TmpDT.SUM("ImporteIEPS", FiltroStr), 2)
Dr("ImportePU") = Dr("ImporteTotal").ToString.ToDecimal '(Dr("ImporteTotal").ToString.ToDecimal - Dr("ImporteIVA").ToString.ToDecimal - Dr("ImporteRetIVA").ToString.ToDecimal - Dr("ImporteRetISR").ToString.ToDecimal - Dr("ImporteIEPS").ToString.ToDecimal)
Next
'codigo para ajuste de centavo, si el importe total no cuadra con los totales
Dim difTmp As Decimal = Importe - (DtImpuestosLocal.SUMD("ImporteTotal") + DtImpuestosLocal.SUMD("ImporteIVA") + DtImpuestosLocal.SUMD("ImporteIEPS") - DtImpuestosLocal.SUMD("ImporteRetIVA") - DtImpuestosLocal.SUMD("ImporteRetISR"))
If Math.Abs(difTmp) >= 0.01 Then
'asusto la diferencia en el último concepto
- DtImpuestosLocal.Rows(DtImpuestosLocal.Rows.Count - 1)("ImporteTotal") = DtImpuestosLocal.Rows(DtImpuestosLocal.Rows.Count - 1)("ImporteTotal").ToString.ToDecimal + difTmp
+ Dim ImporteAjustado As Decimal = DtImpuestosLocal.Rows(DtImpuestosLocal.Rows.Count - 1)("ImporteTotal").ToString.ToDecimal + difTmp
+ DtImpuestosLocal.Rows(DtImpuestosLocal.Rows.Count - 1)("ImporteTotal") = ImporteAjustado
+ DtImpuestosLocal.Rows(DtImpuestosLocal.Rows.Count - 1)("ImportePU") = ImporteAjustado
End If
If Not NCDescuento Then
diff --git a/asmx/WSApp.asmx b/asmx/WSApp.asmx
index 0c92d6bd9..10913c010 100644
--- a/asmx/WSApp.asmx
+++ b/asmx/WSApp.asmx
@@ -67,52 +67,52 @@ Public Class WSApp
Application("GlobalDTVtaFormaPago") = value
End Set
End Property
- Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
- Get
+ 'Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
+ ' Get
- If DirectCast(Application("GlobalDTSubProyectos"), DataTable) Is Nothing Or (DirectCast(Application("GlobalDTSubProyectos"), DataTable) IsNot Nothing AndAlso DirectCast(Application("GlobalDTSubProyectos"), DataTable).Rows.Count = 0) Then
- Dim P As New ClsSubProyectos
- If P.GetSubProyectos Then
- Application("GlobalDTSubProyectos") = P.DtResultados
- End If
- P.Dispose()
+ ' If DirectCast(Application("GlobalDTSubProyectos"), DataTable) Is Nothing Or (DirectCast(Application("GlobalDTSubProyectos"), DataTable) IsNot Nothing AndAlso DirectCast(Application("GlobalDTSubProyectos"), DataTable).Rows.Count = 0) Then
+ ' Dim P As New ClsSubProyectos
+ ' If P.GetSubProyectos Then
+ ' Application("GlobalDTSubProyectos") = P.DtResultados
+ ' End If
+ ' P.Dispose()
- Dim msg As String = "aqui no se carga subproyectos"
- 'If Request IsNot Nothing Then
- ' msg = msg & Request.ServerVariables("URL")
- 'End If
- msg.GuardaLog()
+ ' Dim msg As String = "aqui no se carga subproyectos"
+ ' 'If Request IsNot Nothing Then
+ ' ' msg = msg & Request.ServerVariables("URL")
+ ' 'End If
+ ' msg.GuardaLog()
- End If
+ ' End If
- If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
- Dim StrSQL As New StringBuilder
- If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
- If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
- If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
- If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
+ ' If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
+ ' Dim StrSQL As New StringBuilder
+ ' If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
+ ' If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
+ ' If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
+ ' If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
- Dim Dv As New DataView(DirectCast(Application("GlobalDTSubProyectos"), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
- GlobalDTSubProyectos = Dv.ToTable
- Dv.Dispose()
+ ' Dim Dv As New DataView(DirectCast(Application("GlobalDTSubProyectos"), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ ' GlobalDTSubProyectos = Dv.ToTable
+ ' Dv.Dispose()
- Else
- GlobalDTSubProyectos = DirectCast(Application("GlobalDTSubProyectos"), DataTable)
- End If
+ ' Else
+ ' GlobalDTSubProyectos = DirectCast(Application("GlobalDTSubProyectos"), DataTable)
+ ' End If
- End Get
- Set(ByVal value As DataTable)
- If value Is Nothing OrElse value.Rows.Count = 0 Then
- Dim msg As String = "aqui no se carga subproyectos"
- 'If Request IsNot Nothing Then
- ' msg = msg & Request.ServerVariables("URL")
- 'End If
- msg.GuardaLog()
+ ' End Get
+ ' Set(ByVal value As DataTable)
+ ' If value Is Nothing OrElse value.Rows.Count = 0 Then
+ ' Dim msg As String = "aqui no se carga subproyectos"
+ ' 'If Request IsNot Nothing Then
+ ' ' msg = msg & Request.ServerVariables("URL")
+ ' 'End If
+ ' msg.GuardaLog()
- End If
- Application("GlobalDTSubProyectos") = value
- End Set
- End Property
+ ' End If
+ ' Application("GlobalDTSubProyectos") = value
+ ' End Set
+ 'End Property
Property GlobalDTSATUsosCFDI(Optional EsPersonaFisica As Integer = -1) As DataTable
Get
If EsPersonaFisica <> -1 Then
@@ -151,20 +151,20 @@ Public Class WSApp
Application("GlobalDTUsuarios") = value
End Set
End Property
- Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
- Get
- If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
- GlobalDTUnidadesMedida = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTUnidadesMedida = DirectCast(Application("GlobalDTUnidadesMedida"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- Application("GlobalDTUnidadesMedida") = value
- End Set
- End Property
+ 'Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
+ ' Get
+ ' If CveEmpresa <> -1 Then
+ ' Dim Dv As New DataView(DirectCast(Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
+ ' GlobalDTUnidadesMedida = Dv.ToTable
+ ' Dv.Dispose()
+ ' Else
+ ' GlobalDTUnidadesMedida = DirectCast(Application("GlobalDTUnidadesMedida"), DataTable)
+ ' End If
+ ' End Get
+ ' Set(value As DataTable)
+ ' Application("GlobalDTUnidadesMedida") = value
+ ' End Set
+ 'End Property
Property GlobalDTGralCategorias(CveEmpresa As Integer) As DataTable
Get
If CveEmpresa <> -1 Then
diff --git a/asmx/WSSIGApp.asmx b/asmx/WSSIGApp.asmx
index febee922a..a1b647fbd 100644
--- a/asmx/WSSIGApp.asmx
+++ b/asmx/WSSIGApp.asmx
@@ -67,52 +67,52 @@ Public Class WSSIGApp
Application("GlobalDTVtaFormaPago") = value
End Set
End Property
- Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
- Get
+ 'Property GlobalDTSubProyectos(CveProyecto As Integer, Optional CveSubProyecto As Integer = -1, Optional CveEmpresa As Integer = -1, Optional Estatus As Integer = 1) As DataTable
+ ' Get
- If DirectCast(Application("GlobalDTSubProyectos"), DataTable) Is Nothing Or (DirectCast(Application("GlobalDTSubProyectos"), DataTable) IsNot Nothing AndAlso DirectCast(Application("GlobalDTSubProyectos"), DataTable).Rows.Count = 0) Then
- Dim P As New ClsSubProyectos
- If P.GetSubProyectos Then
- Application("GlobalDTSubProyectos") = P.DtResultados
- End If
- P.Dispose()
+ ' If DirectCast(Application("GlobalDTSubProyectos"), DataTable) Is Nothing Or (DirectCast(Application("GlobalDTSubProyectos"), DataTable) IsNot Nothing AndAlso DirectCast(Application("GlobalDTSubProyectos"), DataTable).Rows.Count = 0) Then
+ ' Dim P As New ClsSubProyectos
+ ' If P.GetSubProyectos Then
+ ' Application("GlobalDTSubProyectos") = P.DtResultados
+ ' End If
+ ' P.Dispose()
- Dim msg As String = "aqui no se carga subproyectos"
- 'If Request IsNot Nothing Then
- ' msg = msg & Request.ServerVariables("URL")
- 'End If
- msg.GuardaLog()
+ ' Dim msg As String = "aqui no se carga subproyectos"
+ ' 'If Request IsNot Nothing Then
+ ' ' msg = msg & Request.ServerVariables("URL")
+ ' 'End If
+ ' msg.GuardaLog()
- End If
+ ' End If
- If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
- Dim StrSQL As New StringBuilder
- If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
- If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
- If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
- If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
+ ' If CveProyecto <> -1 OrElse CveSubProyecto <> -1 OrElse CveEmpresa <> -1 OrElse Estatus <> -1 Then
+ ' Dim StrSQL As New StringBuilder
+ ' If CveProyecto <> -1 Then StrSQL.AppendFormat(" AND CveProyecto = {0}", CveProyecto)
+ ' If CveSubProyecto <> -1 Then StrSQL.AppendFormat(" AND CveSubProyecto = {0}", CveSubProyecto)
+ ' If Estatus <> -1 Then StrSQL.AppendFormat(" AND CveEstatus = {0}", Estatus)
+ ' If CveEmpresa <> -1 Then StrSQL.AppendFormat(" AND CveEmpresa = {0}", CveEmpresa)
- Dim Dv As New DataView(DirectCast(Application("GlobalDTSubProyectos"), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
- GlobalDTSubProyectos = Dv.ToTable
- Dv.Dispose()
+ ' Dim Dv As New DataView(DirectCast(Application("GlobalDTSubProyectos"), DataTable), StrSQL.ToString.Trim.TrimStart("A"c, "N"c, "D"c), "", DataViewRowState.CurrentRows)
+ ' GlobalDTSubProyectos = Dv.ToTable
+ ' Dv.Dispose()
- Else
- GlobalDTSubProyectos = DirectCast(Application("GlobalDTSubProyectos"), DataTable)
- End If
+ ' Else
+ ' GlobalDTSubProyectos = DirectCast(Application("GlobalDTSubProyectos"), DataTable)
+ ' End If
- End Get
- Set(ByVal value As DataTable)
- If value Is Nothing OrElse value.Rows.Count = 0 Then
- Dim msg As String = "aqui no se carga subproyectos"
- 'If Request IsNot Nothing Then
- ' msg = msg & Request.ServerVariables("URL")
- 'End If
- msg.GuardaLog()
+ ' End Get
+ ' Set(ByVal value As DataTable)
+ ' If value Is Nothing OrElse value.Rows.Count = 0 Then
+ ' Dim msg As String = "aqui no se carga subproyectos"
+ ' 'If Request IsNot Nothing Then
+ ' ' msg = msg & Request.ServerVariables("URL")
+ ' 'End If
+ ' msg.GuardaLog()
- End If
- Application("GlobalDTSubProyectos") = value
- End Set
- End Property
+ ' End If
+ ' Application("GlobalDTSubProyectos") = value
+ ' End Set
+ 'End Property
Property GlobalDTSATUsosCFDI(Optional EsPersonaFisica As Integer = -1) As DataTable
Get
If EsPersonaFisica <> -1 Then
@@ -151,20 +151,20 @@ Public Class WSSIGApp
Application("GlobalDTUsuarios") = value
End Set
End Property
- Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
- Get
- If CveEmpresa <> -1 Then
- Dim Dv As New DataView(DirectCast(Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
- GlobalDTUnidadesMedida = Dv.ToTable
- Dv.Dispose()
- Else
- GlobalDTUnidadesMedida = DirectCast(Application("GlobalDTUnidadesMedida"), DataTable)
- End If
- End Get
- Set(value As DataTable)
- Application("GlobalDTUnidadesMedida") = value
- End Set
- End Property
+ 'Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable
+ ' Get
+ ' If CveEmpresa <> -1 Then
+ ' Dim Dv As New DataView(DirectCast(Application("GlobalDTUnidadesMedida"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), " UnidadMedida", DataViewRowState.CurrentRows)
+ ' GlobalDTUnidadesMedida = Dv.ToTable
+ ' Dv.Dispose()
+ ' Else
+ ' GlobalDTUnidadesMedida = DirectCast(Application("GlobalDTUnidadesMedida"), DataTable)
+ ' End If
+ ' End Get
+ ' Set(value As DataTable)
+ ' Application("GlobalDTUnidadesMedida") = value
+ ' End Set
+ 'End Property
Property GlobalDTGralCategorias(CveEmpresa As Integer) As DataTable
Get
If CveEmpresa <> -1 Then
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer.dll
deleted file mode 100644
index ed8847d2a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_cs.dll
deleted file mode 100644
index a4cff58d8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_da.dll
deleted file mode 100644
index 71be1136d..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_de.dll
deleted file mode 100644
index bbe50b676..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_en.dll
deleted file mode 100644
index 3d3e0789b..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_es.dll
deleted file mode 100644
index 25e227f27..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_fi.dll
deleted file mode 100644
index 5248e4b7d..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_fr.dll
deleted file mode 100644
index bd4977ece..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_hu.dll
deleted file mode 100644
index 03f5a0476..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_it.dll
deleted file mode 100644
index 808b29005..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ja.dll
deleted file mode 100644
index c4813d477..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ko.dll
deleted file mode 100644
index dc3bf8a51..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_nb.dll
deleted file mode 100644
index 0fc725142..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_nl.dll
deleted file mode 100644
index a5b926033..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_pl.dll
deleted file mode 100644
index 3ef2eca31..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_pt.dll
deleted file mode 100644
index 69eadb69c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ru.dll
deleted file mode 100644
index a2b4a6de2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_sk.dll
deleted file mode 100644
index d4c45fc6e..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_sv.dll
deleted file mode 100644
index 3a4704e5f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_th.dll
deleted file mode 100644
index 55fc06217..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_tr.dll
deleted file mode 100644
index 7e0223845..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_zh_CN.dll
deleted file mode 100644
index 1fda32854..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_zh_TW.dll
deleted file mode 100644
index 93502d09a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/CRViewer_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/LCIDTable.xml b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/LCIDTable.xml
deleted file mode 100644
index 16550e3a9..000000000
--- a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/LCIDTable.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl.cab
deleted file mode 100644
index d064df9e2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl.dll
deleted file mode 100644
index a39436c85..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_cs.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_cs.cab
deleted file mode 100644
index 39e5b44a2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_cs.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_cs.dll
deleted file mode 100644
index 153485056..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_da.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_da.cab
deleted file mode 100644
index b815eab9b..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_da.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_da.dll
deleted file mode 100644
index 67dbb0b65..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_de.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_de.cab
deleted file mode 100644
index 688af888e..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_de.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_de.dll
deleted file mode 100644
index 60e8920c9..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_en.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_en.cab
deleted file mode 100644
index a1850dc1e..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_en.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_en.dll
deleted file mode 100644
index 03184d472..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_es.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_es.cab
deleted file mode 100644
index 065f8e4c9..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_es.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_es.dll
deleted file mode 100644
index 12f06a622..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fi.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fi.cab
deleted file mode 100644
index 9043ccb7f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fi.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fi.dll
deleted file mode 100644
index 0b7a79c4b..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fr.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fr.cab
deleted file mode 100644
index 8c0cc0e82..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fr.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fr.dll
deleted file mode 100644
index c79744981..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_hu.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_hu.cab
deleted file mode 100644
index f1b0f5b9f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_hu.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_hu.dll
deleted file mode 100644
index 4f29662f6..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_it.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_it.cab
deleted file mode 100644
index 92fcbba48..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_it.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_it.dll
deleted file mode 100644
index ea73fae3c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ja.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ja.cab
deleted file mode 100644
index 219554fd8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ja.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ja.dll
deleted file mode 100644
index 4925e1d52..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ko.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ko.cab
deleted file mode 100644
index f23dbf9bc..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ko.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ko.dll
deleted file mode 100644
index 36df11530..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nb.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nb.cab
deleted file mode 100644
index 250ca62af..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nb.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nb.dll
deleted file mode 100644
index a7978f12d..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nl.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nl.cab
deleted file mode 100644
index 1bca31a99..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nl.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nl.dll
deleted file mode 100644
index b15af453e..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pl.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pl.cab
deleted file mode 100644
index 4d14d35c4..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pl.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pl.dll
deleted file mode 100644
index 5070a70a1..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pt.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pt.cab
deleted file mode 100644
index 64097cd3a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pt.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pt.dll
deleted file mode 100644
index 7137e4ba2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ru.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ru.cab
deleted file mode 100644
index 8620846a0..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ru.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ru.dll
deleted file mode 100644
index aac1009f5..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sk.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sk.cab
deleted file mode 100644
index 0e00d6187..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sk.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sk.dll
deleted file mode 100644
index 716703993..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sv.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sv.cab
deleted file mode 100644
index eb590fab0..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sv.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sv.dll
deleted file mode 100644
index 3d12a32c4..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_th.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_th.cab
deleted file mode 100644
index 7d09381fb..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_th.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_th.dll
deleted file mode 100644
index 0f1ea7ec4..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_tr.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_tr.cab
deleted file mode 100644
index 6bb09fc0f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_tr.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_tr.dll
deleted file mode 100644
index e2f68b1f6..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_CN.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_CN.cab
deleted file mode 100644
index 6cc2673ef..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_CN.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_CN.dll
deleted file mode 100644
index 267d2eb65..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_TW.cab b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_TW.cab
deleted file mode 100644
index 8375f950a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_TW.cab and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_TW.dll
deleted file mode 100644
index fc7a2aed8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/PrintControl_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/XERCES27_LICENSE.txt b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/XERCES27_LICENSE.txt
deleted file mode 100644
index d64569567..000000000
--- a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/XERCES27_LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/crviewer.dep b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/crviewer.dep
deleted file mode 100644
index 2b05d2796..000000000
--- a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/crviewer.dep
+++ /dev/null
@@ -1,42 +0,0 @@
-; ------------------------------------------------------------------------------
-; Dependency file for setup wizards.
-
-
-[Version]
-Version=12.0.0.88
-; ------------------------------------------------------------------------------
-; Dependencies for CRViewer.DLL
-
-
-[CRViewer.DLL]
-Dest=$(CommonFiles)\Business Objects\4.0\crystalreportviewers120\ActiveXControls
-Register=$(DLLSelfRegister)
-Version=12.0.0.88
-Uses1=CRAXDRT.DLL
-Uses2=COMCAT.DLL
-Uses3=OLEPRO32.DLL
-Uses4=gdiplus.dll
-Uses5=usp10.dll
-Uses6=
-
-[gdiplus.dll]
-Dest=$(CommonFiles)\Business Objects\4.0\bin
-Uses1=
-
-[usp10.dll]
-Dest=$(WinSysPath)
-Uses1=
-
-[COMCAT.DLL]
-Dest=$(WinSysPathSysFile)
-Register=$(DLLSelfRegister)
-Uses1=
-
-[OLEPRO32.DLL]
-Dest=$(WinSysPath)
-Uses1=
-
-[CRAXDRT.DLL]
-Dest=$(CommonFiles)\Business Objects\4.0\bin
-Register=$(dllSelfRegister)
-Uses1=
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg.dll
deleted file mode 100644
index 8a35cc74c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_cs.dll
deleted file mode 100644
index 78bb1329f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_da.dll
deleted file mode 100644
index 9b152bf2f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_de.dll
deleted file mode 100644
index 6ef4485ca..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_en.dll
deleted file mode 100644
index b74030d86..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_es.dll
deleted file mode 100644
index 64e69777c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_fi.dll
deleted file mode 100644
index cf81dd0ac..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_fr.dll
deleted file mode 100644
index 40b779e11..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_hu.dll
deleted file mode 100644
index d49f64bf0..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_it.dll
deleted file mode 100644
index 6f7fd3a5d..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ja.dll
deleted file mode 100644
index 3e64dc9df..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ko.dll
deleted file mode 100644
index 2e554ede2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_nb.dll
deleted file mode 100644
index f4699c359..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_nl.dll
deleted file mode 100644
index 79ee9c850..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_pl.dll
deleted file mode 100644
index 588014949..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_pt.dll
deleted file mode 100644
index 459be4349..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ru.dll
deleted file mode 100644
index 73b112d81..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_sk.dll
deleted file mode 100644
index 9e9e23647..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_sv.dll
deleted file mode 100644
index c9506e2c8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_th.dll
deleted file mode 100644
index afd9ea235..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_tr.dll
deleted file mode 100644
index 4b7cbc3fb..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_zh_CN.dll
deleted file mode 100644
index 9001cf74f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_zh_TW.dll
deleted file mode 100644
index 4a1d4e098..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/csprintdlg_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/pvlocale-1-0.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/pvlocale-1-0.dll
deleted file mode 100644
index 41e13ef3f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/pvlocale-1-0.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp.dll
deleted file mode 100644
index 3e30360df..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_cs.dll
deleted file mode 100644
index b4e0e2432..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_da.dll
deleted file mode 100644
index c7401bec2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_de.dll
deleted file mode 100644
index cf795bd31..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_en.dll
deleted file mode 100644
index c96458834..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_es.dll
deleted file mode 100644
index 9edd111a2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_fi.dll
deleted file mode 100644
index 81fb5e852..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_fr.dll
deleted file mode 100644
index cfde7a2e7..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_hu.dll
deleted file mode 100644
index a378b28bf..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_it.dll
deleted file mode 100644
index 943073782..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ja.dll
deleted file mode 100644
index 3d2ad5905..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ko.dll
deleted file mode 100644
index 2448fc273..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_nb.dll
deleted file mode 100644
index fc2525f98..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_nl.dll
deleted file mode 100644
index 9ab882fe5..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_pl.dll
deleted file mode 100644
index 6ab382180..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_pt.dll
deleted file mode 100644
index d2bad4afc..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ru.dll
deleted file mode 100644
index 2341779a5..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_sk.dll
deleted file mode 100644
index f54d5b11f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_sv.dll
deleted file mode 100644
index 49306b19c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_th.dll
deleted file mode 100644
index e2a51c342..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_tr.dll
deleted file mode 100644
index d3c90709a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_zh_CN.dll
deleted file mode 100644
index 34aeb9baf..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_zh_TW.dll
deleted file mode 100644
index ed917adff..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/sviewhlp_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs.dll
deleted file mode 100644
index f97763ce8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_cs.dll
deleted file mode 100644
index 7b59fda90..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_da.dll
deleted file mode 100644
index 8d20c9027..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_de.dll
deleted file mode 100644
index e1bd271b4..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_en.dll
deleted file mode 100644
index 9965b3898..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_es.dll
deleted file mode 100644
index 3cc6b8e48..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_fi.dll
deleted file mode 100644
index a2bc49e0c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_fr.dll
deleted file mode 100644
index 8eb8f8d05..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_hu.dll
deleted file mode 100644
index 2e8afa865..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_it.dll
deleted file mode 100644
index def7d93ba..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ja.dll
deleted file mode 100644
index b000b9221..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ko.dll
deleted file mode 100644
index fd87a3531..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_nb.dll
deleted file mode 100644
index 333dcabb7..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_nl.dll
deleted file mode 100644
index 356d33c12..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_pl.dll
deleted file mode 100644
index 7c6234429..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_pt.dll
deleted file mode 100644
index 47b5aad2f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ru.dll
deleted file mode 100644
index 6d33586d2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_sk.dll
deleted file mode 100644
index ed89cd7ea..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_sv.dll
deleted file mode 100644
index 0b1d9e350..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_th.dll
deleted file mode 100644
index eb06122ec..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_tr.dll
deleted file mode 100644
index 44ee7159a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_zh_CN.dll
deleted file mode 100644
index ecbda8ae8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_zh_TW.dll
deleted file mode 100644
index df671983e..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/swebrs_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl.dll
deleted file mode 100644
index c0c4dc884..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_cs.dll
deleted file mode 100644
index a829874df..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_da.dll
deleted file mode 100644
index df5c8b2ed..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_de.dll
deleted file mode 100644
index 59c93a0cd..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_en.dll
deleted file mode 100644
index 2c8c545d4..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_es.dll
deleted file mode 100644
index 4aaf49702..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_fi.dll
deleted file mode 100644
index e861b40b0..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_fr.dll
deleted file mode 100644
index dc739dfe6..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_hu.dll
deleted file mode 100644
index 6090f8bb0..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_it.dll
deleted file mode 100644
index b3a54f4dd..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ja.dll
deleted file mode 100644
index b91938258..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ko.dll
deleted file mode 100644
index 653e894d8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_nb.dll
deleted file mode 100644
index eea8e180b..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_nl.dll
deleted file mode 100644
index 06a02473c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_pl.dll
deleted file mode 100644
index 00a18426f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_pt.dll
deleted file mode 100644
index 1bcc00419..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ru.dll
deleted file mode 100644
index 3032ebdfc..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_sk.dll
deleted file mode 100644
index 6181d8883..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_sv.dll
deleted file mode 100644
index 487a25eca..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_th.dll
deleted file mode 100644
index c13e2ea71..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_tr.dll
deleted file mode 100644
index 3edf50b84..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_zh_CN.dll
deleted file mode 100644
index 58def180f..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_zh_TW.dll
deleted file mode 100644
index 4ccc56307..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/PrintControl_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/XERCES27_LICENSE.txt b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/XERCES27_LICENSE.txt
deleted file mode 100644
index d64569567..000000000
--- a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/XERCES27_LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg.dll
deleted file mode 100644
index 9c151391c..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_cs.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_cs.dll
deleted file mode 100644
index de1e92310..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_cs.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_da.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_da.dll
deleted file mode 100644
index 3e3810920..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_da.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_de.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_de.dll
deleted file mode 100644
index f03d46317..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_de.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_en.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_en.dll
deleted file mode 100644
index 9077cbad7..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_en.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_es.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_es.dll
deleted file mode 100644
index 157d36a74..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_es.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_fi.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_fi.dll
deleted file mode 100644
index 38622de62..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_fi.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_fr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_fr.dll
deleted file mode 100644
index fdce10738..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_fr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_hu.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_hu.dll
deleted file mode 100644
index f2104ed10..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_hu.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_it.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_it.dll
deleted file mode 100644
index 7482484a4..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_it.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ja.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ja.dll
deleted file mode 100644
index 664517b09..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ja.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ko.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ko.dll
deleted file mode 100644
index 19846bbd8..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ko.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_nb.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_nb.dll
deleted file mode 100644
index fa520922e..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_nb.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_nl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_nl.dll
deleted file mode 100644
index 09911d906..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_nl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_pl.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_pl.dll
deleted file mode 100644
index 93008e092..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_pl.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_pt.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_pt.dll
deleted file mode 100644
index df3790ef1..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_pt.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ru.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ru.dll
deleted file mode 100644
index da268ac2a..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_ru.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_sk.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_sk.dll
deleted file mode 100644
index 5cd4ea740..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_sk.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_sv.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_sv.dll
deleted file mode 100644
index f35b40bdc..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_sv.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_th.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_th.dll
deleted file mode 100644
index 9d6807bc2..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_th.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_tr.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_tr.dll
deleted file mode 100644
index c60b356ea..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_tr.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_zh_CN.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_zh_CN.dll
deleted file mode 100644
index 2dedb7c0b..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_zh_CN.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_zh_TW.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_zh_TW.dll
deleted file mode 100644
index bae6570f9..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/csprintdlg_res_zh_TW.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/pvlocale-1-0.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/pvlocale-1-0.dll
deleted file mode 100644
index 3c8fe2416..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/pvlocale-1-0.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/xerces-c_2_7.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/xerces-c_2_7.dll
deleted file mode 100644
index 9a81d47f1..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/win64_x64/xerces-c_2_7.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/xerces-c_2_7.dll b/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/xerces-c_2_7.dll
deleted file mode 100644
index bde06c300..000000000
Binary files a/aspnet_client/system_web/4_0_30319/crystalreportviewers/ActiveXControls/xerces-c_2_7.dll and /dev/null differ
diff --git a/aspnet_client/system_web/4_0_30319/crystalreportviewers/allInOne.js b/aspnet_client/system_web/4_0_30319/crystalreportviewers/allInOne.js
deleted file mode 100644
index 6f8cadda4..000000000
--- a/aspnet_client/system_web/4_0_30319/crystalreportviewers/allInOne.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/***
-
-MochiKit.Base 1.4
-
-See for documentation, downloads, license, etc.
-
-(c) 2005 Bob Ippolito. All rights Reserved.
-
-***/
-if(typeof (dojo)!="undefined"){dojo.provide("MochiKit.Base")}if(typeof (MochiKit)=="undefined"){MochiKit={}}if(typeof (MochiKit.Base)=="undefined"){MochiKit.Base={}}MochiKit.Base.VERSION="1.4";MochiKit.Base.NAME="MochiKit.Base";MochiKit.Base.update=function(B,D){if(B===null){B={}}for(var C=1;CC){A=C}}G=[];for(E=0;E=0;H--){G=[E[H].apply(this,G)]}return G[0]}},bind:function(E,C){if(typeof (E)=="string"){E=C[E]}var D=E.im_func;var G=E.im_preargs;var B=E.im_self;var A=MochiKit.Base;if(typeof (E)=="function"&&typeof (E.apply)=="undefined"){E=A._wrapDumbFunction(E)}if(typeof (D)!="function"){D=E}if(typeof (C)!="undefined"){B=C}if(typeof (G)=="undefined"){G=[]}else{G=G.slice()}A.extend(G,arguments,2);var F=function(){var I=arguments;var J=arguments.callee;if(J.im_preargs.length>0){I=A.concat(J.im_preargs,I)}var H=J.im_self;if(!H){H=this}return J.im_func.apply(H,I)};F.im_self=B;F.im_func=D;F.im_preargs=G;return F},bindMethods:function(B){var D=MochiKit.Base.bind;for(var A in B){var C=B[A];if(typeof (C)=="function"){B[A]=D(C,B)}}},registerComparator:function(C,B,A,D){MochiKit.Base.comparatorRegistry.register(C,B,A,D)},_primitives:{"boolean":true,string:true,number:true},compare:function(F,B){if(F==B){return 0}var E=(typeof (F)=="undefined"||F===null);var G=(typeof (B)=="undefined"||B===null);if(E&&G){return 0}else{if(E){return -1}else{if(G){return 1}}}var A=MochiKit.Base;var D=A._primitives;if(!(typeof (F) in D&&typeof (B) in D)){try{return A.comparatorRegistry.match(F,B)}catch(H){if(H!=A.NotFound){throw H}}}if(FB){return 1}}var C=A.repr;throw new TypeError(C(F)+" and "+C(B)+" can not be compared")},compareDateLike:function(B,A){return MochiKit.Base.compare(B.getTime(),A.getTime())},compareArrayLike:function(B,A){var F=MochiKit.Base.compare;var E=B.length;var G=0;if(E>A.length){G=1;E=A.length}else{if(E=0;C--){D+=F[C]}}else{D+=F}}if(E<=0){throw new TypeError("mean() requires at least one argument")}return D/E},median:function(){var B=MochiKit.Base.flattenArguments(arguments);if(B.length===0){throw new TypeError("median() requires at least one argument")}B.sort(compare);if(B.length%2==0){var A=B.length/2;return(B[A]+B[A-1])/2}else{return B[(B.length-1)/2]}},findValue:function(A,E,F,B){if(typeof (B)=="undefined"||B===null){B=A.length}if(typeof (F)=="undefined"||F===null){F=0}var D=MochiKit.Base.compare;for(var C=F;C0))){var G=MochiKit.DOM.formContents(H);H=G[0];I=G[1]}else{if(arguments.length==1){var A=H;H=[];I=[];for(var B in A){var J=A[B];if(typeof (J)!="function"){H.push(B);I.push(J)}}}}var E=[];var F=Math.min(H.length,I.length);var C=MochiKit.Base.urlEncode;for(var D=0;D1){A=MochiKit.Base.partial.apply(null,arguments)}return this.addCallbacks(A,A)},addCallback:function(A){if(arguments.length>1){A=MochiKit.Base.partial.apply(null,arguments)}return this.addCallbacks(A,null)},addErrback:function(A){if(arguments.length>1){A=MochiKit.Base.partial.apply(null,arguments)}return this.addCallbacks(null,A)},addCallbacks:function(A,B){if(this.chained){throw new Error("Chained Deferreds can not be re-used")}this.chain.push([A,B]);if(this.fired>=0){this._fire()}return this},_fire:function(){var D=this.chain;var G=this.fired;var C=this.results[G];var B=this;var A=null;while(D.length>0&&this.paused===0){var H=D.shift();var F=H[G];if(F===null){continue}try{C=F(C);G=((C instanceof Error)?1:0);if(C instanceof MochiKit.Async.Deferred){A=function(I){B._resback(I);B.paused--;if((B.paused===0)&&(B.fired>=0)){B._fire()}};this.paused++}}catch(E){G=1;if(!(E instanceof Error)){E=new MochiKit.Async.GenericError(E)}C=E}}this.fired=G;this.results[G]=C;if(A&&this.paused){C.addBoth(A);C.chained=true}}};MochiKit.Base.update(MochiKit.Async,{evalJSONRequest:function(){return eval("("+arguments[0].responseText+")")},succeed:function(A){var B=new MochiKit.Async.Deferred();B.callback.apply(B,arguments);return B},fail:function(A){var B=new MochiKit.Async.Deferred();B.errback.apply(B,arguments);return B},getXMLHttpRequest:function(){var A=arguments.callee;if(!A.XMLHttpRequest){var E=[function(){return new XMLHttpRequest()},function(){return new ActiveXObject("Msxml2.XMLHTTP")},function(){return new ActiveXObject("Microsoft.XMLHTTP")},function(){return new ActiveXObject("Msxml2.XMLHTTP.4.0")},function(){throw new MochiKit.Async.BrowserComplianceError("Browser does not support XMLHttpRequest")}];for(var B=0;B1){var B=MochiKit.Base;var A=B.queryString.apply(null,B.extend(null,arguments,1));if(A){D+="?"+A}}E.open("GET",D,true);return C.sendXMLHttpRequest(E)},loadJSONDoc:function(B){var A=MochiKit.Async;var C=A.doSimpleXMLHttpRequest.apply(A,arguments);C=C.addCallback(A.evalJSONRequest);return C},wait:function(E,C){var D=new MochiKit.Async.Deferred();var A=MochiKit.Base;if(typeof (C)!="undefined"){D.addCallback(function(){return C})}var B=setTimeout(A.bind("callback",D),Math.floor(E*1000));D.canceller=function(){try{clearTimeout(B)}catch(F){}};return D},callLater:function(D,B){var A=MochiKit.Base;var C=A.partial.apply(A,A.extend(null,arguments,1));return MochiKit.Async.wait(D).addCallback(function(E){return C()})}});MochiKit.Async.DeferredLock=function(){this.waiting=[];this.locked=false;this.id=this._nextId()};MochiKit.Async.DeferredLock.prototype={__class__:MochiKit.Async.DeferredLock,acquire:function(){d=new MochiKit.Async.Deferred();if(this.locked){this.waiting.push(d)}else{this.locked=true;d.callback(this)}return d},release:function(){if(!this.locked){throw TypeError("Tried to release an unlocked DeferredLock")}this.locked=false;if(this.waiting.length>0){this.locked=true;this.waiting.shift().callback(this)}},_nextId:MochiKit.Base.counter(),repr:function(){var A;if(this.locked){A="locked, "+this.waiting.length+" waiting"}else{A="unlocked"}return"DeferredLock("+this.id+", "+A+")"},toString:MochiKit.Base.forwardCall("repr")};MochiKit.Async.DeferredList=function(G,F,B,D,I){MochiKit.Async.Deferred.apply(this,[I]);this.list=G;var A=[];this.resultList=A;this.finishedCount=0;this.fireOnOneCallback=F;this.fireOnOneErrback=B;this.consumeErrors=D;var C=MochiKit.Base.bind(this._cbDeferred,this);for(var E=0;E=0){var H=K.options[K.selectedIndex];E.push(F);C.push((H.value)?H.value:H.text);return null}E.push(F);C.push("");return null}else{var J=K.options;if(!J.length){E.push(F);C.push("");return null}for(var G=0;G0){return D}if(typeof (D)=="number"||typeof (D)=="boolean"){D=D.toString()}if(typeof (D)=="string"){return L._document.createTextNode(D)}if(typeof (D.__dom__)=="function"){D=D.__dom__(M);continue}if(typeof (D.dom)=="function"){D=D.dom(M);continue}if(typeof (D)=="function"){D=D.apply(M,[M]);continue}if(I){var F=null;try{F=J(D)}catch(H){}if(F){return A(C,F,B(M))}}try{D=K.match(D,M);continue}catch(H){if(H!=G){throw H}}return L._document.createTextNode(D.toString())}return undefined},setNodeAttribute:function(B,A,C){var E={};E[A]=C;try{return MochiKit.DOM.updateNodeAttributes(B,E)}catch(D){}return null},getNodeAttribute:function(D,A){var C=MochiKit.DOM;var B=C.attributeArray.renames[A];D=C.getElement(D);try{if(B){return D[B]}return D.getAttribute(A)}catch(E){}return null},updateNodeAttributes:function(B,F){var C=B;var I=MochiKit.DOM;if(typeof (B)=="string"){C=I.getElement(B)}if(F){var H=MochiKit.Base.updatetree;if(I.attributeArray.compliant){for(var D in F){var G=F[D];if(typeof (G)=="object"&&typeof (C[D])=="object"){H(C[D],G)}else{if(D.substring(0,2)=="on"){if(typeof (G)=="string"){G=new Function(G)}C[D]=G}else{C.setAttribute(D,G)}}}}else{var E=I.attributeArray.renames;for(D in F){G=F[D];var A=E[D];if(D=="style"&&typeof (G)=="string"){C.style.cssText=G}else{if(typeof (A)=="string"){C[A]=G}else{if(typeof (C[D])=="object"&&typeof (G)=="object"){H(C[D],G)}else{if(D.substring(0,2)=="on"){if(typeof (G)=="string"){G=new Function(G)}C[D]=G}else{C.setAttribute(D,G)}}}}}}}return C},appendChildNodes:function(C){var B=C;var A=MochiKit.DOM;if(typeof (C)=="string"){B=A.getElement(C)}var D=[A.coerceToDOM(MochiKit.Base.extend(null,arguments,1),B)];var E=MochiKit.Base.concat;while(D.length){var F=D.shift();if(typeof (F)=="undefined"||F===null){}else{if(typeof (F.nodeType)=="number"){B.appendChild(F)}else{D=E(F,D)}}}return B},replaceChildNodes:function(C){var B=C;var A=MochiKit.DOM;if(typeof (C)=="string"){B=A.getElement(C);arguments[0]=B}var D;while((D=B.firstChild)){B.removeChild(D)}if(arguments.length<2){return B}else{return A.appendChildNodes.apply(this,arguments)}},createDOM:function(E,D){var G;var B=MochiKit.DOM;var A=MochiKit.Base;if(typeof (D)=="string"||typeof (D)=="number"){var C=A.extend([E,null],arguments,1);return arguments.callee.apply(this,C)}if(typeof (E)=="string"){if(D&&!B.attributeArray.compliant){var F="";if("name" in D){F+=' name="'+B.escapeHTML(D.name)+'"'}if(E=="input"&&"type" in D){F+=' type="'+B.escapeHTML(D.type)+'"'}if(F){E="<"+E+F+">"}}G=B._document.createElement(E)}else{G=E}if(D){B.updateNodeAttributes(G,D)}if(arguments.length<=2){return G}else{var C=A.extend([G],arguments,2);return B.appendChildNodes.apply(this,C)}},createDOMFunc:function(){var A=MochiKit.Base;return A.partial.apply(this,A.extend([MochiKit.DOM.createDOM],arguments))},removeElement:function(A){var B=MochiKit.DOM.getElement(A);B.parentNode.removeChild(B);return B},swapDOM:function(B,D){var A=MochiKit.DOM;B=A.getElement(B);var C=B.parentNode;if(D){D=A.getElement(D);C.replaceChild(D,B)}else{C.removeChild(B)}return D},getElement:function(B){var A=MochiKit.DOM;if(arguments.length==1){return((typeof (B)=="string")?A._document.getElementById(B):B)}else{return MochiKit.Base.map(A.getElement,arguments)}},getElementsByTagAndClassName:function(E,H,I){var J=MochiKit.DOM;if(typeof (E)=="undefined"||E===null){E="*"}if(typeof (I)=="undefined"||I===null){I=J._document}I=J.getElement(I);var D=(I.getElementsByTagName(E)||J._document.all);if(typeof (H)=="undefined"||H===null){return MochiKit.Base.extend(null,D)}var B=[];for(var G=0;G/g,">")},toHTML:function(A){return MochiKit.DOM.emitHTML(A).join("")},emitHTML:function(C,F){if(typeof (F)=="undefined"||F===null){F=[]}var H=[C];var M=MochiKit.DOM;var L=M.escapeHTML;var A=M.attributeArray;while(H.length){C=H.pop();if(typeof (C)=="string"){F.push(C)}else{if(C.nodeType==1){F.push("<"+C.nodeName.toLowerCase());var D=[];var I=A(C);for(var E=0;E");H.push("");var G=C.childNodes;for(E=G.length-1;E>=0;E--){H.push(G[E])}}else{F.push("/>")}}else{if(C.nodeType==3){F.push(L(C.nodeValue))}}}}return F},scrapeText:function(B,A){var C=[];(function(F){var G=F.childNodes;if(G){for(var E=0;E0){var B=D.filter;A=function(L){return B(A.ignoreAttrFilter,L.attributes)};A.ignoreAttr={};var K=J.attributes;var E=A.ignoreAttr;for(var G=0;G1){var A=MochiKit.DOM.getElement(arguments[0]);var K=arguments[1];var F=arguments[2];var C=arguments[3];for(var E=H.length-1;E>=0;E--){var B=H[E];if(B[0]===A&&B[1]===K&&B[4]===F&&B[5]===C){J._disconnect(B);H.splice(E,1);return true}}}else{var I=D.findIdentical(H,G);if(I>=0){J._disconnect(G);H.splice(I,1);return true}}return false},disconnectAll:function(A,J){A=MochiKit.DOM.getElement(A);var B=MochiKit.Base;var C=B.flattenArguments(B.extend(null,arguments,1));var H=MochiKit.Signal;var G=H._disconnect;var F=H._observers;if(C.length===0){for(var E=F.length-1;E>=0;E--){var D=F[E];if(D[0]===A){G(D);F.splice(E,1)}}}else{var I={};for(var E=0;E=0;E--){var D=F[E];if(D[0]===A&&D[1] in I){G(D);F.splice(E,1)}}}},signal:function(G,F){var E=MochiKit.Signal._observers;G=MochiKit.DOM.getElement(G);var A=MochiKit.Base.extend(null,arguments,2);var H=[];for(var B=0;B1){var D=new Error("Multiple errors thrown in handling 'sig', see errors property");D.errors=H;throw D}}}});MochiKit.Signal.EXPORT_OK=[];MochiKit.Signal.EXPORT=["connect","disconnect","signal","disconnectAll"];MochiKit.Signal.__new__=function(C){var A=MochiKit.Base;this._document=document;this._window=C;try{this.connect(window,"onunload",this._unloadCache)}catch(B){}this.EXPORT_TAGS={":common":this.EXPORT,":all":A.concat(this.EXPORT,this.EXPORT_OK)};A.nameFunctions(this)};MochiKit.Signal.__new__(this);if(MochiKit.__export__){connect=MochiKit.Signal.connect;disconnect=MochiKit.Signal.disconnect;disconnectAll=MochiKit.Signal.disconnectAll;signal=MochiKit.Signal.signal}MochiKit.Base._exportSymbols(this,MochiKit.Signal);MochiKit.Base.update(MochiKit.Base,{isIE:function(){return/MSIE/.test(navigator.userAgent)},isGecko:function(){return/Gecko/.test(navigator.userAgent)},isKHTML:function(){return/Konqueror|Safari|KHTML/.test(navigator.userAgent)},isSafari:function(){return/AppleWebKit'/.test(navigator.appVersion)},isOpera:function(){return/Opera/.test(navigator.userAgent)}});MochiKit.Base.update(MochiKit.DOM,{getStyle:function(B,C){B=MochiKit.DOM.getElement(B);var D=B.style[MochiKit.Base.camelize(C)];if(!D){if(document.defaultView&&document.defaultView.getComputedStyle){var A=document.defaultView.getComputedStyle(B,null);D=A?A.getPropertyValue(C):null}else{if(B.currentStyle){D=B.currentStyle[MochiKit.Base.camelize(C)]}}}if(MochiKit.Base.isOpera()&&(MochiKit.Base.find(["left","top","right","bottom"],C))){if(MochiKit.DOM.getStyle(B,"position")=="static"){D="auto"}}return D=="auto"?null:D},setStyle:function(B,C){B=MochiKit.DOM.getElement(B);for(var A in C){B.style[MochiKit.Base.camelize(A)]=C[A]}},getOpacity:function(B){var A;if(A=MochiKit.DOM.getStyle(B,"opacity")){return parseFloat(A)}if(A=(MochiKit.DOM.getStyle(B,"filter")||"").match(/alpha\(opacity=(.*)\)/)){if(A[1]){return parseFloat(A[1])/100}}return 1},getInlineOpacity:function(A){return MochiKit.DOM.getElement(A).style.opacity||""},setOpacity:function(A,C){A=MochiKit.DOM.getElement(A);if(C==1){var B=A.style.cssText;if(MochiKit.Base.isIE()){B=B.replace(/filter: ?alpha\([^\)]*\);?/gi,"")}A.style.cssText=B.replace(/opacity: ?\d\.?\d*/gi,"")}else{if(C<0.00001){C=0}MochiKit.DOM.setStyle(A,{opacity:C});if(MochiKit.Base.isIE()){MochiKit.DOM.setStyle(A,{filter:MochiKit.DOM.getStyle(A,"filter").replace(/alpha\([^\)]*\)/gi,"")+"alpha(opacity="+C*100+")"})}}},isVisible:function(A){return MochiKit.DOM.getElement(A).style.display!="none"},makeClipping:function(A){A=MochiKit.DOM.getElement(A);if(A._overflow){return }A._overflow=A.style.overflow;if((MochiKit.DOM.getStyle(A,"overflow")||"visible")!="hidden"){A.style.overflow="hidden"}},undoClipping:function(A){A=MochiKit.DOM.getElement(A);if(!A._overflow){return }A.style.overflow=A._overflow;A._overflow=undefined},makePositioned:function(A){A=MochiKit.DOM.getElement(A);var B=MochiKit.DOM.getStyle(A,"position");if((B=="static"||!B)&&!A._madePositioned){A._madePositioned=true;A.style.position="relative";if(MochiKit.Base.isOpera()){A.style.top=0;A.style.left=0}}},undoPositioned:function(A){A=MochiKit.DOM.getElement(A);if(A._madePositioned){A._madePositioned=undefined;A.style.position=A.style.top=A.style.left=A.style.bottom=A.style.right=""}},getFirstElementByTagAndClassName:function(D,G,H){var I=MochiKit.DOM;if(typeof (D)=="undefined"||D===null){D="*"}if(typeof (H)=="undefined"||H===null){H=I._document}H=I.getElement(H);var C=(H.getElementsByTagName(D)||I._document.all);if(typeof (G)=="undefined"||G===null){return MochiKit.Base.extend(null,C)}for(var F=0;F=this.offset.y&&C=this.offset.x&&A=this.offset.y&&this.ycomp=this.offset.x&&this.xcomp0){return B}}return null},fromBackground:function(B){var A=MochiKit.Color.Color;return A.fromComputedStyle(B,"backgroundColor","background-color")||A.whiteColor()},fromText:function(B){var A=MochiKit.Color.Color;return A.fromComputedStyle(B,"color","color")||A.blackColor()},namedColors:function(){return MochiKit.Base.clone(MochiKit.Color.Color._namedColors)}});MochiKit.Base.update(MochiKit.Color,{__new__:function(){var A=MochiKit.Base;A.nameFunctions(this);this.EXPORT_TAGS={":common":this.EXPORT,":all":A.concat(this.EXPORT,this.EXPORT_OK)}}});MochiKit.Color.EXPORT=["Color"];MochiKit.Color.EXPORT_OK=["clampColorComponent","rgbToHSL","hslToRGB","rgbToHSV","hsvToRGB","toColorPart"];MochiKit.Color.__new__();MochiKit.Base._exportSymbols(this,MochiKit.Color);if(typeof (dojo)!="undefined"){dojo.provide("MochiKit.Iter");dojo.require("MochiKit.Base")}if(typeof (JSAN)!="undefined"){JSAN.use("MochiKit.Base",[])}try{if(typeof (MochiKit.Base)=="undefined"){throw""}}catch(e){throw"MochiKit.Iter depends on MochiKit.Base!"}if(typeof (MochiKit.Iter)=="undefined"){MochiKit.Iter={}}MochiKit.Iter.NAME="MochiKit.Iter";MochiKit.Iter.VERSION="1.4";MochiKit.Base.update(MochiKit.Iter,{__repr__:function(){return"["+this.NAME+" "+this.VERSION+"]"},toString:function(){return this.__repr__()},registerIteratorFactory:function(B,A,D,C){MochiKit.Iter.iteratorRegistry.register(B,A,D,C)},iter:function(D,C){var B=MochiKit.Iter;if(arguments.length==2){return B.takewhile(function(F){return F!=C},D)}if(typeof (D.next)=="function"){return D}else{if(typeof (D.iter)=="function"){return D.iter()}}try{return B.iteratorRegistry.match(D)}catch(E){var A=MochiKit.Base;if(E==A.NotFound){E=new TypeError(typeof (D)+": "+A.repr(D)+" is not iterable")}throw E}},repeat:function(B,C){var A=MochiKit.Base;if(typeof (C)=="undefined"){return{repr:function(){return"repeat("+A.repr(B)+")"},toString:A.forwardCall("repr"),next:function(){return B}}}return{repr:function(){return"repeat("+A.repr(B)+", "+C+")"},toString:A.forwardCall("repr"),next:function(){if(C<=0){throw MochiKit.Iter.StopIteration}C-=1;return B}}},next:function(A){return A.next()},ifilter:function(C,B){var A=MochiKit.Base;B=MochiKit.Iter.iter(B);if(C===null){C=A.operator.truth}return{repr:function(){return"ifilter(...)"},toString:A.forwardCall("repr"),next:function(){while(true){var D=B.next();if(C(D)){return D}}return undefined}}},ifilterfalse:function(C,B){var A=MochiKit.Base;B=MochiKit.Iter.iter(B);if(C===null){C=A.operator.truth}return{repr:function(){return"ifilterfalse(...)"},toString:A.forwardCall("repr"),next:function(){while(true){var D=B.next();if(!C(D)){return D}}return undefined}}},imap:function(C,H,F){var A=MochiKit.Base;var D=MochiKit.Iter;var B=A.map(D.iter,A.extend(null,arguments,1));var G=A.map;var E=D.next;return{repr:function(){return"imap(...)"},toString:A.forwardCall("repr"),next:function(){return C.apply(this,G(E,B))}}},list:function(C){var A=MochiKit.Base;if(typeof (C.slice)=="function"){return C.slice()}else{if(A.isArrayLike(C)){return A.concat(C)}}var B=MochiKit.Iter;C=B.iter(C);var E=[];try{while(true){E.push(C.next())}}catch(D){if(D!=B.StopIteration){throw D}return E}return undefined},forEach:function(E,D,B){var A=MochiKit.Base;if(arguments.length>2){D=A.bind(D,B)}if(A.isArrayLike(E)){try{for(var C=0;C=B.length){throw MochiKit.Iter.StopIteration}return B[A++]}}},hasIterateNext:function(A){return(A&&typeof (A.iterateNext)=="function")},iterateNextIter:function(A){return{repr:function(){return"iterateNextIter(...)"},toString:MochiKit.Base.forwardCall("repr"),next:function(){var B=A.iterateNext();if(B===null||B===undefined){throw MochiKit.Iter.StopIteration}return B}}}});MochiKit.Iter.EXPORT_OK=["iteratorRegistry","arrayLikeIter","hasIterateNext","iterateNextIter",];MochiKit.Iter.EXPORT=["StopIteration","registerIteratorFactory","iter","count","cycle","repeat","next","izip","ifilter","ifilterfalse","islice","imap","applymap","chain","takewhile","dropwhile","tee","list","reduce","range","sum","exhaust","forEach","every","sorted","reversed","some","iextend","groupby","groupby_as_array"];MochiKit.Iter.__new__=function(){var A=MochiKit.Base;if(typeof (StopIteration)!="undefined"){this.StopIteration=StopIteration}else{this.StopIteration=new A.NamedError("StopIteration")}this.iteratorRegistry=new A.AdapterRegistry();this.registerIteratorFactory("arrayLike",A.isArrayLike,this.arrayLikeIter);this.registerIteratorFactory("iterateNext",this.hasIterateNext,this.iterateNextIter);this.EXPORT_TAGS={":common":this.EXPORT,":all":A.concat(this.EXPORT,this.EXPORT_OK)};A.nameFunctions(this)};MochiKit.Iter.__new__();if(MochiKit.__export__){reduce=MochiKit.Iter.reduce}MochiKit.Base._exportSymbols(this,MochiKit.Iter);if(typeof (dojo)!="undefined"){dojo.provide("MochiKit.Visual");dojo.require("MochiKit.Base");dojo.require("MochiKit.DOM");dojo.require("MochiKit.Style");dojo.require("MochiKit.Color");dojo.require("MochiKit.Iter")}if(typeof (JSAN)!="undefined"){JSAN.use("MochiKit.Base",[]);JSAN.use("MochiKit.DOM",[]);JSAN.use("MochiKit.Style",[]);JSAN.use("MochiKit.Color",[]);JSAN.use("MochiKit.Iter",[])}try{if(typeof (MochiKit.Base)==="undefined"||typeof (MochiKit.DOM)==="undefined"||typeof (MochiKit.Style)==="undefined"||typeof (MochiKit.Color)==="undefined"||typeof (MochiKit.Iter)==="undefined"){throw""}}catch(e){throw"MochiKit.Visual depends on MochiKit.Base, MochiKit.DOM, MochiKit.Style, MochiKit.Color and MochiKit.Iter!"}if(typeof (MochiKit.Visual)=="undefined"){MochiKit.Visual={}}MochiKit.Visual.NAME="MochiKit.Visual";MochiKit.Visual.VERSION="1.4";MochiKit.Visual.__repr__=function(){return"["+this.NAME+" "+this.VERSION+"]"};MochiKit.Visual.toString=function(){return this.__repr__()};MochiKit.Visual.forceRerendering=function(A){try{A=MochiKit.DOM.getElement(A);var C=document.createTextNode(" ");A.appendChild(C);A.removeChild(C)}catch(B){}};MochiKit.Visual.PAIRS={slide:["slideDown","slideUp"],blind:["blindDown","blindUp"],appear:["appear","fade"],size:["grow","shrink"]};MochiKit.Visual.Transitions={};MochiKit.Visual.Transitions.linear=function(A){return A};MochiKit.Visual.Transitions.sinoidal=function(A){return(-Math.cos(A*Math.PI)/2)+0.5};MochiKit.Visual.Transitions.reverse=function(A){return 1-A};MochiKit.Visual.Transitions.flicker=function(A){return((-Math.cos(A*Math.PI)/4)+0.75)+Math.random()/4};MochiKit.Visual.Transitions.wobble=function(A){return(-Math.cos(A*Math.PI*(9*A))/2)+0.5};MochiKit.Visual.Transitions.pulse=function(A){return(Math.floor(A*10)%2==0?(A*10-Math.floor(A*10)):1-(A*10-Math.floor(A*10)))};MochiKit.Visual.Transitions.none=function(A){return 0};MochiKit.Visual.Transitions.full=function(A){return 1};MochiKit.Visual.ScopedQueue=function(){this.__init__()};MochiKit.Base.update(MochiKit.Visual.ScopedQueue.prototype,{__init__:function(){this.effects=[];this.interval=null},add:function(D){var E=new Date().getTime();var A=(typeof (D.options.queue)=="string")?D.options.queue:D.options.queue.position;var B=MochiKit.Iter.forEach;switch(A){case"front":B(this.effects,function(F){if(F.state=="idle"){F.startOn+=D.finishOn;F.finishOn+=D.finishOn}});break;case"end":var C;B(this.effects,function(G){var F=G.finishOn;if(F>=(C||F)){C=F}});E=C||E;break}D.startOn+=E;D.finishOn+=E;if(!D.options.queue.limit||this.effects.length=this.startOn){if(C>=this.finishOn){this.render(1);this.cancel();this.event("beforeFinish");this.finish();this.event("afterFinish");return }var B=(C-this.startOn)/(this.finishOn-this.startOn);var A=Math.round(B*this.options.fps*this.options.duration);if(A>this.currentFrame){this.render(B);this.currentFrame=A}}},render:function(A){if(this.state=="idle"){this.state="running";this.event("beforeSetup");this.setup();this.event("afterSetup")}if(this.state=="running"){if(this.options.transition){A=this.options.transition(A)}A*=(this.options.to-this.options.from);A+=this.options.from;this.event("beforeUpdate");this.update(A);this.event("afterUpdate")}},cancel:function(){if(!this.options.sync){MochiKit.Visual.Queues.get(typeof (this.options.queue)=="string"?"global":this.options.queue.scope).remove(this)}this.state="finished"},setup:function(){},finish:function(){},update:function(A){},event:function(A){if(this.options[A+"Internal"]){this.options[A+"Internal"](this)}if(this.options[A]){this.options[A](this)}},repr:function(){return"["+this.__class__.NAME+", options:"+MochiKit.Base.repr(this.options)+"]"}};MochiKit.Visual.Opacity=function(B,A){this.__init__(B,A)};MochiKit.Visual.Opacity.prototype=new MochiKit.Visual.Base();MochiKit.Base.update(MochiKit.Visual.Opacity.prototype,{__init__:function(C,B){var A=MochiKit.Base;var D=MochiKit.DOM;this.element=D.getElement(C);if(A.isIE()&&(!this.element.currentStyle.hasLayout)){D.setStyle(this.element,{zoom:1})}B=A.update({from:D.getOpacity(this.element)||0,to:1},B||{});this.start(B)},update:function(A){MochiKit.DOM.setOpacity(this.element,A)}});MochiKit.Visual.Move=function(B,A){this.__init__(B,A)};MochiKit.Visual.Move.prototype=new MochiKit.Visual.Base();MochiKit.Base.update(MochiKit.Visual.Move.prototype,{__init__:function(B,A){this.element=MochiKit.DOM.getElement(B);A=MochiKit.Base.update({x:0,y:0,mode:"relative"},A||{});this.start(A)},setup:function(){var D=MochiKit.DOM;D.makePositioned(this.element);var B=this.element.style;var C=B.visibility;var A=B.display;if(A=="none"){B.visibility="hidden";B.display=""}this.originalLeft=parseFloat(D.getStyle(this.element,"left")||"0");this.originalTop=parseFloat(D.getStyle(this.element,"top")||"0");if(this.options.mode=="absolute"){this.options.x-=this.originalLeft;this.options.y-=this.originalTop}if(A=="none"){B.visibility=C;B.display=A}},update:function(A){MochiKit.DOM.setStyle(this.element,{left:Math.round(this.options.x*A+this.originalLeft)+"px",top:Math.round(this.options.y*A+this.originalTop)+"px"})}});MochiKit.Visual.Scale=function(B,C,A){this.__init__(B,C,A)};MochiKit.Visual.Scale.prototype=new MochiKit.Visual.Base();MochiKit.Base.update(MochiKit.Visual.Scale.prototype,{__init__:function(B,C,A){this.element=MochiKit.DOM.getElement(B);A=MochiKit.Base.update({scaleX:true,scaleY:true,scaleContent:true,scaleFromCenter:false,scaleMode:"box",scaleFrom:100,scaleTo:C},A||{});this.start(A)},setup:function(){this.restoreAfterFinish=this.options.restoreAfterFinish||false;this.elementPositioning=MochiKit.DOM.getStyle(this.element,"position");var B=MochiKit.Iter.forEach;var A=MochiKit.Base.bind;this.originalStyle={};B(["top","left","width","height","fontSize"],A(function(D){this.originalStyle[D]=this.element.style[D]},this));this.originalTop=this.element.offsetTop;this.originalLeft=this.element.offsetLeft;var C=MochiKit.DOM.getStyle(this.element,"font-size")||"100%";B(["em","px","%"],A(function(D){if(C.indexOf(D)>0){this.fontSize=parseFloat(C);this.fontSizeType=D}},this));this.factor=(this.options.scaleTo-this.options.scaleFrom)/100;if(/^content/.test(this.options.scaleMode)){this.dims=[this.element.scrollHeight,this.element.scrollWidth]}else{if(this.options.scaleMode=="box"){this.dims=[this.element.offsetHeight,this.element.offsetWidth]}else{this.dims=[this.options.scaleMode.originalHeight,this.options.scaleMode.originalWidth]}}},update:function(A){var B=(this.options.scaleFrom/100)+(this.factor*A);if(this.options.scaleContent&&this.fontSize){MochiKit.DOM.setStyle(this.element,{fontSize:this.fontSize*B+this.fontSizeType})}this.setDimensions(this.dims[0]*B,this.dims[1]*B)},finish:function(){if(this.restoreAfterFinish){MochiKit.DOM.setStyle(this.element,this.originalStyle)}},setDimensions:function(A,D){var E={};if(this.options.scaleX){E.width=Math.round(D)+"px"}if(this.options.scaleY){E.height=Math.round(A)+"px"}if(this.options.scaleFromCenter){var C=(A-this.dims[0])/2;var B=(D-this.dims[1])/2;if(this.elementPositioning=="absolute"){if(this.options.scaleY){E.top=this.originalTop-C+"px"}if(this.options.scaleX){E.left=this.originalLeft-B+"px"}}else{if(this.options.scaleY){E.top=-C+"px"}if(this.options.scaleX){E.left=-B+"px"}}}MochiKit.DOM.setStyle(this.element,E)}});MochiKit.Visual.fade=function(C,B){var D=MochiKit.DOM;var A=D.getInlineOpacity(C);B=MochiKit.Base.update({from:D.getOpacity(C)||1,to:0,afterFinishInternal:function(E){if(E.options.to!==0){return }MochiKit.Style.hideElement(E.element);D.setStyle(E.element,{opacity:A})}},B||{});return new MochiKit.Visual.Opacity(C,B)};MochiKit.Visual.appear=function(C,B){var D=MochiKit.DOM;var A=MochiKit.Visual;B=MochiKit.Base.update({from:(D.getStyle(C,"display")=="none"?0:D.getOpacity(C)||0),to:1,afterFinishInternal:function(E){A.forceRerendering(E.element)},beforeSetupInternal:function(E){D.setOpacity(E.element,E.options.from);MochiKit.Style.showElement(E.element)}},B||{});return new A.Opacity(C,B)};MochiKit.Visual.blindUp=function(B,A){var C=MochiKit.DOM;B=C.getElement(B);C.makeClipping(B);A=MochiKit.Base.update({scaleContent:false,scaleX:false,restoreAfterFinish:true,afterFinishInternal:function(D){MochiKit.Style.hideElement(D.element);C.undoClipping(D.element)}},A||{});return new MochiKit.Visual.Scale(B,0,A)};MochiKit.Visual.blindDown=function(C,B){var D=MochiKit.DOM;C=D.getElement(C);var A=MochiKit.Style.getElementDimensions(C);B=MochiKit.Base.update({scaleContent:false,scaleX:false,scaleFrom:0,scaleMode:{originalHeight:A.h,originalWidth:A.w},restoreAfterFinish:true,afterSetupInternal:function(E){D.makeClipping(E.element);D.setStyle(E.element,{height:"0px"});MochiKit.Style.showElement(E.element)},afterFinishInternal:function(E){D.undoClipping(E.element)}},B||{});return new MochiKit.Visual.Scale(C,100,B)};MochiKit.Visual.Color=MochiKit.Color.Color;MochiKit.Visual.getElementsComputedStyle=MochiKit.DOM.computedStyle;MochiKit.Visual.__new__=function(){var A=MochiKit.Base;A.nameFunctions(this);this.EXPORT_TAGS={":common":this.EXPORT,":all":A.concat(this.EXPORT,this.EXPORT_OK)}};MochiKit.Visual.EXPORT=["roundElement","roundClass","tagifyText","multiple","toggle","Base","Parallel","Opacity","Move","Scale","Highlight","ScrollTo","fade","appear","puff","blindUp","blindDown","switchOff","dropOut","shake","slideDown","slideUp","squish","grow","shrink","pulsate","fold"];MochiKit.Visual.EXPORT_OK=["PAIRS"];MochiKit.Visual.__new__();MochiKit.Base._exportSymbols(this,MochiKit.Visual);var log4javascript;(function(){function D(){return function(){}}function G(J,I){for(var H in I){J[H]=I[H]}}var E=D();var C=D();G(C.prototype,{addAppender:E,removeAppender:E,removeAllAppenders:E,log:E,setLevel:E,getLevel:E,trace:E,debug:E,info:E,warn:E,error:E,fatal:E});var A=function(){return new C()};log4javascript={isStub:true,version:"dummy",logLog:{setQuietMode:E,setAlertAllErrors:E,debug:E,warn:E,error:E},addErrorListener:E,removeErrorListener:E,setEnabled:E,setShowStackTraces:E,isEnabled:E,evalInScope:E,getLogger:A,getDefaultLogger:A,getNullLogger:A,Level:D(),LoggingEvent:D(),Layout:D(),Appender:D()};log4javascript.LoggingEvent.prototype={getThrowableStrRep:E};log4javascript.Level.prototype={toString:E,equals:E,isGreaterOrEqual:E};var F=new log4javascript.Level();G(log4javascript.Level,{ALL:F,TRACE:F,DEBUG:F,INFO:F,WARN:F,ERROR:F,FATAL:F,OFF:F});log4javascript.Layout.prototype={defaults:{},format:E,ignoresThrowable:E,getContentType:E,allowBatching:E,getDataValues:E,setKeys:E,setCustomField:E,hasCustomFields:E};log4javascript.SimpleLayout=D();log4javascript.SimpleLayout.prototype=new log4javascript.Layout();log4javascript.XmlLayout=D();log4javascript.XmlLayout.prototype=new log4javascript.Layout();log4javascript.XmlLayout.prototype.escapeCdata=E;log4javascript.JsonLayout=D();log4javascript.JsonLayout.prototype=new log4javascript.Layout();G(log4javascript.JsonLayout.prototype,{setReadable:E,isReadable:E});log4javascript.HttpPostDataLayout=D();log4javascript.HttpPostDataLayout.prototype=new log4javascript.Layout();log4javascript.PatternLayout=D();log4javascript.PatternLayout.prototype=new log4javascript.Layout();log4javascript.NullLayout=D();log4javascript.NullLayout.prototype=new log4javascript.Layout();log4javascript.Appender=D();log4javascript.Appender.prototype={layout:new log4javascript.PatternLayout(),threshold:log4javascript.Level.ALL,doAppend:E,append:E,setLayout:E,getLayout:E,setThreshold:E,getThreshold:E,toString:E};log4javascript.AlertAppender=D();log4javascript.AlertAppender.prototype=new log4javascript.Appender();log4javascript.ArrayAppender=D();log4javascript.ArrayAppender.prototype=new log4javascript.Appender();log4javascript.AjaxAppender=D();log4javascript.AjaxAppender.prototype=new log4javascript.Appender();G(log4javascript.AjaxAppender.prototype,{isTimed:E,setTimed:E,getTimerInterval:E,setTimerInterval:E,isWaitForResponse:E,setWaitForResponse:E,getBatchSize:E,setBatchSize:E,setRequestSuccessCallback:E,setFailCallback:E,sendAll:E,defaults:{requestSuccessCallback:null,failCallback:null}});function B(){}B.prototype=new log4javascript.Appender();G(B.prototype,{create:E,isNewestMessageAtTop:E,setNewestMessageAtTop:E,isScrollToLatestMessage:E,setScrollToLatestMessage:E,getWidth:E,setWidth:E,getHeight:E,setHeight:E,getMaxMessages:E,setMaxMessages:E});log4javascript.InPageAppender=D();log4javascript.InPageAppender.prototype=new B();G(log4javascript.InPageAppender.prototype,{isInitiallyMinimized:E,setInitiallyMinimized:E,hide:E,show:E,isVisible:E,close:E,defaults:{layout:new log4javascript.PatternLayout(),maxMessages:null}});log4javascript.InlineAppender=log4javascript.InPageAppender;log4javascript.PopUpAppender=D();log4javascript.PopUpAppender.prototype=new B();G(log4javascript.PopUpAppender.prototype,{isUseOldPopUp:E,setUseOldPopUp:E,isComplainAboutPopUpBlocking:E,setComplainAboutPopUpBlocking:E,isFocusPopUp:E,setFocusPopUp:E,isReopenWhenClosed:E,setReopenWhenClosed:E,close:E,defaults:{layout:new log4javascript.PatternLayout(),maxMessages:null}});log4javascript.BrowserConsoleAppender=D();log4javascript.BrowserConsoleAppender.prototype=new log4javascript.Appender()})();var log4javascript_dummy=log4javascript;if(typeof bobj=="undefined"){bobj={}}if(typeof bobj.external=="undefined"){bobj.external={}}if(typeof bobj.external.date=="undefined"){bobj.external.date={}}bobj.external.date.MONTH_NAMES=new Array("January","February","March","April","May","June","July","August","September","October","November","December","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");bobj.external.date.DAY_NAMES=new Array("Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sun","Mon","Tue","Wed","Thu","Fri","Sat");bobj.external.date.LZ=function(A){return(A<0||A>9?"":"0")+A};bobj.external.date.isDate=function(C,B){var A=bobj.external.date.getDateFromFormat(C,B);if(!A){return false}return true};bobj.external.date.compareDates=function(E,F,C,D){var B=bobj.external.date.getDateFromFormat(E,F);var A=bobj.external.date.getDateFromFormat(C,D);if(!B||!A){return -1}else{if(B.getTime()>A.getTime()){return 1}}return 0};bobj.external.date.formatDate=function(f,a){a=a+"";var J="";var T=0;var e="";var D="";var I=f.getFullYear()+"";var F=f.getMonth()+1;var b=f.getDate();var N=f.getDay();var L=f.getHours();var V=f.getMinutes();var P=f.getSeconds();var R,S,B,Q,g,C,Z,Y,W,O,n,L,l,G,A,X;var U=new Object();while(I.length<4){I="0"+I}U.y=""+I;U.yyyy=I;U.yy=I.substring(2,4);U.Y=U.y;U.YY=U.yy;U.YYYY=U.yyyy;U.M=F;U.MM=bobj.external.date.LZ(F);U.MMM=bobj.external.date.MONTH_NAMES[F-1];U.NNN=bobj.external.date.MONTH_NAMES[F+11];U.d=b;U.dd=bobj.external.date.LZ(b);U.D=U.d;U.DD=U.dd;U.E=bobj.external.date.DAY_NAMES[N+7];U.EE=bobj.external.date.DAY_NAMES[N];U.H=L;U.HH=bobj.external.date.LZ(L);if(L==0){U.h=12}else{if(L>12){U.h=L-12}else{U.h=L}}U.hh=bobj.external.date.LZ(U.h);if(L>11){U.K=L-12}else{U.K=L}U.k=L+1;U.KK=bobj.external.date.LZ(U.K);U.kk=bobj.external.date.LZ(U.k);if(L>11){U.a="PM"}else{U.a="AM"}U.m=V;U.mm=bobj.external.date.LZ(V);U.s=P;U.ss=bobj.external.date.LZ(P);while(T=E;A--){var B=F.substring(D,D+A);if(B.length70){G=1900+(G-0)}else{G=2000+(G-0)}}}else{if(D=="MMM"||D=="NNN"){Q=0;for(var L=0;L11)){Q=L+1;if(Q>12){Q-=12}S+=B.length;break}}}if((Q<1)||(Q>12)){return null}}else{if(D=="EE"||D=="E"){for(var L=0;L12)){return null}S+=Q.length}else{if(D=="dd"||D=="DD"||D=="d"||D=="D"){P=bobj.external.date._getInt(T,S,D.length,2);if(P==null||(P<1)||(P>31)){return null}S+=P.length}else{if(D=="hh"||D=="h"){A=bobj.external.date._getInt(T,S,D.length,2);if(A==null||(A<1)||(A>12)){return null}S+=A.length}else{if(D=="HH"||D=="H"){A=bobj.external.date._getInt(T,S,D.length,2);if(A==null||(A<0)||(A>23)){return null}S+=A.length}else{if(D=="KK"||D=="K"){A=bobj.external.date._getInt(T,S,D.length,2);if(A==null||(A<0)||(A>11)){return null}S+=A.length}else{if(D=="kk"||D=="k"){A=bobj.external.date._getInt(T,S,D.length,2);if(A==null||(A<1)||(A>24)){return null}S+=A.length;A--}else{if(D=="mm"||D=="m"){N=bobj.external.date._getInt(T,S,D.length,2);if(N==null||(N<0)||(N>59)){return null}S+=N.length}else{if(D=="ss"||D=="s"){K=bobj.external.date._getInt(T,S,D.length,2);if(K==null||(K<0)||(K>59)){return null}S+=K.length}else{if(D=="a"){if(T.substring(S,S+2).toLowerCase()=="am"){H="AM"}else{if(T.substring(S,S+2).toLowerCase()=="pm"){H="PM"}else{return null}}S+=2}else{if(T.substring(S,S+D.length)!=D){return null}else{S+=D.length}}}}}}}}}}}}}}if(S!=T.length){return null}if(Q==2){if(((G%4==0)&&(G%100!=0))||(G%400==0)){if(P>29){return null}}else{if(P>28){return null}}}if((Q==4)||(Q==6)||(Q==9)||(Q==11)){if(P>30){return null}}if(A!==null){if(A<12&&H=="PM"){A=A-0+12}else{if(A>11&&H=="AM"){A-=12}}}var C=new Date(G,Q-1,P,A,N,K);C.setFullYear(G);return C};_userAgent=navigator.userAgent?navigator.userAgent.toLowerCase():null;_ie=(document.all!=null)?true:false;_dom=(document.getElementById!=null)?true:false;_isQuirksMode=(document.compatMode!="CSS1Compat");_dtd4=!_ie||(document.compatMode!="BackCompat");_show="visible";_hide="hidden";_hand=_ie?"hand":"pointer";_appVer=navigator.appVersion.toLowerCase();_webKit=(_userAgent.indexOf("safari")>=0)||(_userAgent.indexOf("applewebkit")>=0);_mac=(_appVer.indexOf("macintosh")>=0)||(_appVer.indexOf("macos")>=0);_opera=(_userAgent.indexOf("opera")!=-1);_userAgent=navigator.userAgent?navigator.userAgent.toLowerCase():null;_ctrl=0;_shift=1;_alt=2;var docMode=document.documentMode;var _ie6Up=(docMode>=6);var _ie8Up=(docMode>=8);var _ie10Up=(docMode>=10);var _ie11Up=(docMode>=11);_moz=_dom&&!_ie&&!_ie11Up;_saf=_moz&&(_userAgent.indexOf("safari")>=0);_small=(screen.height<=600);_curDoc=document;_curWin=self;_tooltipWin=self;_tooltipDx=0;_tooltipDy=0;_codeWinName="_CW";_leftBtn=(_ie||_saf)?1:0;_preloadArr=new Array;_widgets=new Array;_resizeW=_ie6Up?"col-resize":"E-resize";_resizeH=_ie6Up?"row-resize":"S-resize";_ddData=new Array;_dontNeedEncoding=null;_thex=null;_defaultButtonWidth=60;function initDom(D,C,E,B,A){_skin=D;_lang=E;_style=C;if(B){_curWin=B;_curDoc=B.document}_tooltipWin=_curWin;if(A){_codeWinName="_CW"+A}_curWin[_codeWinName]=self}function styleSheet(){includeCSS("style")}function isLayerDisplayed(A){var B=A?A.style:null;if(B){if(B.display=="none"||B.visibility=="hidden"){return false}else{var C=A.parentNode;if(C!=null){return isLayerDisplayed(C)}else{return true}}}else{return true}}function safeSetFocus(A){if(A&&A.focus&&isLayerDisplayed(A)){A.focus()}}function newWidget(B){var A=new Object;A.id=B;A.layer=null;A.css=null;A.getHTML=Widget_getHTML;A.beginHTML=Widget_getHTML;A.endHTML=Widget_getHTML;A.write=Widget_write;A.begin=Widget_begin;A.end=Widget_end;A.init=Widget_init;A.move=Widget_move;A.resize=Widget_resize;A.setBgColor=Widget_setBgColor;A.show=Widget_show;A.getWidth=Widget_getWidth;A.getHeight=Widget_getHeight;A.setHTML=Widget_setHTML;A.setDisabled=Widget_setDisabled;A.focus=Widget_focus;A.setDisplay=Widget_setDisplay;A.isDisplayed=Widget_isDisplayed;A.appendHTML=Widget_appendHTML;A.setTooltip=Widget_setTooltip;A.initialized=Widget_initialized;A.widx=_widgets.length;_widgets[A.widx]=A;return A}function new_Widget(A){return newWidget(A.id)}function getEvent(B,A){if(_ie&&(B==null)){B=A?A.event:_curWin.event}return B}function Widget_param(C,B,A){var D=C?C[B]:null;return D==null?A:D}function Widget_appendHTML(){append(_curDoc.body,this.getHTML())}function Widget_getHTML(){return""}function Widget_write(A){_curDoc.write(this.getHTML(A))}function Widget_begin(){_curDoc.write(this.beginHTML())}function Widget_end(){_curDoc.write(this.endHTML())}function Widget_init(){var A=this;A.layer=getLayer(A.id);A.css=A.layer.style;A.layer._widget=A.widx;if(A.initialHTML){A.setHTML(A.initialHTML)}}function Widget_move(A,C){var B=this.css;if(A!=null){if(_moz){B.left=""+A+"px"}else{B.pixelLeft=A}}if(C!=null){if(_moz){B.top=""+C+"px"}else{B.pixelTop=C}}}function Widget_focus(){safeSetFocus(this.layer)}function Widget_setBgColor(A){this.css.backgroundColor=A}function Widget_show(A){this.css.visibility=A?_show:_hide}function Widget_getWidth(){return this.layer.offsetWidth}function Widget_getHeight(){return this.layer.offsetHeight}function Widget_setHTML(A){var B=this;if(B.layer){B.layer.innerHTML=A}else{B.initialHTML=A}}function Widget_setDisplay(A){if(this.css){this.css.display=A?"":"none"}}function Widget_isDisplayed(){if(this.css.display=="none"){return false}else{return true}}function Widget_setDisabled(A){if(this.layer){this.layer.disabled=A}}function Widget_resize(A,B){if(A!=null){this.css.width=""+(Math.max(0,A))+"px"}if(B!=null){this.css.height=""+(Math.max(0,B))+"px"}}function Widget_setTooltip(A){this.layer.title=A}function Widget_initialized(){return this.layer!=null}function newGrabberWidget(A,D,G,F,H,E,C,B,I){o=newWidget(A);o.resizeCB=D;o.x=G;o.y=F;o.w=H;o.h=E;o.dx=0;o.dy=0;o.min=null;o.max=null;o.isHori=C;o.preloaded=new Image;o.preloaded.src=_skin+"../resizepattern.gif";o.buttonCB=B;o.allowGrab=true;o.collapsed=false;o.isFromButton=false;o.showGrab=GrabberWidget_showGrab;o.setCollapsed=GrabberWidget_setCollapsed;o.tooltipButton=I;o.getHTML=GrabberWidget_getHTML;o.enableGrab=GrabberWidget_enableGrab;o.setMinMax=GrabberWidget_setMinMax;if(window._allGrabbers==null){window._allGrabbers=new Array}o.index=_allGrabbers.length;_allGrabbers[o.index]=o;o.buttonLyr=null;o.setButtonImage=GrabberWidget_setButtonImage;o.getImgOffset=GrabberWidget_getImgOffset;return o}function GrabberWidget_setCollapsed(B,A){this.collapsed=B;this.setButtonImage(false,A)}function GrabberWidget_getImgOffset(A){var B=this;if(B.isHori){B.dx=(B.collapsed?12:0)+(A?6:0);B.dy=0}else{B.dy=(B.collapsed?12:0)+(A?6:0);B.dx=0}}function GrabberWidget_setButtonImage(A,B){var C=this;C.getImgOffset(A);C.tooltipButton=B;if(C.layer){if(C.buttonLyr==null){C.buttonLyr=getLayer("grabImg_"+C.id)}if(C.buttonLyr){changeSimpleOffset(C.buttonLyr,C.dx,C.dy,null,B)}}}function GrabberWidget_enableGrab(A){var B=this;B.allowGrab=A;if(B.css){B.css.cursor=B.allowGrab?(B.isHori?_resizeW:_resizeH):"default"}}function GrabberWidget_getHTML(){var B=this;var A=B.isHori?_resizeW:_resizeH;var D='onselectstart="return false" ondragstart="return false" onmousedown="'+_codeWinName+".GrabberWidget_down(event,'"+B.index+"',this);return false;\"";var C=_ie?(''):('');return getBGIframe("grabIframe_"+B.id)+C+'
