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:
HECTOR RODRIGUEZ
2021-04-26 10:38:27 -07:00
parent 2491d0c2cb 26adace5e3
commit 2a5c0d853c
10 changed files with 368 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
App_Code/ClsRH.vb
View File

@@ -1742,7 +1742,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
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,
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) As Boolean
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) As Boolean
Dim Retorno As Boolean = False
@@ -1823,7 +1823,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@TelefonoMarcadoRapido", SqlDbType.VarChar).Value = TelefonoMarcadoRapido
.Add("@ContactoAlterno", SqlDbType.VarChar).Value = ContactoAlterno
.Add("@CveTipodeSalario", SqlDbType.Int).Value = CveTipodeSalario
.Add("@Sindicalizado", SqlDbType.Bit).Value = Sindicalizado
.Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue
End With
@@ -1855,7 +1856,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
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,
Optional FechaActivo As Date = MinFecha, Optional FechaReingreso As Date = MinFecha, Optional CveTipodeSalario As Integer = 1) As Boolean
Optional FechaActivo As Date = MinFecha, Optional FechaReingreso As Date = MinFecha, Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Integer = -1) As Boolean
Dim Retorno As Boolean = False
@@ -1940,7 +1941,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@FechaActivo", SqlDbType.Date).Value = FechaActivo
.Add("@FechaReingreso", SqlDbType.Date).Value = FechaReingreso
.Add("@CveTipodeSalario", SqlDbType.Int).Value = CveTipodeSalario
.Add("@Sindicalizado", SqlDbType.Int).Value = Sindicalizado
End With
Try

8
App_Code/LogicNominas.vb
View File

@@ -88,6 +88,7 @@ Public Class LogicNominas
Dim NombreCompleto As String = ""
Dim CURP As String = ""
Dim Sindicalizado As Boolean = False
Dim NumeroSS As String = ""
Dim FechaInicioContrato As String = ""
Dim CodigoTipoContrato As String = ""
@@ -101,6 +102,7 @@ Public Class LogicNominas
Dim ClaveBanco As String = ""
Dim BancoNumCuenta As String = ""
Dim SDI As Double = 0
Dim SalarioDiarioSS As Double = 0
Dim ClaveEstado As String = ""
Dim ObjIncapacidades As New List(Of CFDINominaIncapacidades)
@@ -120,6 +122,7 @@ Public Class LogicNominas
RFC = objPersonal.RFC
NombreCompleto = objPersonal.NombreCompleto
Sindicalizado = objPersonal.DtResultados.Rows(0)("Sindicalizado").ToString().ToUpper().Contiene("TRUE", "1")
CURP = objPersonal.CURP
NumeroSS = objPersonal.NumeroSS
FechaInicioContrato = objPersonal.FechaInicioContrato.ToString()
@@ -134,6 +137,7 @@ Public Class LogicNominas
ClaveBanco = objPersonal.ClaveBanco
BancoNumCuenta = objPersonal.BancoNumCuenta
SDI = objPersonal.SDI
SalarioDiarioSS = objPersonal.SalarioDiarioSS
ClaveEstado = objPersonal.ClaveEstado
AntiguedadSemanas = DateDiff(DateInterval.Weekday, objPersonal.FechaIngreso, Now).ToEntero()
@@ -368,8 +372,8 @@ Public Class LogicNominas
cfdi.Nomina.Receptor.CodigoBanco = ClaveBanco
cfdi.Nomina.Receptor.NumeroCuenta = BancoNumCuenta
cfdi.Nomina.Receptor.SDI = SDI
cfdi.Nomina.Receptor.SBC = SDI
cfdi.Nomina.Receptor.Sindicalizado = ""
cfdi.Nomina.Receptor.SBC = SalarioDiarioSS
cfdi.Nomina.Receptor.Sindicalizado = If(Sindicalizado, "Si", "No")
cfdi.Nomina.Receptor.CodigoEntidadFederativa = ClaveEstado
cfdi.Conceptos.Add(New CFDIConceptos With {.Cantidad = 1, .ClaveUnidad = "ACT", .ClaveProdServ = "84111505", .Descripcion = "Pago de nómina", .ValorUnitario = cfdi.Comprobante.Subtotal, .Importe = cfdi.Comprobante.Subtotal, .Descuento = cfdi.Nomina.TotalDeducciones.ToString().ToDecimal()})

