diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb
index 4e1c5e4f6..af0b9aacd 100644
--- a/App_Code/ClsClientes.vb
+++ b/App_Code/ClsClientes.vb
@@ -3,8 +3,11 @@ Option Strict On
Imports System.Data
Imports System.Data.SqlClient
+Imports AjaxControlToolkit
Imports Extensiones
+Imports iText.StyledXmlParser.Css.Resolve.Shorthand.Impl
Imports Modelos
+Imports Stimulsoft.Report.Func
Public Class ClsClientes
Implements IDisposable
@@ -594,7 +597,7 @@ Public Class ClsClientes
Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False,
Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0,
Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False,
- Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1") As Boolean
+ Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True) As Boolean
Dim Retorno As Boolean = False
@@ -745,6 +748,7 @@ Public Class ClsClientes
.Add("@ComExtCalle", SqlDbType.VarChar).Value = ComExtCalle
.Add("@ComExtNumExt", SqlDbType.VarChar).Value = ComExtNumExt
.Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP
+ .Add("@Genero", SqlDbType.Bit).Value = Genero
End With
Try
SqlAdapter.Fill(Data)
@@ -793,7 +797,7 @@ Public Class ClsClientes
Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False,
Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1",
Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional NoDesglosaIVA As Boolean = False, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False,
- Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1") As Boolean
+ Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True) As Boolean
Dim Retorno As Boolean = False
@@ -960,7 +964,7 @@ Public Class ClsClientes
.Add("@ComExtCalle", SqlDbType.VarChar).Value = ComExtCalle
.Add("@ComExtNumExt", SqlDbType.VarChar).Value = ComExtNumExt
.Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP
-
+ .Add("@Genero", SqlDbType.Bit).Value = Genero
End With
@@ -1692,7 +1696,7 @@ Public Class ClsClientes
Public Function AgregarClienteNoFrecuente(Nombre As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, CveEstado As Integer,
RFC As String, CP As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveUsuario As Integer, CveEmpresa As Integer,
NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1, Optional RegimenSociedad As String = "-1",
- Optional TipoPersona As Boolean = False, Optional CveRegimenFiscal As Integer = -1, Optional CveUsoCFDI As Integer = -1) As Boolean
+ Optional TipoPersona As Boolean = False, Optional CveRegimenFiscal As Integer = -1, Optional CveUsoCFDI As Integer = -1, Optional Genero As Boolean = True) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_ClientesNoFrecuenteAdd")
@@ -1721,6 +1725,7 @@ Public Class ClsClientes
.Add("@TipoPersona", SqlDbType.Bit).Value = TipoPersona
.Add("@CveRegimenFiscal", SqlDbType.Int).Value = CveRegimenFiscal
.Add("@CveUsoCFDI", SqlDbType.Int).Value = CveUsoCFDI
+ .Add("@Genero", SqlDbType.Int).Value = Genero
End With
@@ -1752,7 +1757,7 @@ Public Class ClsClientes
Public Function UpdateClienteNoFrencuente(CveCliente As Integer, Nombre As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, CveEstado As Integer,
RFC As String, CP As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveUsuario As Integer, CveEmpresa As Integer,
- NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1) As Boolean
+ NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1, Optional Genero As Boolean = True) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_ClientesNoFrecuenteUpdate")
@@ -1778,6 +1783,7 @@ Public Class ClsClientes
.Add("@CveFormaPago33", SqlDbType.Int).Value = CveFormaPago33
.Add("@NumCuentaPago", SqlDbType.VarChar).Value = NumCuentaPago
.Add("@CvePrecioLista", SqlDbType.Int).Value = CvePrecioLista
+ .Add("@Genero", SqlDbType.Int).Value = Genero
End With
diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb
index 7606b0287..f8ca5d0f7 100644
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -1522,6 +1522,9 @@ Public Class ClsRH
Public Property NumeroSS As String
Public Property SeInscribioSS As Boolean
Public Property SalarioDiarioPago As Double
+ Public Property NetoPeriodo As Double
+
+
Public Property SalarioDiario As Double
Public Property SDI As Double
Public Property SalarioDiarioSS As Double
@@ -1640,6 +1643,7 @@ Public Class ClsRH
Me.NumeroSS = Data.Rows(0)("NumeroSS").ToString
Me.SeInscribioSS = CBool(Data.Rows(0)("SeInscribioSS").ToString)
Me.SalarioDiarioPago = Data.Rows(0)("SalarioDiarioPago").ToString.ToDouble
+ Me.NetoPeriodo = Data.Rows(0)("NetoPeriodo").ToString.ToDecimal
Me.SalarioDiario = Data.Rows(0)("SalarioDiario").ToString.ToDouble
Me.SDI = Data.Rows(0)("SDI").ToString.ToDouble
Me.Bono = Data.Rows(0)("Bono").ToString.ToDouble
@@ -1952,7 +1956,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, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, 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) 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) As Boolean
Dim Retorno As Boolean = False
Dim noguardoXcurp = False
@@ -2043,6 +2047,7 @@ Public Class ClsRH
.Add("@CveRegistroPatronal", SqlDbType.Int).Value = CveRegistroPatronal
.Add("@CveEmpresaAsignado", SqlDbType.Int).Value = CveEmpresaAsignado
.Add("@CveTipoTrabajador", SqlDbType.Int).Value = CveTipoTrabajador
+ .Add("@NetoPeriodo", SqlDbType.Money).Value = NetoPeriodo
@@ -2088,7 +2093,7 @@ Public Class ClsRH
CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, 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 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) As Boolean
+ 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) As Boolean
Dim Retorno As Boolean = False
@@ -2185,6 +2190,7 @@ Public Class ClsRH
.Add("@EsReserva", SqlDbType.Int).Value = EsReserva
.Add("@Fiscalizable", SqlDbType.Int).Value = Fiscalizable
.Add("@CveTipoTrabajador", SqlDbType.Int).Value = CveTipoTrabajador
+ .Add("@NetoPeriodo", SqlDbType.Money).Value = NetoPeriodo
End With
diff --git a/RH/Personal.aspx b/RH/Personal.aspx
index dbdc3f200..2caedee11 100644
--- a/RH/Personal.aspx
+++ b/RH/Personal.aspx
@@ -1521,7 +1521,7 @@
<%--