diff --git a/App_Code/ClsEncuestas.vb b/App_Code/ClsEncuestas.vb index 49e72f00e..5aeff458a 100644 --- a/App_Code/ClsEncuestas.vb +++ b/App_Code/ClsEncuestas.vb @@ -23,6 +23,8 @@ Public Class ClsEncuestas End Get End Property + Public Property CveEncuesta As Integer = -1 + #End Region Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing) @@ -460,8 +462,10 @@ Public Class ClsEncuestas #Region " E N C U E S T A S - E S T R U C T U R A " Public Function AddEncuesta(CveCampaña As Integer, CveCliente As Integer, NombreEncuesta As String, Observaciones As String, NumInvitaciones As Integer, - CveTipoEncuesta As Integer, SeContesto As Boolean, Fecha As DateTime, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + CveTipoEncuesta As Integer, SeContesto As Boolean, Fecha As DateTime, CveUsuario As Integer, CveEmpresa As Integer, Optional CveTipoProceso As Integer = -1) As Boolean Dim Retorno As Boolean = False + + CveEncuesta = -1 DataAdapter("PA_Enc_EncuestasAdd", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters .Add("@CveCampana", SqlDbType.Int).Value = CveCampaña @@ -474,9 +478,12 @@ Public Class ClsEncuestas .Add("@Fecha", SqlDbType.DateTime).Value = Fecha .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveTipoProceso", SqlDbType.Int).Value = CveTipoProceso + .Add("@CveEncuesta", SqlDbType.Int).Direction = ParameterDirection.Output End With Try SqlAdapter.Fill(Data) + CveEncuesta = SqlAdapter.SelectCommand.Parameters("@CveEncuesta").Value.ToString.ToEntero Retorno = True Catch ex As Exception OnError("Ocurrió un error al Agregar una Encuesta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 87658bb11..92975bdfe 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -4184,9 +4184,6 @@ Public Class ClsGenerales Return Retorno End Function - - - Public Function GetFolioFechaCancelacion(CveEmpresa As Integer, Tipo As Integer) As Boolean Dim Retorno As Boolean = False @@ -4207,6 +4204,197 @@ Public Class ClsGenerales End Function +#Region "C I T R I C O S" + Public Function GetTipoOrganicos(Optional CveEmpresa As Integer = -1) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_TipoOrganicosGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener el Catálogo de Tipos de Orgánicos de Productos y Servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + End Function + + Public Function AddTipoOrganico(TipoOrganico As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Gral_TipoOrganicosAdd") + + With SqlAdapter.SelectCommand.Parameters + .Add("@TipoOrganico", SqlDbType.VarChar).Value = TipoOrganico + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch Ex1 As SqlException + If Ex1.Message.Contains("Número: 2627;") Then + Alert("Ya existe un Tipo de Orgánico con el mismo nombre: " & TipoOrganico & ".", TipoMensaje.MsgAdvertencia) + Else + Me.OnError("Ocurrió un error al Guardar el Tipo de Orgánico.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End If + Catch ex As Exception + OnError("Ocurrió un error al Guardar el Tipo de Orgánico", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function UpdateTipoOrganico(TipoOrganico As String, Estatus As Boolean, CveTipoOrganico As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Gral_TipoOrganicosUpdate") + + With SqlAdapter.SelectCommand.Parameters + .Add("@TipoOrganico", SqlDbType.VarChar).Value = TipoOrganico + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveTipoOrganico", SqlDbType.Int).Value = CveTipoOrganico + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch Ex1 As SqlException + If Ex1.Message.Contains("Número: 2627;") Then + Alert("Ya existe un Tipo de Orgánico con el mismo nombre: " & TipoOrganico & ".", TipoMensaje.MsgAdvertencia) + Else + Me.OnError("Ocurrió un error al guardar los cambios en el Tipo de Orgánico", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End If + Catch ex As Exception + OnError("Ocurrió un error al guardar los cambios en el Tipo de Orgánico.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function RemoveTipoOrganico(CveTipoOrganico As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Gral_TipoOrganicosRemove") + + SqlAdapter.SelectCommand.Parameters.Add("@CveTipoOrganico", SqlDbType.Int).Value = CveTipoOrganico + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch Ex1 As SqlException + If Ex1.Message.Contains("Número: 547;") Then + Alert("El Tipo de Orgánico no se pudo eliminar porque está siendo usado por un registro.", TipoMensaje.MsgAdvertencia) + Else + Me.OnError("Ocurrió un error al eliminar el Tipo de Orgánico.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End If + Catch ex As Exception + Me.OnError("Ocurrió un error al eliminar el Tipo de Orgánico.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + End Function + Public Function GetEmpacados(Optional CveEmpresa As Integer = -1) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_EmpacadosGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener el Catálogo de Empacados de Productos y Servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + End Function + + Public Function AddEmpacado(TipoEmpacado As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Gral_EmpacadosAdd") + + With SqlAdapter.SelectCommand.Parameters + .Add("@TipoEmpacado", SqlDbType.VarChar).Value = TipoEmpacado + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch Ex1 As SqlException + If Ex1.Message.Contains("Número: 2627;") Then + Alert("Ya existe un Empacado con el mismo nombre: " & TipoEmpacado & ".", TipoMensaje.MsgAdvertencia) + Else + Me.OnError("Ocurrió un error al guardar el Empacado.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End If + Catch ex As Exception + OnError("Ocurrió un error al guardar el Empacado", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function UpdateEmpacado(TipoEmpacado As String, Estatus As Boolean, CveTipoEmpacado As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Gral_EmpacadosUpdate") + + With SqlAdapter.SelectCommand.Parameters + .Add("@TipoEmpacado", SqlDbType.VarChar).Value = TipoEmpacado + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveTipoEmpacado", SqlDbType.Int).Value = CveTipoEmpacado + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch Ex1 As SqlException + If Ex1.Message.Contains("Número: 2627;") Then + Alert("Ya existe un Empacado con el mismo nombre: " & TipoEmpacado & ".", TipoMensaje.MsgAdvertencia) + Else + Me.OnError("Ocurrió un error al guardar los cambios en el Empacado", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End If + Catch ex As Exception + OnError("Ocurrió un error al guardar los cambios en el Empacado.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function RemoveEmpacado(CveTipoEmpacado As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Gral_EmpacadosRemove") + + SqlAdapter.SelectCommand.Parameters.Add("@CveTipoEmpacado", SqlDbType.Int).Value = CveTipoEmpacado + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch Ex1 As SqlException + If Ex1.Message.Contains("Número: 547;") Then + Alert("El Empacado no se pudo eliminar porque está siendo usado por un registro.", TipoMensaje.MsgAdvertencia) + Else + Me.OnError("Ocurrió un error al eliminar el Empacado.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End If + Catch ex As Exception + Me.OnError("Ocurrió un error al eliminar el Empacado.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + End Function +#End Region + #Region "IDisposable Support" diff --git a/App_Code/ClsMovimientos.vb b/App_Code/ClsMovimientos.vb index 5caa49efb..0cbfb0931 100644 --- a/App_Code/ClsMovimientos.vb +++ b/App_Code/ClsMovimientos.vb @@ -110,28 +110,28 @@ Public Class ClsMovimientos Public Sub Commit() SqlTransacc.Commit() - End Sub - + End Sub + #Region "CxC" - 'Public Function GetCxCCliente(CveCliente As Integer) As Boolean - ' Dim Retorno As Boolean = False - ' 'Data = New DataTable - ' 'SqlAdapter = New SqlDataAdapter("PA_ClienteCxC", SqlConexion) - ' 'SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure - ' DataAdapter("PA_ClienteCxC") - ' SqlAdapter.SelectCommand.Parameters.Add("@CveCliente", SqlDbType.Int).Value = CveCliente - - ' Try - ' SqlAdapter.Fill(Data) - ' Retorno = True - ' Catch ex As SqlException - ' OnError("Ocurrió un error al consultar las CxC del Cliente.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - ' End Try - - ' Return Retorno - 'End Function - - Public Function GetCxCClienteDetalle(CveCliente As Integer, FechaI As String, FechaF As String, CveMoneda As Integer, CveSubProyecto As Integer, CveEmpresa As Integer, CveClienteSucursal As Integer, Optional TipoDocto As String = "-1", Optional FechaCorte As Date = MaxFecha, Optional CveIESustitucion As Integer = -1, Optional FechaVencimientoI As Date = MinFecha, Optional FechaVencimientoF As Date = MaxFecha) As Boolean + 'Public Function GetCxCCliente(CveCliente As Integer) As Boolean + ' Dim Retorno As Boolean = False + ' 'Data = New DataTable + ' 'SqlAdapter = New SqlDataAdapter("PA_ClienteCxC", SqlConexion) + ' 'SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure + ' DataAdapter("PA_ClienteCxC") + ' SqlAdapter.SelectCommand.Parameters.Add("@CveCliente", SqlDbType.Int).Value = CveCliente + + ' Try + ' SqlAdapter.Fill(Data) + ' Retorno = True + ' Catch ex As SqlException + ' OnError("Ocurrió un error al consultar las CxC del Cliente.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + ' End Try + + ' Return Retorno + 'End Function + + Public Function GetCxCClienteDetalle(CveCliente As Integer, FechaI As String, FechaF As String, CveMoneda As Integer, CveSubProyecto As Integer, CveEmpresa As Integer, CveClienteSucursal As Integer, Optional TipoDocto As String = "-1", Optional FechaCorte As Date = MaxFecha, Optional FechaVencimientoI As Date = MinFecha, Optional FechaVencimientoF As Date = MaxFecha) As Boolean Dim Retorno As Boolean = False FechaCorte = IIf(FechaCorte = Nothing, Date.Now.AddYears(1), FechaCorte).ToString.ToDate @@ -146,8 +146,7 @@ Public Class ClsMovimientos .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto .Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda - .Add("@FechaCorte", SqlDbType.Date).Value = FechaCorte - .Add("@CveIESustitucion", SqlDbType.Int).Value = CveIESustitucion + .Add("@FechaCorte", SqlDbType.Date).Value = FechaCorte .Add("@FechaVencimientoI", SqlDbType.Date).Value = FechaVencimientoI .Add("@FechaVencimientoF", SqlDbType.Date).Value = FechaVencimientoF End With diff --git a/App_Code/ClsProductosServicios.vb b/App_Code/ClsProductosServicios.vb index 319c6a699..a6c62f462 100644 --- a/App_Code/ClsProductosServicios.vb +++ b/App_Code/ClsProductosServicios.vb @@ -417,7 +417,7 @@ Public Class ClsProductosServicios Optional ClaveCategoriaToxicidad As String = "", Optional ClaveImpuestoTipoProducto As String = "", Optional Litraje As Double = -1, Optional EsOutSourcing As Boolean = False, Optional AplicaSerie As Boolean = False, Optional AplicaLote As Boolean = False, Optional AplicaCaducidad As Boolean = False, Optional AplicaSeccion As Boolean = False, Optional TiempoCaducidad As Integer = -1, Optional CvePSAdicionalVigencia As Integer = -1, Optional PrecioLibre As Boolean = False, Optional CveMaterialPeligroso As Integer = -1, Optional CveEmbalaje As Integer = -1, Optional PesoKg As Decimal = -1, Optional Dimensiones As String = "", Optional CveObjetoImpuesto As Integer = 0, - Optional RegistroRSCO As String = "-1", Optional FechaVigenciaRSCO As Date = MinFecha, Optional VigenciaIndeterminadaRSCO As Boolean = False) As Integer + Optional RegistroRSCO As String = "-1", Optional FechaVigenciaRSCO As Date = MinFecha, Optional VigenciaIndeterminadaRSCO As Boolean = False, Optional CveTipoEmpacado As Integer = -1, Optional CveTipoOrganico As Integer = -1) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_ProductosServiciosAdd") @@ -513,6 +513,10 @@ Public Class ClsProductosServicios .Add("@FechaVigenciaRSCO", SqlDbType.Date).Value = FechaVigenciaRSCO .Add("@VigenciaIndeterminadaRSCO", SqlDbType.Bit).Value = VigenciaIndeterminadaRSCO + 'Nuevo MLopez 18/11/2022 + .Add("@CveTipoEmpacado", SqlDbType.Int).Value = CveTipoEmpacado + .Add("@CveTipoOrganico", SqlDbType.Int).Value = CveTipoOrganico + End With Try @@ -661,7 +665,7 @@ Public Class ClsProductosServicios Optional ClaveCategoriaToxicidad As String = "", Optional ClaveImpuestoTipoProducto As String = "", Optional Litraje As Double = -1, Optional EsOutSourcing As Boolean = False, Optional AplicaSerie As Boolean = False, Optional AplicaLote As Boolean = False, Optional AplicaCaducidad As Boolean = False, Optional AplicaSeccion As Boolean = False, Optional TiempoCaducidad As Integer = -1, Optional CvePSAdicionalVigencia As Integer = -1, Optional PrecioLibre As Boolean = False, Optional CveMaterialPeligroso As Integer = -1, Optional CveEmbalaje As Integer = -1, Optional PesoKg As Decimal = -1, Optional Dimensiones As String = "", Optional CveObjetoImpuesto As Integer = 0, - Optional RegistroRSCO As String = "-1", Optional FechaVigenciaRSCO As Date = MinFecha, Optional VigenciaIndeterminadaRSCO As Boolean = False) As Boolean + Optional RegistroRSCO As String = "-1", Optional FechaVigenciaRSCO As Date = MinFecha, Optional VigenciaIndeterminadaRSCO As Boolean = False, Optional CveTipoEmpacado As Integer = -1, Optional CveTipoOrganico As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -757,6 +761,10 @@ Public Class ClsProductosServicios .Add("@FechaVigenciaRSCO", SqlDbType.Date).Value = FechaVigenciaRSCO .Add("@VigenciaIndeterminadaRSCO", SqlDbType.Bit).Value = VigenciaIndeterminadaRSCO + 'Nuevo MLopez 18/11/2022 + .Add("@CveTipoEmpacado", SqlDbType.Int).Value = CveTipoOrganico + .Add("@CveTipoOrganico", SqlDbType.Int).Value = CveTipoEmpacado + End With Try @@ -1375,7 +1383,7 @@ Public Class ClsProductosServicios Return Retorno End Function - Public Function AddPSAlias(PS As String, CvePS As Integer, Flexible As Boolean, CveUsuarioModifico As Integer) As Boolean + Public Function AddPSAlias(PS As String, CvePS As Integer, Flexible As Boolean, CveUsuarioModifico As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_ProductosServiciosAliasAdd") @@ -1384,6 +1392,7 @@ Public Class ClsProductosServicios .Add("@CvePS", SqlDbType.Int).Value = CvePS .Add("@Flexible", SqlDbType.Bit).Value = If(Flexible, 1, 0) .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index d07254317..b6ee28d2f 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -1459,9 +1459,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Public Property CveEstado As Integer Public Property Estado As String Public Property ClaveEstado As String - Public Property Telefono As String + Public Property Telefono As String + Public Property TelefonoEmergencia As String Public Property Celular As String Public Property LugarNacimiento As String + Public Property CredencialElector As String Public Property NombrePadre As String Public Property NombreMadre As String 'RH @@ -1673,9 +1675,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Me.Estado = Data.Rows(0)("Estado").ToString Me.ClaveEstado = Data.Rows(0)("ClaveEstado").ToString Me.Telefono = Data.Rows(0)("Telefono").ToString + Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString Me.Celular = Data.Rows(0)("Celular").ToString Me.RFC = Data.Rows(0)("RFC").ToString Me.CURP = Data.Rows(0)("CURP").ToString + Me.CredencialElector = Data.Rows(0)("CredencialElector").ToString Me.NombrePadre = Data.Rows(0)("NombrePadre").ToString Me.NombreMadre = Data.Rows(0)("NombreMadre").ToString Me.Cliente = Data.Rows(0)("ClienteAsignado").ToString @@ -1849,9 +1853,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Me.CveEstado = Data.Rows(0)("CveEstado").ToString.ToEntero Me.Estado = Data.Rows(0)("Estado").ToString Me.Telefono = Data.Rows(0)("Telefono").ToString + Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString Me.Celular = Data.Rows(0)("Celular").ToString Me.RFC = Data.Rows(0)("RFC").ToString Me.CURP = Data.Rows(0)("CURP").ToString + Me.CredencialElector = Data.Rows(0)("CredencialElector").ToString Me.NombrePadre = Data.Rows(0)("NombrePadre").ToString Me.NombreMadre = Data.Rows(0)("NombreMadre").ToString Me.Cliente = Data.Rows(0)("ClienteAsignado").ToString @@ -1929,7 +1935,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, CveTipoContrato As Integer, Ubicacion As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, CveMotivoBaja As Integer, FechaBaja As String, CveEstatusPersonal As Integer, FechaNacimiento As Date, LugarNacimiento As String, - Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, Celular As String, RFC As String, CURP As String, + Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String, NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String, CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1, Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Boolean = False, Optional CvePais As Integer = -1, @@ -1985,9 +1991,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@CveEstado", SqlDbType.VarChar).Value = CveEstado '.Add("@Estado", SqlDbType.VarChar).Value = Estado .Add("@Telefono", SqlDbType.VarChar).Value = Telefono + .Add("@TelefonoEmergencia", SqlDbType.VarChar).Value = TelefonoEmergencia .Add("@Celular", SqlDbType.VarChar).Value = Celular .Add("@RFC", SqlDbType.VarChar).Value = RFC .Add("@CURP", SqlDbType.VarChar).Value = CURP + .Add("@CredencialElector", SqlDbType.VarChar).Value = CredencialElector .Add("@NombrePadre", SqlDbType.VarChar).Value = NombrePadre .Add("@NombreMadre", SqlDbType.VarChar).Value = NombreMadre .Add("@CveClienteAsignado", SqlDbType.Int).Value = CveClienteAsignado @@ -2060,7 +2068,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, CveTipoContrato As Integer, Ubicacion As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, CveMotivoBaja As Integer, FechaBaja As String, CveEstatusPersonal As Integer, FechaNacimiento As Date, LugarNacimiento As String, - Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, Celular As String, RFC As String, CURP As String, + Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String, NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, CvePersonal As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String, CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveEmpresa As Integer, CveUsuarioNomina As Integer, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1, Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveUsuarioModifico As Integer = -1, @@ -2118,9 +2126,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@CveEstado", SqlDbType.VarChar).Value = CveEstado '.Add("@Estado", SqlDbType.VarChar).Value = Estado .Add("@Telefono", SqlDbType.VarChar).Value = Telefono + .Add("@TelefonoEmergencia", SqlDbType.VarChar).Value = TelefonoEmergencia .Add("@Celular", SqlDbType.VarChar).Value = Celular .Add("@RFC", SqlDbType.VarChar).Value = RFC .Add("@CURP", SqlDbType.VarChar).Value = CURP + .Add("@CredencialElector", SqlDbType.VarChar).Value = CredencialElector .Add("@NombrePadre", SqlDbType.VarChar).Value = NombrePadre .Add("@NombreMadre", SqlDbType.VarChar).Value = NombreMadre .Add("@CveClienteAsignado", SqlDbType.Int).Value = CveClienteAsignado diff --git a/Bin/ADSNetLibrary.dll b/Bin/ADSNetLibrary.dll index 90c5f7b0f..6f63611e6 100644 Binary files a/Bin/ADSNetLibrary.dll and b/Bin/ADSNetLibrary.dll differ diff --git a/CRM/Acercamiento.aspx b/CRM/Acercamiento.aspx index f75e9a814..c17f410ef 100644 --- a/CRM/Acercamiento.aspx +++ b/CRM/Acercamiento.aspx @@ -1255,7 +1255,7 @@
- +
@@ -1702,6 +1702,10 @@ } + function retFalse() { + return false; + } +