diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb
index 283f9be3b..6fb81455d 100644
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -1908,9 +1908,22 @@ Public Class ClsRH
End Try
Return Retorno
+ End Function
+
+ Public Function PA_RH_PersonalSalarioMenorAlMinimo(cveEmpresa As Int32, calculaSalarioV As Boolean, guardar As Boolean, cveRegistroPatronal As Int32, salarioZonaA As Decimal, salarioZonaB As Decimal, salarioZonaC As Decimal, fecha As DateTime) As Boolean
+ Dim retorno As Boolean = False
+ DataAdapter("PA_RH_PersonalSalarioMenorAlMinimo", CommandType.StoredProcedure)
+ addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa)
+ addParameters("@CalculaSalarioV", SqlDbType.Bit, calculaSalarioV)
+ addParameters("@Guardar", SqlDbType.Bit, guardar)
+ addParameters("@CveRegistroPatronal", SqlDbType.Int, cveRegistroPatronal)
+ addParameters("@SalarioZonaA", SqlDbType.Money, salarioZonaA)
+ addParameters("@SalarioZonaB", SqlDbType.Money, salarioZonaB)
+ addParameters("@SalarioZonaC", SqlDbType.Money, salarioZonaC)
+ addParameters("@Fecha", SqlDbType.Date, fecha)
+ retorno = RunQuery("Ocurrió un error al obtener el personal con salario menor al minimo.")
+ Return retorno
End Function
-
-
Public Function GetPersonalMasivo(CveTurno As Integer, CveProyecto As Integer, CveSubProyecto As Integer, CveSupervisor As Integer, CveEmpresa As Integer, Optional CveCliente As Integer = -1) As Boolean
Dim Retorno As Boolean = False
'Data = New DataTable
@@ -1947,7 +1960,7 @@ Public Class ClsRH
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, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, 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,
- Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveTipoTrabajador As Integer = -1, Optional NetoPeriodo As Decimal = -1, Optional TipoSangre As String = "-1", Optional CveSubTipoPeriodo As Integer = -1) As Boolean
+ Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveTipoTrabajador As Integer = -1, Optional NetoPeriodo As Decimal = -1, Optional TipoSangre As String = "-1", Optional CveSubTipoPeriodo As Integer = -1, Optional AreaGeografica As String = "A") As Boolean
Dim Retorno As Boolean = False
Dim noguardoXcurp As Boolean = False
@@ -2036,6 +2049,7 @@ Public Class ClsRH
.Add("@CveTipoTrabajador", SqlDbType.Int).Value = CveTipoTrabajador
.Add("@NetoPeriodo", SqlDbType.Money).Value = NetoPeriodo
.Add("@TipoSangre", SqlDbType.VarChar).Value = TipoSangre
+ .Add("@AreaGeografica", SqlDbType.VarChar).Value = AreaGeografica
.Add("@CveSubTipoPeriodo", SqlDbType.Int).Value = CveSubTipoPeriodo
@@ -2079,7 +2093,7 @@ Public Class ClsRH
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,
Optional FechaActivo As Date = MinFecha, Optional FechaReingreso As Date = MinFecha, Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Integer = -1, Optional CvePais As Integer = -1, Optional Pensionado As Boolean = False, Optional CveRegistroPatronal As Integer = -1,
Optional CveEmpresaAsignado As Integer = -1, Optional CveMedioTransporte As Integer = -1, Optional EsReserva As Integer = -1, Optional Fiscalizable As Integer = -1, Optional CveTipoTrabajador As Integer = -1, Optional NetoPeriodo As Decimal = -1,
- Optional TipoSangre As String = "-1", Optional CveSubTipoPeriodo As Integer = -1) As Boolean
+ Optional TipoSangre As String = "-1", Optional CveSubTipoPeriodo As Integer = -1, Optional AreaGeografica As String = "") As Boolean
Dim Retorno As Boolean = False
@@ -2174,6 +2188,8 @@ Public Class ClsRH
.Add("@CveTipoTrabajador", SqlDbType.Int).Value = CveTipoTrabajador
.Add("@NetoPeriodo", SqlDbType.Money).Value = NetoPeriodo
.Add("@TipoSangre", SqlDbType.VarChar).Value = TipoSangre
+ .Add("@AreaGeografica", SqlDbType.VarChar).Value = AreaGeografica
+
.Add("@CveSubTipoPeriodo", SqlDbType.Int).Value = CveSubTipoPeriodo
End With
diff --git a/RH/CatPersonal.aspx.vb b/RH/CatPersonal.aspx.vb
index f6f4e2b7e..406889dd2 100644
--- a/RH/CatPersonal.aspx.vb
+++ b/RH/CatPersonal.aspx.vb
@@ -1196,7 +1196,8 @@ Partial Class RH_CatPersonal
-1, DdlSubProyectoAsignadoAdd.SelectedValue.ToEntero, "",
DdlSupervisor.SelectedValue.ToEntero, "", "", DdlJornada.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, "", -1, CveUniforme:=-1,
TelefonoExtension:="", CelularPersonal:="", TelefonoMarcadoRapido:="", ContactoAlterno:="", CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=isSindicalizado, CvePais:=151,
- CveMedioTransporte:=DdlMedioTransporte.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero()
+ CveMedioTransporte:=DdlMedioTransporte.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(),
+ AreaGeografica:=DdlAreageografica.SelectedValue
) Then
Dim filesgral As List(Of Archivo) = TxtFoto.getfiles().Archivos
Dim filemove As String = ""
diff --git a/RH/Personal.aspx b/RH/Personal.aspx
index c1a0d55b4..0b0bbf56c 100644
--- a/RH/Personal.aspx
+++ b/RH/Personal.aspx
@@ -1506,6 +1506,16 @@