diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 6a35f980b..678bccbbc 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -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 diff --git a/App_Code/LogicNominas.vb b/App_Code/LogicNominas.vb index e19a7325e..ae2fbadef 100644 --- a/App_Code/LogicNominas.vb +++ b/App_Code/LogicNominas.vb @@ -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()}) diff --git a/Nomina/Nomina.aspx.vb b/Nomina/Nomina.aspx.vb index b21b14462..435f425a8 100644 --- a/Nomina/Nomina.aspx.vb +++ b/Nomina/Nomina.aspx.vb @@ -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() diff --git a/Nomina/Nomina2.aspx b/Nomina/Nomina2.aspx index 46221f24b..ddf2c062f 100644 --- a/Nomina/Nomina2.aspx +++ b/Nomina/Nomina2.aspx @@ -4,6 +4,13 @@ @@ -32,7 +41,7 @@ PDF --%>
  • - Expediente de personal + Expediente de personal
  • Gafete @@ -61,7 +70,7 @@
  • - PDF consumo + PDF consumo
  • @@ -80,7 +89,7 @@ -
  • +
  • @@ -102,7 +111,7 @@
    - +
    + <%----%> @@ -1938,7 +1960,7 @@ Asistencia - + @@ -1962,7 +1984,7 @@ Motivo H. Extras - + @@ -1983,7 +2005,7 @@ -
    +

    @@ -2150,8 +2172,14 @@
    - - + + @@ -2304,7 +2332,7 @@
    @@ -175,7 +184,7 @@
    -
    +
    @@ -276,7 +285,7 @@
    -
    -
    - + <%-- @@ -580,7 +594,8 @@
    - Proyecto: + Proyecto: <%-- --%> @@ -588,7 +603,8 @@
    - SubProyecto: + SubProyecto: @@ -640,9 +656,9 @@
    -
    +
    - + @@ -659,9 +675,9 @@
    -
    +
    - + @@ -678,9 +694,9 @@
    -
    +
    - + @@ -751,7 +767,8 @@
    - + @@ -769,7 +786,7 @@
    -
    @@ -889,7 +906,7 @@ - + @@ -905,7 +922,7 @@
    -
    +
    Cuentas Bancarias @@ -1042,7 +1059,7 @@ - <%----%> @@ -1132,7 +1149,7 @@   - + @@ -1175,7 +1192,7 @@ CssClass="btn btn-circle btn-sm red" Text="" /> - + @@ -1192,7 +1209,7 @@
    -
    +
    Pagos Realizados @@ -1200,7 +1217,7 @@
    - + Factura @@ -1284,7 +1301,7 @@
    -
    +
    @@ -1362,7 +1379,7 @@
    -
    ComandosComandos
    -
    +
    @@ -1874,17 +1896,17 @@ --%>
    - + - + - @@ -1896,7 +1918,7 @@ - +
    - -
    + + @@ -2640,7 +2668,7 @@
    -
    @@ -2653,8 +2681,14 @@ - - + + @@ -2857,10 +2891,11 @@
    -
    Fecha Inicio:
    +
    Fecha Inicio:
    -
    - +
    + @@ -2874,10 +2909,11 @@
    -
    Fecha Fin:
    +
    Fecha Fin:
    -
    - +
    + @@ -2908,7 +2944,7 @@
    -
    -