2
Nomina/Nomina.aspx.vb
View File

@@ -229,7 +229,7 @@ Partial Class Nomina_Nomina
Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
If Not IsPostBack Then
If UsuarioActual.CveEmpresa.Contiene(1, 80, 72, 119, 153, 158) Then
If UsuarioActual.CveEmpresa.Contiene(1, 48, 80, 72, 119, 153, 154, 158) Then
Response.Redirect("/Nomina/Nomina2.aspx")
End If
CargaTiposPeriodo()

23
Nomina/Nomina2.aspx
View File

@@ -4,6 +4,13 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style>
.lblforchk {
font-size: 13px;
color: #888888;
opacity: 1;
display: block;
}
.dnone {
display: none !important;
}
@@ -539,7 +546,7 @@
<div id="DModalModAsistencia" class="modal ADS fade" role="dialog">
<asp:UpdatePanel ID="UpdatePanel1" class="modal-dialog" tabindex="-1" runat="server" UpdateMode="Conditional">
<asp:UpdatePanel ID="UpModalAsistencia" class="modal-dialog" tabindex="-1" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="modal-content rowpadding">
<div class="modal-header">
@@ -2310,7 +2317,7 @@
<div style="width: 140px; display: inline-block;">
<div class="form-group form-md-line-input">
<asp:TextBox ID="TXTFechaFin" CssClass="form-control" runat="server"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TXTFechaFin">Fecha Inicio:</asp:Label>
<asp:Label runat="server" AssociatedControlID="TXTFechaFin">Fecha Fin:</asp:Label>
<ajax:MaskedEditExtender ID="MEEFechaFin" runat="server" TargetControlID="TXTFechaFin" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
<ajax:CalendarExtender runat="server" ID="CEEFechaFin" TargetControlID="TXTFechaFin" PopupButtonID="LnkFechaFin" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
<asp:RequiredFieldValidator ID="RFVFechaFin" runat="server" ControlToValidate="TXTFechaFin" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''FechaNacimiento''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGetTxts"></asp:RequiredFieldValidator>
@@ -2327,6 +2334,18 @@
</div>
</div>
<div class="form-group form-md-line-input">
<asp:Label CssClass="lblforchk" runat="server" Text="Altas:"></asp:Label>
<asp:CheckBox ID="ChkSuaAltas" Text=" " CssClass="chksino" runat="server" />
</div>
<div class="form-group form-md-line-input">
<asp:Label CssClass="lblforchk" runat="server" Text="Bajas:"></asp:Label>
<asp:CheckBox ID="ChkSuaBajas" Text=" " CssClass="chksino" runat="server" />
</div>
<%--<div class="form-group form-md-line-input">
<asp:Label CssClass="lblforchk" runat="server" Text="Label"></asp:Label><br />
<asp:CheckBox ID="CheckBox3" CssClass="chksino" runat="server" />
</div>--%>
</div>
<div class="modal-footer">

15
Nomina/Nomina2.aspx.cs
View File

@@ -4514,7 +4514,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
TxtHorasDobles.Text = dr["HorasDobles"].ToString();
TxtHorasTriples.Text = dr["HorasTriples"].ToString();
DdlMotivoHoraExtra.SelectedValueExist(dr["CveMotivoHoraExtra"].ToString());
TxtPorPago.Text = dr["Observacion"].ToString();
TxtObservaciones.Text = dr["Observacion"].ToString();
// CveAsistenciasInasistencias
// PorcentajePago
// HorasDobles
@@ -4526,6 +4526,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
}
UpModalAsistencia.Update();
RegistraScript("$('#DModalModAsistencia').modal();");
}
@@ -4799,7 +4800,17 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
RegistraScript(string.Format("SaveCsv(\"MovtosAfil.txt\", '{0}');SaveCsv(\"MovtosmodSalario.txt\", '{1}');SaveCsv(\"movtosBajas.txt\", '{2}');", MovtosAfil.Replace("'", "\\'"), MovtosmodSalario.Replace("'", "\\'"), movtosBajas.Replace("'", "\\'")));
string script = "";// string.Format("SaveCsv(\"MovtosAfil.txt\", '{0}');SaveCsv(\"MovtosmodSalario.txt\", '{1}');SaveCsv(\"movtosBajas.txt\", '{2}');", MovtosAfil.Replace("'", "\\'"), MovtosmodSalario.Replace("'", "\\'"), movtosBajas.Replace("'", "\\'"));
if (ChkSuaAltas.Checked)
{
script= string.Format("{1}SaveCsv(\"MovtosAfil.txt\", '{0}');", MovtosAfil.Replace("'", "\\'"), script);
}
if (ChkSuaBajas.Checked)
{
script = string.Format("{1}SaveCsv(\"movtosBajas.txt\", '{0}');", movtosBajas.Replace("'", "\\'"), script);
}
RegistraScript(script);
RegistraScript("$('#DmodalGetSua').modal('hide');");
}

