From 95ee5f11b68af41c312da392626d5bcc5f5b4185 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Wed, 11 Aug 2021 08:15:47 -0700 Subject: [PATCH] --- App_Code/ClsRH.vb | 9 ++++- Nomina/Nomina.aspx | 81 +++++++++++++++++++++++++++--------------- Nomina/Nomina.aspx.cs | 64 +++++++++++++++++++++++++++++---- RH/CatPersonal.aspx | 13 +++++-- RH/CatPersonal.aspx.vb | 5 +-- RH/Personal.aspx | 20 +++++------ RH/Personal.aspx.vb | 68 +++++++++++++++++------------------ vwd.webinfo | 6 ++++ 8 files changed, 182 insertions(+), 84 deletions(-) diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 502e985bb..f003ff601 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -5656,7 +5656,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Return Retorno End Function - Public Function SolicitudVacacionesAdd(CvePersonal As Integer, Fecha As Date, FechaFin As Date, Estatus As Integer, CveUsuario As Integer, CveAutoriza As Integer, Folio As Integer, Optional Motivo As String = "", Optional FechaPago As String = "", Optional diasinabiles As Integer = 0, Optional PorcentajePrimaVac As Decimal = -1, Optional CveTipoPago As Integer = 0, Optional diasExtras As Integer = 0) As Boolean + Public Function SolicitudVacacionesAdd(CvePersonal As Integer, Fecha As Date, FechaFin As Date, Estatus As Integer, CveUsuario As Integer, + CveAutoriza As Integer, Folio As Integer, Optional Motivo As String = "", Optional FechaPago As String = "", + Optional diasinabiles As Integer = 0, Optional PorcentajePrimaVac As Decimal = -1, + Optional CveTipoPago As Integer = 0, Optional diasExtras As Integer = 0, + Optional Ejercicio As Integer = 0, Optional PrimaVacacional As Integer = 1, Optional CobrarImss As Integer = 0) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_RH_SolicitudVacacionesAdd") @@ -5674,6 +5678,9 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@FechaPago", SqlDbType.VarChar).Value = FechaPago .Add("@CveTipoPago", SqlDbType.Int).Value = CveTipoPago .Add("@diasExtras", SqlDbType.Int).Value = diasExtras + .Add("@Ejercicio", SqlDbType.Int).Value = Ejercicio + .Add("@PrimaVacacional", SqlDbType.Int).Value = PrimaVacacional + .Add("@CobrarImss", SqlDbType.Int).Value = CobrarImss '.Add("@Motivo", SqlDbType.VarChar).Value = MotivoFechaPago As String = "", Optional diasinabiles End With diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx index bbedacc2e..a91e8dc38 100644 --- a/Nomina/Nomina.aspx +++ b/Nomina/Nomina.aspx @@ -1359,9 +1359,9 @@
-
- Forma de pago
- +
+ Forma de pago
+ @@ -1374,7 +1374,7 @@
- + Días extras
@@ -1382,27 +1382,28 @@
- + Ejercicio
- +
¿Prima Vacacional?
-
- -
- ¿Cobrar IMSS? +
+ +
+ ¿Cobrar IMSS? +
+
- -
+
Actualizar @@ -1687,20 +1688,45 @@
-
- - - +
+
+
Calcular automatico
-
- - - +
+
+
+ + + +
+
+
+ +
-
- - - +
+
+
+ + + +
+
+
+ +
+
+
+
+
+ + + +
+
+
+ +
@@ -2257,17 +2283,16 @@ Tipo Periodo:
- +
Salario Diario
-
+
-
-
+
<%--
--%> diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs index 5f0143d8c..14750421c 100644 --- a/Nomina/Nomina.aspx.cs +++ b/Nomina/Nomina.aspx.cs @@ -1823,11 +1823,33 @@ public partial class Nomina_Nomina2 : ClsPaginas TxtmcImporte.Text = ""; TxtmcImporteGrabado.Text = ""; Txtmcvalor.Text = ""; + ChkCalAutomaticoG.Checked = false; + ChkCalAutomatico.Checked = false; + ChkCalAutomaticoV.Checked = false; if (CveConcepto > 0) { DataRow drow = dtempleadosConceptos.FiltroPrimero(string.Format("CveConcepto={0} AND CvePersonal ={1}", CveConcepto, CvePersonal)); if (drow != null) { + int TipoCalculo = drow["Estatus"].ToString().ToEntero(); + ChkCalAutomaticoG.Checked = true; + ChkCalAutomatico.Checked = true; + ChkCalAutomaticoV.Checked = true; + if (TipoCalculo >= 5) + { + TipoCalculo -= 5; + ChkCalAutomaticoG.Checked = false; + } + if (TipoCalculo >= 3) + { + TipoCalculo -= 3; + ChkCalAutomatico.Checked = false; + } + if (TipoCalculo >= 1) + { + ChkCalAutomaticoV.Checked = false; + + } TxtmcImporte.Text = string.Format("{0:N2}", drow["Importe"]); TxtmcImporteGrabado.Text = string.Format("{0:N2}", drow["ImporteGravado"]); Txtmcvalor.Text = string.Format("{0:N2}", drow["Valor"]); @@ -1841,12 +1863,30 @@ public partial class Nomina_Nomina2 : ClsPaginas } } UPpanelModalUpConcepto.Update(); + ChkCalAutomaticoV_CheckedChanged(ChkCalAutomaticoV, null); + ChkCalAutomatico_CheckedChanged(ChkCalAutomatico, null); + ChkCalAutomaticoG_CheckedChanged(ChkCalAutomaticoG, null); + } + protected void ChkCalAutomaticoV_CheckedChanged(object sender, EventArgs e) + { + + Txtmcvalor.Enabled = !ChkCalAutomaticoV.Checked; + } + protected void ChkCalAutomatico_CheckedChanged(object sender, EventArgs e) + { + + TxtmcImporte.Enabled = !ChkCalAutomatico.Checked; + } + protected void ChkCalAutomaticoG_CheckedChanged(object sender, EventArgs e) + { + TxtmcImporteGrabado.Enabled = !ChkCalAutomaticoG.Checked; + } protected void BtnAceptarMC_Click(object sender, EventArgs e) { - int chkImporte = 1; - int chkImporteGravado = 1; - int chkImporteValor = 1; + int chkImporte = ChkCalAutomatico.Checked? 0:1; + int chkImporteGravado = ChkCalAutomaticoG.Checked ? 0 : 1; + int chkImporteValor = ChkCalAutomaticoV.Checked ? 0 : 1; bool continuar = true; int CveNomina = 0; double Total = 0; @@ -1858,12 +1898,15 @@ public partial class Nomina_Nomina2 : ClsPaginas CvePersonal = DdlmcPersonal.SelectedValue.ToEntero(); } int CveConcepto = DdlmcConceptos.SelectedValue.ToEntero(); - if (CveConcepto > 0 && CvePersonal > 0) - { decimal ImporteConcepto = TxtmcImporte.Text.Replace("$", "").Replace(",", "").ToDecimal(); - decimal ImporteGravadoConcepto = TxtmcImporteGrabado.Text.Replace("$", "").Replace(",", "").ToDecimal(); + decimal ImporteGravadoConcepto = ChkCalAutomaticoG.Checked ? 0.0m : TxtmcImporteGrabado.Text.Replace("$", "").Replace(",", "").ToDecimal(); decimal ImporteExentoConcepto = ImporteConcepto - ImporteGravadoConcepto; decimal ImporteValor = Txtmcvalor.Text.Replace("$", "").Replace(",", "").ToDecimal(); + if ((ImporteConcepto>= 0 && ImporteGravadoConcepto<= ImporteConcepto)|| (ImporteConcepto < 0 && ImporteGravadoConcepto >= ImporteConcepto)) + { + + if (CveConcepto > 0 && CvePersonal > 0) + { using (ClsNominas objNomina = new ClsNominas()) { @@ -1933,6 +1976,11 @@ public partial class Nomina_Nomina2 : ClsPaginas { Alert("Debe seleccionar un concepto.", TipoMensaje.MsgAdvertencia); } + } + } + else + { + Alert("el importe gravado no puede ser mayor al importe total, en caso de que el importe total sea negativo no puede ser menor.",TipoMensaje.MsgAdvertencia ); } } @@ -5728,7 +5776,8 @@ public partial class Nomina_Nomina2 : ClsPaginas VacFolioActual = VacFolioActual + 1; ClsRH objRH = new ClsRH(); // Dim continuar As Boolean = objRH.SolicitudVacacionesAdd(CvePersonal, fInicio, fFin, 0, UsuarioActual.CveUsuario, VacCveSupervisor, VacFolioActual, motivoVacaciones) - bool continuar = objRH.SolicitudVacacionesAdd(SRCvePersonal, fInicio, fFin, 0, UsuarioActual.CveUsuario, VacCveSupervisor, VacFolioActual, FechaPago: fechapago, diasinabiles: diasinhabil, CveTipoPago: DdlFormapagovacaciones.SelectedValue.ToEntero(), diasExtras: TxtVacDiasExtra.Text.ToEntero());// + bool continuar = objRH.SolicitudVacacionesAdd(SRCvePersonal, fInicio, fFin, 0, UsuarioActual.CveUsuario, VacCveSupervisor, VacFolioActual, FechaPago: fechapago, + diasinabiles: diasinhabil, CveTipoPago: DdlFormapagovacaciones.SelectedValue.ToEntero(), diasExtras: TxtVacDiasExtra.Text.ToEntero()); if (objRH.DtResultados.Rows.Count > 0) { string ShowError = objRH.DtResultados.Rows[0]["ShowError"].ToString(); @@ -6733,4 +6782,5 @@ public partial class Nomina_Nomina2 : ClsPaginas LnkSRVacacionesADD.Visible = true; } + } diff --git a/RH/CatPersonal.aspx b/RH/CatPersonal.aspx index 3f6a9d946..656147974 100644 --- a/RH/CatPersonal.aspx +++ b/RH/CatPersonal.aspx @@ -939,7 +939,16 @@
-