AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2021-12-13 05:33:12 -07:00
parent e0db97e3c7 c4fba42ac0
commit 01d0d6128a
63 changed files with 3094 additions and 3336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RH/CatPersonal.aspx
View File

@@ -887,7 +887,7 @@
<i></i>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlEstados" runat="server" DataTextField="Estado" DataValueField="CveEstado" Width="100%" Class="form-control input-sm select2me"></asp:DropDownList>
<asp:DropDownList ID="DdlEstados" runat="server" DataTextField="NombreEstado" DataValueField="CveEstado" Width="100%" Class="form-control input-sm select2me"></asp:DropDownList>
<label for="<%= DdlEstados.ClientID.ToString()%>">Lugar de nacimiento: </label>
<asp:RequiredFieldValidator ID="RfvDdlEstados" runat="server" ControlToValidate="DdlEstados" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Género''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardarAddS"></asp:RequiredFieldValidator>
<i></i>

4
RH/CatPersonal.aspx.vb
View File

@@ -188,7 +188,7 @@ Partial Class RH_CatPersonal
DdlJornada.DataBind()
End Sub
Private Sub CargaEstados()
DdlEstados.DataSource = GlobalDTGralEstados(1)
DdlEstados.DataSource = GlobalDTGralEstados("MEX")
DdlEstados.DataBind()
End Sub
Private Sub CargaTipoRegimen()
@@ -902,7 +902,7 @@ Partial Class RH_CatPersonal
crow = 1
ccol = ccol + 1
Catalogos.Cell(crow, ccol).Value = "Estado"
For Each row As DataRow In GlobalDTGralEstados(1).Rows
For Each row As DataRow In GlobalDTGralEstados("MEX").Rows
crow = crow + 1
Catalogos.Cell(crow, ccol).Value = String.Format("{0}: {1}", row("CveEstado"), row("Estado"))
Next

2
RH/Personal.aspx
View File

@@ -315,7 +315,7 @@
<i></i>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlEstados" runat="server" DataTextField="Estado" DataValueField="CveEstado" Width="100%" Class="form-control input-sm select2me"></asp:DropDownList>
<asp:DropDownList ID="DdlEstados" runat="server" DataTextField="NombreEstado" DataValueField="CveEstado" Width="100%" Class="form-control input-sm select2me"></asp:DropDownList>
<label for="<%= DdlEstados.ClientID.ToString()%>">Estado: </label>
<i></i>
</div>

28
RH/Personal.aspx.vb
View File

@@ -1282,7 +1282,7 @@ Partial Class RH_Personal
End Sub
Private Sub CargaEstados(pCvePais As Integer)
DdlEstados.DataSource = GlobalDTGralEstados(pCvePais)
DdlEstados.DataSource = GlobalDTGralEstados("-1", pCvePais)
DdlEstados.DataBind()
End Sub
@@ -4456,22 +4456,22 @@ Partial Class RH_Personal
Protected Sub LBCancelar_Click(sender As Object, e As EventArgs)
Dim FolioFiscal = CType(sender, LinkButton).CommandArgument.ToString()
Dim gvr As GridViewRow = CType(CType(sender, LinkButton).BindingContainer, GridViewRow)
Dim CveNomina As Integer = gvr.DataKey("CveNomina").ToString().ToEntero()
Dim Total As Decimal = gvr.DataKey("Total").ToString().ToDecimal
Dim RFCReceptor As String = gvr.DataKey("RFC").ToString()
'Dim FolioFiscal = CType(sender, LinkButton).CommandArgument.ToString()
'Dim gvr As GridViewRow = CType(CType(sender, LinkButton).BindingContainer, GridViewRow)
'Dim CveNomina As Integer = gvr.DataKey("CveNomina").ToString().ToEntero()
'Dim Total As Decimal = gvr.DataKey("Total").ToString().ToDecimal
'Dim RFCReceptor As String = gvr.DataKey("RFC").ToString()
Dim Obj As New Timbrado
'Dim Obj As New Timbrado
If Obj.CFDICancelar(UsuarioActual.Empresa, FolioFiscal, Total, RFCReceptor, UsuarioActual.Empresa.RFC) Then
Dim ObjNomina As New ClsNominas()
ObjNomina.UpdateEstatusNomNominas(2, -1, "", "", Now, CveNomina)
ObjNomina.Dispose()
Alert("La nómina se canceló correctamente.", TipoMensaje.MsgInformacion)
End If
'If Obj.CFDICancelar(UsuarioActual.Empresa, FolioFiscal, Total, RFCReceptor, UsuarioActual.Empresa.RFC) Then
' Dim ObjNomina As New ClsNominas()
' ObjNomina.UpdateEstatusNomNominas(2, -1, "", "", Now, CveNomina)
' ObjNomina.Dispose()
' Alert("La nómina se canceló correctamente.", TipoMensaje.MsgInformacion)
'End If
Obj = Nothing
'Obj = Nothing
End Sub

6
RH/Prospectos.aspx.vb
View File

@@ -79,7 +79,7 @@ Partial Class Prospectos_Prospectos
DdlPaises.SelectedValue = "1"
DdlEmpresaPaises.SelectedValue = "1"
DdlEmpresaPaises.DataSource = GlobalDTGralPaises : DdlEmpresaPaises.DataBind()
DdlFiscalEstados.DataSource = GlobalDTGralEstados(1) : DdlFiscalEstados.DataBind()
DdlFiscalEstados.DataSource = GlobalDTGralEstados("MEX") : DdlFiscalEstados.DataBind()
'DdlMunicipios.DataSource = GlobalDTGralMunicipios : DdlMunicipios.DataBind()
@@ -337,11 +337,11 @@ Partial Class Prospectos_Prospectos
Private Sub CargaEstados(ddl As DropDownList, CvePais As Integer)
ddl.DataSource = GlobalDTGralEstados(CvePais) : ddl.DataBind()
ddl.DataSource = GlobalDTGralEstados("-1", CvePais:=CvePais) : ddl.DataBind()
End Sub
Private Sub CargaMunicipios(ddl As DropDownList, CveEstado As Integer)
ddl.DataSource = GlobalDTGralMunicipios(CveEstado) : ddl.DataBind()
ddl.DataSource = GlobalDTGralMunicipios("-1", CveEstado:=CveEstado) : ddl.DataBind()
End Sub
Protected Sub CargaCaracteristicas()

2
RH/RepCursos.aspx.vb
View File

@@ -86,7 +86,7 @@ Partial Class RH_RepCursos
End Sub
Protected Sub LnkExportar_Click(sender As Object, e As EventArgs) Handles LnkExportar.Click
Gv.ExportToExcelGembox("ReporteCapacitacion", UsuarioActual, "", "", "Report eCapacitación", "", 1)
Gv.ExportToExcelGembox("ReporteCapacitacion", UsuarioActual, "", "", "Report eCapacitación")
End Sub
Protected Sub Gv_RowDataBound(sender As Object, e As GridViewRowEventArgs)