1
RH/CalculoSBC.aspx
View File

@@ -386,6 +386,7 @@
</ajax:TabPanel>
<ajax:TabPanel ID="TabDetalleParteVariable" runat="server" HeaderText="Detalle parte variable">
<ContentTemplate>
<asp:GridView ID="GVDetalleParteVariable" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" ></asp:GridView>
</ContentTemplate>
</ajax:TabPanel>
</ajax:TabContainer>

5
RH/CalculoSBC.aspx.cs
View File

@@ -32,6 +32,11 @@ public partial class RH_CalculoSBC : ClsPaginas
GVCalculosSBC.DataSource = objnom.DTSetResultados.Tables[0];
GVCFija.DataSource = objnom.DTSetResultados.Tables[0];
GVPV.DataSource = objnom.DTSetResultados.Tables[0];
if(objnom.DTSetResultados.Tables.Count > 0)
{
GVDetalleParteVariable.DataSource = objnom.DTSetResultados.Tables[1];
GVDetalleParteVariable.DataBind();
}
}
}
GVCalculosSBC.DataBind();

527
RH/Personal.aspx
View File

File diff suppressed because it is too large Load Diff

5
RH/Personal.aspx.vb
View File

@@ -1396,6 +1396,7 @@ Partial Class RH_Personal
Dim drow As DataRow = ObjPersonal.DtResultados.Rows(0)
ChkEstemporal.Checked = drow("esTemporal").ToString() = "1"
CHKRFCValidado.Checked = drow("RFCValidado").ToString() = "1"
ChkSindicalizado.Checked = drow("Sindicalizado").ToString().ToUpper().Contiene("1", "TRUE")
TxtMailrecibonomina.Text = drow("MaiReciboNomina").ToString()
'Carga Datos Personales
LtlPersonal.Text = ObjPersonal.NombreCompleto
@@ -1718,7 +1719,7 @@ Partial Class RH_Personal
DdlClienteAsignado.SelectedValue.ToEntero, DdlSubProyectoAsignado.SelectedValue.ToEntero, URL,
DdlSupervisor.SelectedValue.ToEntero, TxtCLABE.Text.Trim, TxtBancoNumCuenta.Text.Trim, DdlJornada.SelectedValue.ToEntero, DdlViaticos.SelectedValue.ToEntero, DdlViaticos.SelectedItem.Text,
DdlPrestamos.SelectedValue.ToEntero, DdlPrestamos.SelectedItem.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero, DdlSubproyectoZona.SelectedValue.ToEntero, CveUniforme:=DdlUniforme.SelectedValue.ToEntero,
TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero()) Then
TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=ChkSindicalizado.Checked) Then
If Archivo.Exists Then
@@ -1791,7 +1792,7 @@ Partial Class RH_Personal
URL, DdlSupervisor.SelectedValue.ToEntero, TxtCLABE.Text.Trim, TxtBancoNumCuenta.Text.Trim, DdlJornada.SelectedValue.ToEntero, DdlViaticos.SelectedValue.ToEntero, DdlViaticos.SelectedItem.Text,
DdlPrestamos.SelectedValue.ToEntero, DdlPrestamos.SelectedItem.Text, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero, DdlSubproyectoZona.SelectedValue.ToEntero, CveUniforme:=DdlUniforme.SelectedValue.ToEntero,
TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveUsuarioModifico:=UsuarioActual.CveUsuario,
FechaActivo:=FechaActivo, FechaReingreso:=FechaReingreso, CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero()) Then
FechaActivo:=FechaActivo, FechaReingreso:=FechaReingreso, CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=If(ChkSindicalizado.Checked, 1, 0)) Then
'Funsion usa RH Familiares
If UsuarioActual.Empresa.Funcionalidad(568) = "1" Then

2
vwd.webinfo
View File

@@ -232,6 +232,8 @@