diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index a4ba539f8..93410cced 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -160,7 +160,8 @@ Public Class ClsClientes Public Property CodigoRegimenFiscal As String Public Property RegimenFiscal As String Public Property RepresentanteLegal As String - Public Property CveAlmacenAsignado As Integer + Public Property UsaProductoAlterno As Boolean = False + Public Property CveAlmacenAsignado As Integer = -1 #End Region @@ -407,9 +408,9 @@ Public Class ClsClientes _RegimenFiscal = Data(0)("RegimenFiscal").ToString _CodigoRegimenFiscal = Data(0)("CodigoRegimenFiscal").ToString _RepresentanteLegal = Data(0)("RepresentanteLegal").ToString + _UsaProductoAlterno = CBool(Data(0)("UsaProductoAlterno")) Me.CveAlmacenAsignado = Data(0)("CveAlmacenAsignado").ToString.ToEntero - End If Retorno = True Catch ex As Exception @@ -543,7 +544,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", Optional Genero As Boolean = True, Optional CveAlmacenAsignado As Integer = -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, Optional CveAlmacenAsignado As Integer = -1, Optional UsaProductoAlterno As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -672,6 +673,7 @@ Public Class ClsClientes .Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP .Add("@Genero", SqlDbType.Bit).Value = Genero .Add("@CveAlmacenAsignado", SqlDbType.Int).Value = CveAlmacenAsignado + .Add("@UsaProductoAlterno", SqlDbType.Bit).Value = UsaProductoAlterno End With Try SqlAdapter.Fill(Data) @@ -717,7 +719,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", Optional Genero As Boolean = True, Optional CveAlmacenAsignado As Integer = -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, Optional CveAlmacenAsignado As Integer = -1, Optional UsaProductoAlterno As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -856,6 +858,7 @@ Public Class ClsClientes .Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP .Add("@Genero", SqlDbType.Bit).Value = Genero .Add("@CveAlmacenAsignado", SqlDbType.Int).Value = CveAlmacenAsignado + .Add("@UsaProductoAlterno", SqlDbType.Bit).Value = UsaProductoAlterno End With Try diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 2db30fb66..c80e830ff 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -5975,9 +5975,9 @@ Public Class ClsVentas #End Region -#Region "AGENTES" +#Region "MEDICOS" - Public Function GetMedicos(CveMedico As Integer, CveEmpresa As Integer, Estatus As Integer) As Boolean + Public Function GetMedicos(CveMedico As Integer, CveEmpresa As Integer, Estatus As Integer, Optional Mes As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_MedicosGet") @@ -5986,13 +5986,16 @@ Public Class ClsVentas .Add("@CveMedico", SqlDbType.Int).Value = CveMedico .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@Estatus", SqlDbType.Int).Value = Estatus + .Add("@Mes", SqlDbType.Int).Value = Mes End With + Try SqlAdapter.Fill(Data) Retorno = True Catch ex As Exception OnError("Ocurrió un error al obtener los Medicos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try + Return Retorno End Function @@ -6001,7 +6004,7 @@ Public Class ClsVentas Public Function AddMedico(Medico As String, CedulaProfesional As String, FechaNacimiento As Date, Notas As String, DiasAtencion As String, Horario As String, Lugar As String, Estatus As Boolean, CveUsuario As Integer, - CveEmpresa As Integer, Telefono As String, Mail As String, Especialidad As String, Celular As String, Consultorio As String) As Boolean + CveEmpresa As Integer, Telefono As String, Mail As String, CveMedicoEspecialidad As Integer, Celular As String, Consultorio As String) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_MedicosAdd") @@ -6019,7 +6022,7 @@ Public Class ClsVentas .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@Telefono", SqlDbType.VarChar).Value = Telefono .Add("@Mail", SqlDbType.VarChar).Value = Mail - .Add("@Especialidad", SqlDbType.VarChar).Value = Especialidad + .Add("@CveMedicoEspecialidad", SqlDbType.Int).Value = CveMedicoEspecialidad .Add("@Celular", SqlDbType.VarChar).Value = Celular .Add("@Consultorio", SqlDbType.VarChar).Value = Consultorio @@ -6036,7 +6039,7 @@ Public Class ClsVentas End Function Public Function UpdateMedico(CveMedico As Integer, Medico As String, CedulaProfesional As String, FechaNacimiento As Date, Notas As String, DiasAtencion As String, Horario As String, Lugar As String, Estatus As Boolean, CveUsuario As Integer, - CveEmpresa As Integer, Telefono As String, Mail As String, Especialidad As String, Celular As String, Consultorio As String) As Boolean + CveEmpresa As Integer, Telefono As String, Mail As String, CveMedicoEspecialidad As Integer, Celular As String, Consultorio As String) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_MedicosUpdate") @@ -6054,7 +6057,7 @@ Public Class ClsVentas .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@Telefono", SqlDbType.VarChar).Value = Telefono .Add("@Mail", SqlDbType.VarChar).Value = Mail - .Add("@Especialidad", SqlDbType.VarChar).Value = Especialidad + .Add("@CveMedicoEspecialidad", SqlDbType.Int).Value = CveMedicoEspecialidad .Add("@Celular", SqlDbType.VarChar).Value = Celular .Add("@Consultorio", SqlDbType.VarChar).Value = Consultorio @@ -6089,6 +6092,97 @@ Public Class ClsVentas #End Region + + +#Region "ESPECIALIDADES" + + Public Function GetMedicosEspecialidades(CveMedicoEspecialidad As Integer, CveEmpresa As Integer, Estatus As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Vta_MedicosEspecialidadesGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveMedicoEspecialidad", SqlDbType.Int).Value = CveMedicoEspecialidad + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@Estatus", SqlDbType.Int).Value = Estatus + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las especialidades.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + Return Retorno + + End Function + + + + + Public Function AddMedicoEspecialidad(Especialidad As String, Estatus As Boolean, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Vta_MedicosEspecialidadesAdd") + + With SqlAdapter.SelectCommand.Parameters + .Add("@Especialidad", SqlDbType.VarChar).Value = Especialidad + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al guardar la especialidad.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + + End Function + + Public Function UpdateMedicoEspecialidad(CveMedicoEspecialidad As Integer, Especialidad As String, Estatus As Boolean, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Vta_MedicosEspecialidadesUpdate") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveMedicoEspecialidad", SqlDbType.Int).Value = CveMedicoEspecialidad + .Add("@Especialidad", SqlDbType.VarChar).Value = Especialidad + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar la especialidad.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + + End Function + + Public Function RemoveMedicoEspecialidad(CveMedicoEspecialidad As Integer, CveEmpresa As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Vta_MedicosEspecialidadesRemove") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveMedicoEspecialidad", SqlDbType.Int).Value = CveMedicoEspecialidad + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al eliminar la especialidad.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + + End Function + +#End Region + #Region "PRODEDIMIENTOS" Public Function GetProcedimientos(CveProcedimiento As Integer, CveEmpresa As Integer, Estatus As Integer) As Boolean diff --git a/Compras/RepCxP.aspx b/Compras/RepCxP.aspx index 8482c618c..c0932f597 100644 --- a/Compras/RepCxP.aspx +++ b/Compras/RepCxP.aspx @@ -11,6 +11,10 @@ height: 50px; } + .TextoGris { + color:gray; + } + .select2 .select2-selection--multiple { box-sizing: border-box; cursor: pointer; @@ -59,13 +63,13 @@
  • Personalizar Columnas -
  • -
  • - Ver Dlls en pesos -
  • +
  • Personalizar Rango de Columnas
  • +
  • + Ver Dlls en pesos +
  • diff --git a/Compras/RepCxP.aspx.vb b/Compras/RepCxP.aspx.vb index 89260d76f..fa5039673 100644 --- a/Compras/RepCxP.aspx.vb +++ b/Compras/RepCxP.aspx.vb @@ -169,23 +169,10 @@ Partial Class Compras_RepCxP DdlUsuarioRegistro.DataSource = GlobalDTUsuarios.FiltraParametros(String.Format("CveEmpresa = {0}", UsuarioActual.CveEmpresa), "Nombre") DdlUsuarioRegistro.DataBind() DdlUsuarioRegistro.Items.Insert(0, New ListItem("Todos", "-1")) - txtCorteA.Text = $"31/12/{NowADS().Year}" - 'Dim ObjSisUsuarios As New ClsSisUsuarios() - - 'If ObjSisUsuarios.GetEmpresasUsuario(UsuarioActual.CveUsuario) Then - ' DdlEmpresas.DataSource = ObjSisUsuarios.DtResultados - ' DdlEmpresas.DataBind() - ' DivEmpresasFiltro.Visible = True - ' For i As Integer = 0 To DdlEmpresas.Items.Count - 1 - ' DdlEmpresas.Items(i).Selected = True - ' Next - 'End If - 'ObjSisUsuarios.Dispose() - If UsuarioActual.Empresa.Funcionalidad(713) <> "" Then - ChkIEPSP.Visible = False + ChkIEPSP.Visible = True End If For Each lItem As ListItem In DdlGrupo.Items @@ -194,7 +181,6 @@ Partial Class Compras_RepCxP End If Next - End Sub Protected Sub DdlProyecto_SelectedIndexChanged(sender As Object, e As System.EventArgs) Handles DdlProyecto.SelectedIndexChanged diff --git a/Compras/RepCxPDetalle.aspx b/Compras/RepCxPDetalle.aspx index de4211f9e..ebf865e8f 100644 --- a/Compras/RepCxPDetalle.aspx +++ b/Compras/RepCxPDetalle.aspx @@ -24,12 +24,10 @@
  • Generar Excel -
  • - +
  • Excel Personalizado
  • -
  • @@ -37,15 +35,10 @@
  • Ver Dlls en pesos - -
  • - - +
  • Programar Recursos -
  • - @@ -262,9 +255,15 @@ +
    +
    + " style="display: inline-block; margin-right: -20px; width: 150px;" /> + " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"> +
    +
    - + @@ -463,8 +462,7 @@ - - + diff --git a/CxC/RepCxCDetalle.aspx b/CxC/RepCxCDetalle.aspx index a15b0165e..77a7c820c 100644 --- a/CxC/RepCxCDetalle.aspx +++ b/CxC/RepCxCDetalle.aspx @@ -386,10 +386,8 @@
    - " style="display: inline-block; margin-right: -20px; width: 150px;" /> " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"> -
    @@ -477,9 +475,7 @@
    - -
    - +