From 7c305afd6d727fae8354b0d3ccf44a7415be01c8 Mon Sep 17 00:00:00 2001 From: Oscar Irigoyen Date: Mon, 6 Mar 2023 17:35:03 -0700 Subject: [PATCH] Personal Neto Periodo, clientes Genero --- App_Code/ClsClientes.vb | 16 +++++++++++----- App_Code/ClsRH.vb | 10 ++++++++-- RH/Personal.aspx | 8 +++++++- RH/Personal.aspx.vb | 12 ++++++++++-- Ventas/Clientes.aspx | 15 +++++++++++++++ Ventas/Clientes.aspx.vb | 29 ++++++++++++++++++++++++++--- Ventas/PV.aspx | 17 +++++++++++++++-- Ventas/PV.aspx.vb | 28 +++++++++++++++++++++++++++- 8 files changed, 119 insertions(+), 16 deletions(-) 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 @@ <%----%> - + +
+ + + +
+
diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index e42e70e54..a49bf4056 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -1004,6 +1004,11 @@ Partial Class RH_Personal CargaLicencias() LtlTareaNueva.Text = String.Format(" Tarea", CvePersonal) + + If UsuarioActual.CveRol = 1 Or UsuarioActual.CveUsuario = 100 Then + DVNetoPeriodo.Visible = True + End If + End If AgregarEventosAsincronosGvVacaciones() End Sub @@ -1765,6 +1770,7 @@ Partial Class RH_Personal TxtNumeroSS.Text = ObjPersonal.NumeroSS ChkSeInscribioSS.Checked = ObjPersonal.SeInscribioSS TxtSalarioDiarioPago.Text = ObjPersonal.SalarioDiarioPago.ToString() + TxtNetoPeriodo.Text = ObjPersonal.NetoPeriodo.ToString() TxtSalarioDiario.Text = ObjPersonal.SalarioDiario.ToString() TxtSDI.Text = ObjPersonal.SDI.ToString() salarioVariable = drow("SalarioVariable").ToString().ToDecimal() 'ObjPersonal.SalarioDiarioSS.ToString().ToDecimal() - ObjPersonal.SDI.ToString().ToDecimal() @@ -1968,7 +1974,8 @@ Partial Class RH_Personal 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(), TxtBeneficiario.Text.Trim, DdlSubproyectoZona.SelectedValue.ToEntero(), CveUniforme:=DdlUniforme.SelectedValue.ToEntero(), TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), - Sindicalizado:=ChkSindicalizado.Checked, Pensionado:=ChkPensionado.Checked, CvePais:=DdlPais.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(), CveEmpresaAsignado:=DdlEmpresaAsignada.SelectedValue.ToEntero, CveTipoTrabajador:=DdlTipoTrabajador.SelectedValue.ToEntero()) Then + Sindicalizado:=ChkSindicalizado.Checked, Pensionado:=ChkPensionado.Checked, CvePais:=DdlPais.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(), + CveEmpresaAsignado:=DdlEmpresaAsignada.SelectedValue.ToEntero, CveTipoTrabajador:=DdlTipoTrabajador.SelectedValue.ToEntero(), NetoPeriodo:=TxtNetoPeriodo.Text.ToDecimal) Then If Archivo.Exists Then @@ -2053,7 +2060,8 @@ Partial Class RH_Personal DdlPrestamos.SelectedValue.ToEntero(), DdlPrestamos.SelectedItem.Text, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero(), TxtBeneficiario.Text.Trim, DdlSubproyectoZona.SelectedValue.ToEntero(), CveUniforme:=DdlUniforme.SelectedValue.ToEntero(), TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveUsuarioModifico:=UsuarioActual.CveUsuario, CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=If(ChkSindicalizado.Checked, 1, 0), Pensionado:=ChkPensionado.Checked, CvePais:=DdlPais.SelectedValue.ToEntero(), - CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(), CveEmpresaAsignado:=DdlEmpresaAsignada.SelectedValue.ToEntero(), EsReserva:=If(chkEsReserva.Checked, 1, 0), Fiscalizable:=If(chkNoFiscalizar.Checked, 0, 1), CveTipoTrabajador:=DdlTipoTrabajador.SelectedValue.ToEntero()) Then + CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(), CveEmpresaAsignado:=DdlEmpresaAsignada.SelectedValue.ToEntero(), EsReserva:=If(chkEsReserva.Checked, 1, 0), + Fiscalizable:=If(chkNoFiscalizar.Checked, 0, 1), CveTipoTrabajador:=DdlTipoTrabajador.SelectedValue.ToEntero(), NetoPeriodo:=TxtNetoPeriodo.Text.ToDecimal) Then 'Funcion usa RH Familiares If UsuarioActual.Empresa.Funcionalidad(568) = "1" Then diff --git a/Ventas/Clientes.aspx b/Ventas/Clientes.aspx index 006d047fa..44ebba569 100644 --- a/Ventas/Clientes.aspx +++ b/Ventas/Clientes.aspx @@ -541,6 +541,21 @@
+
+
+ + + + + + + +
+
+ + + + diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb index 49764cc6b..2bef9fa2e 100644 --- a/Ventas/Clientes.aspx.vb +++ b/Ventas/Clientes.aspx.vb @@ -908,7 +908,7 @@ Partial Class Clientes LbAgregarSucursal.Enabled = True CreaDTSucursales() CargaDocumentacionCliente() - + MuestraOcultaGenero() 'TxtPais.Text = "México" End If @@ -1653,6 +1653,12 @@ Partial Class Clientes ChkEsDistribuidor.Checked = Boolean.Parse(ObjClientes.DtResultados(0)("EsDistribuidor").ToString()) CobranzaTelefono = ObjClientes.CobranzaTelefono + If ObjClientes.DtResultados(0)("Genero").ToString().Length > 0 Then + DdlGeneroCliente.SelectedValueExist(If(Boolean.Parse(ObjClientes.DtResultados(0)("Genero").ToString()), 1, 0)) + Else + DdlGeneroCliente.SelectedValueExist(-1) + End If + TxtFechaLimiteCredito.Text = If(ObjClientes.DtResultados.Rows(0)("FechaLimiteCredito").ToString.ToDate = New Date(1900, 1, 1), "", ObjClientes.DtResultados.Rows(0)("FechaLimiteCredito").ToString.ToDate.ToString("dd/MM/yyyy")) If CobranzaTelefono.Length = 10 Then @@ -2711,6 +2717,8 @@ Partial Class Clientes Dim FechaLimiteCredito As Date = If(TxtFechaLimiteCredito.Text.Trim.Length > 0, TxtFechaLimiteCredito.Text.ToDate, New Date(1900, 1, 1)) + Dim GeneroCliente = If(DdlGeneroCliente.SelectedValue.ToEntero = 1 Or DdlGeneroCliente.SelectedValue.ToEntero = -1, True, False) + If CveCliente = -1 Then Dim ErrorAC As Boolean = False Dim CtaCliente As Integer = DdlCtaContableClientes.SelectedValue.ToEntero() @@ -2774,7 +2782,7 @@ Partial Class Clientes CvePais:=DdlPais.SelectedValue.ToEntero(), CveEstado:=DdlEstado.SelectedValue.ToEntero(), CveMunicipio:=DdlMunicipio.SelectedValue.ToEntero(), CveColonia:=DdlColonia.SelectedValue.ToEntero(), CveMotivoTraslado:=IIf(DdlMotivoTraslado.SelectedValue = "-1", "0", DdlMotivoTraslado.SelectedValue).ToString().ToEntero(), NumRegIdTrib:=IIf(TxtNumRegIdTrib.Text = "", "-1", TxtNumRegIdTrib.Text).ToString(), ComExtEstado:=IIf(TxtComExtEstado.Text = "", "-1", TxtComExtEstado.Text).ToString(), ComExtMunicipio:=IIf(TxtComExtMunicipio.Text = "", "-1", TxtComExtMunicipio.Text).ToString(), ComExtColonia:=IIf(TxtComExtColonia.Text = "", "-1", TxtComExtColonia.Text).ToString(), RequiereOC:=ChkRequiereOC.Checked, LT:=LT, LG:=LG, EsDistribuidor:=ChkEsDistribuidor.Checked, TipoCliente:=DdlTipoCliente.SelectedValue.ToEntero(), CargoUsado:=ChkCargoUsado.Checked, BonificacionUsado:=ChkBonificacionUsado.Checked, CveTipoRetencion:=DdlTipoRetencion.SelectedValue.ToEntero(), CorreoEntregaCompras:=TxtCorreoEntregaCompras.Text, CorreoEntregaAlmacen:=TxtCorreoEntregaAlmacen.Text, CveSATEstado:=DdlEstadoSAT.SelectedValue.ToEntero(), CveAdminTrayecto:=If(DdlAdminTrayecto.SelectedValue.ToEntero() <= 0, 0, DdlAdminTrayecto.SelectedValue.ToEntero()), - CveRegimenFiscal:=DdlRegimenFiscal.SelectedValue.ToEntero, RegimenSociedad:=TxtRegimenSociedad.Text, TipoPersona:=TipoPersona, RepresentanteLegal:=TxtRepresentanteLegal.Text, ComExtCalle:=TxtComExtCalle.Text.Trim(), ComExtNumExt:=TxtComExtNumero.Text.Trim(), ComExtCP:=TxtComExtCP.Text.Trim(), FechaLimiteCredito:=FechaLimiteCredito) Then + CveRegimenFiscal:=DdlRegimenFiscal.SelectedValue.ToEntero, RegimenSociedad:=TxtRegimenSociedad.Text, TipoPersona:=TipoPersona, RepresentanteLegal:=TxtRepresentanteLegal.Text, ComExtCalle:=TxtComExtCalle.Text.Trim(), ComExtNumExt:=TxtComExtNumero.Text.Trim(), ComExtCP:=TxtComExtCP.Text.Trim(), FechaLimiteCredito:=FechaLimiteCredito, Genero:=GeneroCliente) Then ViewState("CveCliente") = ObjClientes.CveCliente @@ -2871,7 +2879,8 @@ Partial Class Clientes ApellidoPaternoPF:=IIf(TxtApellidoPaterno.Text = "", "-1", TxtApellidoPaterno.Text).ToString(), ApellidoMaternoPF:=IIf(TxtApellidoMaterno.Text = "", "-1", TxtApellidoMaterno.Text).ToString(), NombresPF:=IIf(TxtNombres.Text = "", "-1", TxtNombres.Text).ToString(), RequiereOC:=ChkRequiereOC.Checked, LT:=LT, LG:=LG, EsDistribuidor:=ChkEsDistribuidor.Checked, TipoCliente:=DdlTipoCliente.SelectedValue.ToEntero(), CargoUsado:=ChkCargoUsado.Checked, BonificacionUsado:=ChkBonificacionUsado.Checked, CveTipoRetencion:=DdlTipoRetencion.SelectedValue.ToEntero(), CorreoEntregaCompras:=TxtCorreoEntregaCompras.Text, CorreoEntregaAlmacen:=TxtCorreoEntregaAlmacen.Text, CveSATEstado:=DdlEstadoSAT.SelectedValue.ToEntero(), CveAdminTrayecto:=If(DdlAdminTrayecto.SelectedValue.ToEntero() <= 0, 0, DdlAdminTrayecto.SelectedValue.ToEntero()), - NoDesglosaIVA:=ChkNoDesglosaIVA.Checked, CveRegimenFiscal:=DdlRegimenFiscal.SelectedValue.ToEntero, RegimenSociedad:=TxtRegimenSociedad.Text, TipoPersona:=TipoPersona, RepresentanteLegal:=TxtRepresentanteLegal.Text, ComExtCalle:=TxtComExtCalle.Text.Trim(), ComExtNumExt:=TxtComExtNumero.Text.Trim(), ComExtCP:=TxtComExtCP.Text.Trim(), FechaLimiteCredito:=FechaLimiteCredito) Then + NoDesglosaIVA:=ChkNoDesglosaIVA.Checked, CveRegimenFiscal:=DdlRegimenFiscal.SelectedValue.ToEntero, RegimenSociedad:=TxtRegimenSociedad.Text, TipoPersona:=TipoPersona, RepresentanteLegal:=TxtRepresentanteLegal.Text, ComExtCalle:=TxtComExtCalle.Text.Trim(), ComExtNumExt:=TxtComExtNumero.Text.Trim(), ComExtCP:=TxtComExtCP.Text.Trim(), FechaLimiteCredito:=FechaLimiteCredito, + Genero:=GeneroCliente) Then ObjClientes.LimpiaImpuestosLocales(CveCliente) @@ -10321,6 +10330,8 @@ Partial Class Clientes End If End If + MuestraOcultaGenero() + DdlRegimenFiscal.DataSource = dt DdlRegimenFiscal.DataBind() DdlRegimenFiscal.SelectedValueExist(Val) @@ -10581,5 +10592,17 @@ Partial Class Clientes End Sub + + Private Sub MuestraOcultaGenero() + + DvGenero.Visible = False + If UsuarioActual.Empresa.Funcionalidad(531) = "1" AndAlso RdTipoPersona.SelectedValue.ToEntero = 0 Then + DvGenero.Visible = True + End If + + UpDatos.Update() + + End Sub + End Class diff --git a/Ventas/PV.aspx b/Ventas/PV.aspx index 498d426dc..9ac8c8c5d 100644 --- a/Ventas/PV.aspx +++ b/Ventas/PV.aspx @@ -2556,18 +2556,31 @@
-
+ +
-
+
+ + +
+ + + + + + + +
+
diff --git a/Ventas/PV.aspx.vb b/Ventas/PV.aspx.vb index 19c5d95fc..eda19c635 100644 --- a/Ventas/PV.aspx.vb +++ b/Ventas/PV.aspx.vb @@ -6518,6 +6518,9 @@ Partial Class PV TxtCiudadCliente.Text = dr("Municipio").ToString TxtLocalidadCliente.Text = dr("Localidad").ToString End If + + DdlGeneroCliente.SelectedValueExist(-1) + Else Dim ObjCliente As New ClsClientes If ObjCliente.ValidaClienteRFC(TxtRFCCliente.Text, UsuarioActual.CveEmpresa) Then @@ -6559,8 +6562,12 @@ Partial Class PV CargaComboCFDICliente() + DdlGeneroCliente.SelectedValueExist(-1) + End If + MuestraOcultaGenero() + UpAgregarCliente.Update() End Sub @@ -6656,12 +6663,13 @@ Partial Class PV Dim ObjCliente As New ClsClientes Dim TipoPersona As Boolean = If(RdTipoPersona.SelectedValue.ToEntero = 1, True, False) + Dim GeneroCliente = If(DdlGeneroCliente.SelectedValue.ToEntero = 1, True, False) If ObjCliente.AgregarClienteNoFrecuente(TxtNombreCliente.Text.Trim, TxtDireccionCliente.Text.Trim, TxtNumExtCliente.Text.Trim, TxtNumIntCliente.Text.Trim, TxtColoniaCliente.Text.Trim, TxtLocalidadCliente.Text.Trim, TxtCiudadCliente.Text.Trim, DdlEstadoSAT.SelectedValue.ToEntero, TxtRFCCliente.Text.Trim, TxtCPCliente.Text.Trim, TxtTelefonoCliente.Text.Trim, TxtCorreoCliente.Text.Trim, DdlSubProyectoDatos.SelectedValue.ToEntero(), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, "", -1, -1, CvePrecioLista:=CvePrecioLista, - RegimenSociedad:=TxtRegimenSociedad.Text, TipoPersona:=TipoPersona, CveRegimenFiscal:=CveRegimenFiscal, CveUsoCFDI:=CveUsoCFDI) Then + RegimenSociedad:=TxtRegimenSociedad.Text, TipoPersona:=TipoPersona, CveRegimenFiscal:=CveRegimenFiscal, CveUsoCFDI:=CveUsoCFDI, Genero:=GeneroCliente) Then If ObjCliente.DtResultados.Rows.Count > 0 Then RegistraScript("hideDivEC();") @@ -8575,9 +8583,27 @@ Partial Class PV End If + MuestraOcultaGenero() + + + + + UpAgregarCliente.Update() End Sub + + Private Sub MuestraOcultaGenero() + + DvGenero.Visible = False + If UsuarioActual.Empresa.Funcionalidad(531) = "1" AndAlso RdTipoPersona.SelectedValue.ToEntero = 0 Then + DvGenero.Visible = True + End If + + UpAgregarCliente.Update() + + End Sub + Protected Sub LnkSolicitarDesc_Click(sender As Object, e As EventArgs) If Me.CveCliente <= 0 Then Alert("Debe seleccionar un cliente.", TipoMensaje.MsgAdvertencia)