From 596fa060a2a244ae6b637f1be8a17c1e3c2b5419 Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 14 Feb 2024 10:52:46 -0700 Subject: [PATCH 1/7] -- mejora --- SAT/SolicitudesIngresoSat.aspx | 148 +++++++++++++++--------------- SAT/SolicitudesIngresoSat.aspx.cs | 19 ++-- 2 files changed, 81 insertions(+), 86 deletions(-) diff --git a/SAT/SolicitudesIngresoSat.aspx b/SAT/SolicitudesIngresoSat.aspx index 7814cf401..829046433 100644 --- a/SAT/SolicitudesIngresoSat.aspx +++ b/SAT/SolicitudesIngresoSat.aspx @@ -74,8 +74,12 @@ -
+
+
+ + +
@@ -122,16 +126,28 @@
-
- - -
- - @@ -186,7 +202,7 @@ - + @@ -221,7 +237,7 @@ - + @@ -262,117 +278,103 @@ - - - - - - - - + + - - + + + + + + - + - - - - + + - - - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + - - - + - - - - + - - - + - - - - - - - - - + + + + + + + + + + + - - - - + + + + + diff --git a/SAT/SolicitudesIngresoSat.aspx.cs b/SAT/SolicitudesIngresoSat.aspx.cs index 1ff768086..0a9c61021 100644 --- a/SAT/SolicitudesIngresoSat.aspx.cs +++ b/SAT/SolicitudesIngresoSat.aspx.cs @@ -112,7 +112,7 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas using (ClsNominas ObjNom = new ClsNominas()) { - if (ObjNom.SATSolicitudTimbreIngresosRep(UsuarioActual.CveEmpresa, TxtRpdFechaInicio.Text.ToDate(), TxtRpdFechaFin.Text.ToDate(), DdlReporte.SelectedValue.ToEntero(), DdlVista.SelectedValue.ToEntero())) + if (ObjNom.SATSolicitudTimbreIngresosRep(UsuarioActual.CveEmpresa, TxtRpdFechaInicio.Text.ToDate(), TxtRpdFechaFin.Text.ToDate(), DdlReporte.SelectedValue.ToEntero(), DdlVista.SelectedValue.ToEntero(), DdlTipoDocto.SelectedValue, DdlTipoDiferencia.SelectedValue.ToEntero())) { if (DdlReporte.SelectedValue.ToEntero() == 1 || DdlReporte.SelectedValue.ToEntero() == 3) { @@ -121,8 +121,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas LnkDownloadExcel.Visible = true; if (UsuarioActual.Empresa.Funcionalidad(713) == "1") { - GvResumen.Columns[4].Visible = false; - GvResumen.Columns[11].Visible = false; + GvResumen.Columns[4].Visible = true; + GvResumen.Columns[11].Visible = true; } } else if (DdlReporte.SelectedValue.ToEntero() == 2) @@ -261,24 +261,17 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas } protected void LnkverificarSolicitudes_Click(object sender, EventArgs e) - { - + { try - { - - - StringBuilder sbResultado = new StringBuilder(); - - + { + StringBuilder sbResultado = new StringBuilder(); foreach (GridViewRow GvRow in GVSolicitudesPendientes.Rows) { - int CveSolicitudActual = GvRow.DataKey("CveSolicitud").ToEntero(); string idSolicitud = GvRow.DataKey("idSolicitud").Trim(); int CveTipoSolicitud = GvRow.DataKey("CveTipoSolicitud").ToEntero(); int Folio = GvRow.DataKey("Folio").ToEntero(); - List resultSolicitud = new List(); List resultVerificacion = new List(); var ResultadoVerificaionOK = false; From 6d163d0fe3685226571c02c6f3cb1701223ab28b Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 15 Feb 2024 05:00:35 -0700 Subject: [PATCH 2/7] - mejora en ieps --- Ventas/RepVentas.aspx | 2 +- Ventas/RepVentas.aspx.vb | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Ventas/RepVentas.aspx b/Ventas/RepVentas.aspx index a0d7ae3f0..15ca9b94b 100644 --- a/Ventas/RepVentas.aspx +++ b/Ventas/RepVentas.aspx @@ -506,7 +506,7 @@ - + diff --git a/Ventas/RepVentas.aspx.vb b/Ventas/RepVentas.aspx.vb index 66a52fd02..ecd30bce7 100644 --- a/Ventas/RepVentas.aspx.vb +++ b/Ventas/RepVentas.aspx.vb @@ -521,13 +521,9 @@ Partial Class Ventas_RepVentas Private Sub PrePersonalizacion() - 'ChkDescuentos.Visible = False - If UsuarioActual.Empresa.Funcionalidad(713) = "1" Then - ChkIEPS.Visible = True - Else - ChkIEPS.Visible = False - GvDatos.Columns(7).Visible = False - End If + + If UsuarioActual.Empresa.Funcionalidad(713) = "1" Then ChkIEPS.Visible = True + End Sub Protected Sub LnkPErsonalizar_Click(sender As Object, e As EventArgs) @@ -715,7 +711,6 @@ Partial Class Ventas_RepVentas Next - Personaliza() Else PersonalizaDefault() @@ -734,9 +729,8 @@ Partial Class Ventas_RepVentas ChkSubTotal2.Checked = True ChkIVA.Checked = True - If UsuarioActual.Empresa.Funcionalidad(713) = "1" Then - ChkIEPS.Checked = True - End If + If UsuarioActual.Empresa.Funcionalidad(713) = "1" Then ChkIEPS.Checked = True + 'ChkRetIVA.Checked = True 'ChkRetISR.Checked = True 'ChkImpLoc.Checked = True From f0a3e754ae96755f3452d31407f0f37c32045fc7 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 15 Feb 2024 05:01:05 -0700 Subject: [PATCH 3/7] - --- Transportes/RepContratos.aspx | 190 ++++++++----- Transportes/RepContratos.aspx.vb | 54 +--- Transportes/RepContratosCalendario.aspx | 313 ++++++++++----------- Transportes/RepContratosCalendario.aspx.vb | 57 ++-- 4 files changed, 296 insertions(+), 318 deletions(-) diff --git a/Transportes/RepContratos.aspx b/Transportes/RepContratos.aspx index bea5d7eca..aab73242d 100644 --- a/Transportes/RepContratos.aspx +++ b/Transportes/RepContratos.aspx @@ -8,7 +8,7 @@ - + --%> -
  • - Agregar Contrato + + +
  • + Agregar Contrato
    • + +
  • Generar PDF
    • @@ -60,86 +64,116 @@ <%-- Filtros --%> -
    -
    -
    - - -
    + + +
    +
    +
    + + +
    +
    +
    + +
    + Fecha Inicio: +
    +
    +
    + + + + +
    + + + + + + +
    +
    + Fecha Fin: + +
    +
    +
    + + + + +
    + + + + + + +
    -
    - - -
    + +
    + + <%-- + + --%> +
    -
    - - -
    + + +
    + + +
    + +
    -
    - -
    - - +
    -
    -
    - - -
    -
    + - -
    - -
    - - -
    -
    - -
    +     +     <%-- Listado de Contratos --%> @@ -149,7 +183,7 @@ - + diff --git a/Transportes/RepContratos.aspx.vb b/Transportes/RepContratos.aspx.vb index 33482ca77..378662391 100644 --- a/Transportes/RepContratos.aspx.vb +++ b/Transportes/RepContratos.aspx.vb @@ -1,7 +1,5 @@ Option Explicit On Option Strict On -Imports System.Data -Imports System.Data.SqlClient Imports Extensiones Imports Extensiones.ModExtensiones Imports Microsoft.Reporting.WebForms @@ -10,14 +8,7 @@ Partial Class ListadoContratos Inherits ClsPaginas #Region "Propiedad" - Private Property DtAvanceDocumento As DataTable - Get - Return CType(ViewState("DtAvanceDocumento"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtAvanceDocumento") = value - End Set - End Property + #End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load txtFechaI.Text = DateTime.Now.AddMonths(-1).ToString("MM/dd/yyyy").Replace(" ", "T") @@ -38,7 +29,7 @@ Partial Class ListadoContratos DdlTIpoUnidad.DataBind() DdlTIpoUnidad.Items.Insert(0, New ListItem("-", "")) 'Lista Chofer' - DdlChofer.DataSource = GlobalDTRHPersonal(188) + DdlChofer.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa) DdlChofer.DataBind() DdlChofer.Items.Insert(0, New ListItem("-", "")) End Sub @@ -60,7 +51,7 @@ Partial Class ListadoContratos Dim ObjFolio As New ClsGralFolios If ObjFolio.GetFolios("Con", UsuarioActual.CveEmpresa, CveSubProyecto:=CveSubProyecto) Then If ObjFolio.DtResultados.Rows.Count > 0 Then - Dim drr As DataRow = ObjFolio.DtResultados.FiltroPrimero("") + Dim drr As Data.DataRow = ObjFolio.DtResultados.FiltroPrimero("") LbFolio.Text = $"{drr("Serie").ToString}-{drr("FActual").ToString}" End If End If @@ -123,7 +114,7 @@ Partial Class ListadoContratos Dim Imagen As New IO.FileInfo($"{UsuarioActual.Empresa.Ruta}/Logo.png") Dim logouri As String = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa) Dim Cliente As String = If(DdlClientes.SelectedValue = "-1", "", $" Cliente: {DdlClientes.SelectedText}") - Dim dt As DataTable = ObjContratos.DtResultados + Dim dt As Data.DataTable = ObjContratos.DtResultados Dim params As New List(Of ReportParameter) From { New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa), New ReportParameter("FechaInicio", "-1"), @@ -142,7 +133,7 @@ Partial Class ListadoContratos Dim fechaInicial As String = txtFechaI.Text Dim fechaFinal As String = txtFechaF.Text - Dim cliente As String = If(DdlClientesConsulta.SelectedValue = "", "", $"C.CveCliente = {DdlClientesConsulta.SelectedValue} AND") + Dim cliente As String = If(DdlClientes.SelectedValue = "", "", $"C.CveCliente = {DdlClientes.SelectedValue} AND") Dim estatus As String = "" Dim nombreEstatus As String = "" Dim innerEstatus As String = "" @@ -174,36 +165,21 @@ Partial Class ListadoContratos End If - Dim intervalo As String = If(DdlEstatusConsulta.SelectedValue = "" And DdlClientesConsulta.SelectedValue = "", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'") + 'Dim intervalo As String = If(DdlEstatusConsulta.SelectedValue = "" And DdlClientes.SelectedValue = "", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'") - Dim query As String = $"SELECT *, ISNULL(Cli.NombreComercial,'') AS NombreComercial {nombreEstatus} FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente {innerEstatus} WHERE {cliente} {estatus} {intervalo}" + 'Dim query As String = $"SELECT *, ISNULL(Cli.NombreComercial,'') AS NombreComercial {nombreEstatus} FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente {innerEstatus} WHERE {cliente} {estatus} {intervalo}" - Using connection As New SqlConnection(ConfigurationManager.ConnectionStrings("Conexion").ConnectionString) - Using command As New SqlCommand(query, connection) - connection.Open() - Dim reader As SqlDataReader = command.ExecuteReader() - GvContratos.DataSource = reader - GvContratos.DataBind() - End Using - End Using + 'Using connection As New SqlConnection(ConfigurationManager.ConnectionStrings("Conexion").ConnectionString) + ' Using command As New SqlCommand(query, connection) + ' connection.Open() + ' Dim reader As SqlDataReader = command.ExecuteReader() + ' GvContratos.DataSource = reader + ' GvContratos.DataBind() + ' End Using + 'End Using UpTitulos.Update() End Sub - Protected Sub Expandir(sender As Object, e As EventArgs) - If PnExpandirConsulta.Visible Then - PnExpandirConsulta.Visible = False - BtnExpandir.Text = "↑" - Else - PnExpandirConsulta.Visible = True - BtnExpandir.Text = "↓" - End If - End Sub - - Protected Sub GoContratoDetalle(sender As Object, e As EventArgs) - Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) - Dim CveContrato As String = GvRow.DataKey("CveContrato") - Response.Redirect(String.Format("~/Transportes/RepContratoDetalle.aspx?CveContrato={0}", CveContrato)) - End Sub End Class diff --git a/Transportes/RepContratosCalendario.aspx b/Transportes/RepContratosCalendario.aspx index 271280696..471b4bdec 100644 --- a/Transportes/RepContratosCalendario.aspx +++ b/Transportes/RepContratosCalendario.aspx @@ -5,51 +5,7 @@ @@ -72,133 +28,163 @@ <%--Calendario Tab--%> -
    -
    -
    - - -
    -
    -
    - -
    - - - - + <%-- Filtros --%> + + +
    +
    +
    + + +
    +
    +
    + +
    + + + + -
    -
    -
    -
    +
    +
    +
    +
    - -
    + +
    -
    -
    -
    -
    -
    -

     

    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +

     

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +     +     + <%--Contratos Tab--%> - + - <%-- Filtros --%> -
    -
    -
    - - -
    + <%-- Filtros --%> + + +
    +
    +
    + + +
    +
    +
    + +
    + Fecha Inicio: +
    +
    +
    + + + + +
    + + + + + + +
    +
    + Fecha Fin: + +
    +
    +
    + + + + +
    + + + + + + +
    -
    - - -
    + +
    + + <%-- + + --%> +
    -
    - - -
    + + +
    + + +
    + +
    -
    - -
    - - +
    +
    - -
    - - -
    -
    - - -
    - -
    - - -
    -
    - -
    - -
    - - -
    -
    - -
    - -
    - - -
    -
    -     -
    +     +     <%-- Contratos --%> @@ -209,11 +195,11 @@ - + - + Fecha
    Salida @@ -229,7 +215,7 @@     - + @@ -263,7 +249,7 @@ - + @@ -274,7 +260,6 @@ -     diff --git a/Transportes/RepContratosCalendario.aspx.vb b/Transportes/RepContratosCalendario.aspx.vb index db3ce974e..057c83d93 100644 --- a/Transportes/RepContratosCalendario.aspx.vb +++ b/Transportes/RepContratosCalendario.aspx.vb @@ -54,9 +54,7 @@ Partial Class RepContratosCalendario DtAvance = ObjContratos.DtResultados If ObjContratos.GetContratosEstatus(UsuarioActual.CveEmpresa) Then - DdlEstatusConsulta.DataSource = ObjContratos.DtResultados - DdlEstatusConsulta.DataBind() - DdlEstatusConsulta.Items.Insert(0, New ListItem("-", "")) + DdlEstatusContrato.DataSource = ObjContratos.DtResultados DdlEstatusContrato.DataBind() @@ -84,13 +82,28 @@ Partial Class RepContratosCalendario DdlAF.Items.Insert(0, New ListItem("-", "")) 'Lista Chofer' - DdlChofer.DataSource = GlobalDTRHPersonal(185) + DdlChofer.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto") DdlChofer.DataBind() DdlChofer.Items.Insert(0, New ListItem("-", "")) - DdlChofer2.DataSource = GlobalDTRHPersonal(185) + + DdlChofer2.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto") DdlChofer2.DataBind() DdlChofer2.Items.Insert(0, New ListItem("-", "")) + DdlChoferFiltro.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto") + DdlChoferFiltro.DataBind() + DdlChoferFiltro.Items.Insert(0, New ListItem("Todos", "")) + + DdlTipoUnidad.DataSource = GlobalDTTipoActivoFijo(UsuarioActual.CveEmpresa).FiltraParametros("MedidaVehicularClave IN (2,3)") + DdlTipoUnidad.DataBind() + DdlTipoUnidad.Items.Insert(0, New ListItem("Todos", "-1")) + + DdlEstatusConsulta.DataSource = GlobalDTContratosEstatus(UsuarioActual.CveEmpresa) + DdlEstatusConsulta.DataBind() + DdlEstatusConsulta.Items.Insert(0, New ListItem("Todos", "-1")) + + CargarCentrosDeCosto(Nothing, DdlSubProyectos, Nothing, LblSubProyecto) + End Sub Private Sub OnRowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvContratos.RowDataBound @@ -103,7 +116,6 @@ Partial Class RepContratosCalendario RegistraScript("$('#ModalActualizar').modal('show');") End Sub - Protected Sub UpdateContrato(sender As Object, e As EventArgs) Dim ObjContratos As New ClsContratos ObjContratos.IniciaTransacSQL() @@ -144,7 +156,7 @@ Partial Class RepContratosCalendario Dim fechaInicial As String = txtFechaI.Text Dim fechaFinal As String = txtFechaF.Text - Dim cliente As String = If(DdlClientesConsulta.SelectedValue = "", "", $"C.CveCliente = {DdlClientesConsulta.SelectedValue} AND") + Dim cliente As String = If(DdlClientes.SelectedValue = "", "", $"C.CveCliente = {DdlClientes.SelectedValue} AND") Dim estatus As String = "" Dim nombreEstatus As String = "" Dim innerEstatus As String = "" @@ -174,34 +186,9 @@ Partial Class RepContratosCalendario 'nombreTipoUnidad = ", CE.ContratoTipoUnidad As ContratoTipoUnidad1" 'innerTipoUnidad = " INNER JOIN Con_ContratosTipoUnidad CE with(nolock) ON CE.CveContratoTipoUnidad = C.CveContratosEstatus " End If - - - Dim intervalo As String = If(DdlEstatusConsulta.SelectedValue = "" And DdlClientesConsulta.SelectedValue = "", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'") - - - Dim query As String = $"SELECT *, ISNULL(Cli.NombreComercial,'') AS NombreComercial {nombreEstatus} FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente {innerEstatus} WHERE {cliente} {estatus} {intervalo}" - - Using connection As New SqlConnection(ConfigurationManager.ConnectionStrings("Conexion").ConnectionString) - Using command As New SqlCommand(query, connection) - connection.Open() - Dim reader As SqlDataReader = command.ExecuteReader() - GvContratos.DataSource = reader - GvContratos.DataBind() - End Using - End Using - UpTitulos.Update() End Sub - Protected Sub Expandir(sender As Object, e As EventArgs) - If PnExpandirConsulta.Visible Then - PnExpandirConsulta.Visible = False - BtnExpandir.Text = "↑" - Else - PnExpandirConsulta.Visible = True - BtnExpandir.Text = "↓" - End If - End Sub Protected Sub LnkExcel_Click(sender As Object, e As EventArgs) Handles LnkExcel.Click GvContratos.ExportToExcel("ReporteCompras" & NowADS().ToShortDateString) End Sub @@ -226,9 +213,5 @@ Partial Class RepContratosCalendario Alert("No hay datos consultados", TipoMensaje.MsgAdvertencia) End If End Sub - Protected Sub GoContratoDetalle(sender As Object, e As EventArgs) - Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) - Dim CveContrato As String = GvRow.DataKey("CveContrato") - Response.Redirect(String.Format("~/Transportes/RepContratoDetalle.aspx?CveContrato={0}", CveContrato)) - End Sub + End Class From 7ae85c102ba48839da0a31ccf0f992c7e78fe88c Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 15 Feb 2024 05:02:18 -0700 Subject: [PATCH 4/7] - --- App_Code/Modelos.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index 3f30dd49c..d87eb3840 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -6185,7 +6185,7 @@ Namespace Modelos If Not ErrorCancelar Then If ObjInventario.GetInv_Mov(CveVenta, UsuarioActual.CveEmpresa) Then DtMovRemision = ObjInventario.DtResultados.FiltraParametros("CveTipoAlmacen = 10") - CveAlmacenGeneral = ObjInventario.DtResultados.FiltroPrimeroValor("CveAlmacen", "CveTipoAlmacen = 1").ToString().ToEntero() + CveAlmacenGeneral = ObjInventario.DtResultados.FiltroPrimeroValor("CveAlmacen", "CveTipoAlmacen IN (1,4)").ToString().ToEntero() 'SI ES SERVICIO A DOMICILIO DEBE REGRESAR A ESTE TIPO DE ALMACEN If Me.ServicioDomicilio Then CveAlmacenGeneral = ObjInventario.DtResultados.FiltroPrimeroValor("CveAlmacen", "CveTipoAlmacen = 29").ToString().ToEntero() From 8dbfca1e29c994482c2c32499452533dbbc33a46 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 15 Feb 2024 05:02:59 -0700 Subject: [PATCH 5/7] - manejo de retenciones --- Compras/RepCxP.aspx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Compras/RepCxP.aspx b/Compras/RepCxP.aspx index 21ceaabd5..1d1e25ff5 100644 --- a/Compras/RepCxP.aspx +++ b/Compras/RepCxP.aspx @@ -470,8 +470,7 @@ - % X Recup. - + % X Recup. @@ -522,6 +521,21 @@ + + + + + + + + + + + + + + + From ccc029cdce7a967ef9cfd0e33973e036b5d05543 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 15 Feb 2024 05:09:28 -0700 Subject: [PATCH 6/7] - --- Transportes/RepViajes.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Transportes/RepViajes.aspx b/Transportes/RepViajes.aspx index 2e426a745..7fe762428 100644 --- a/Transportes/RepViajes.aspx +++ b/Transportes/RepViajes.aspx @@ -87,7 +87,7 @@ + /> From 9ac23a717214cdc314f92173b688864dee1197cb Mon Sep 17 00:00:00 2001 From: rakcsle Date: Thu, 15 Feb 2024 08:29:30 -0700 Subject: [PATCH 7/7] MAquinaria correciones Horometro Diario y Cls PAginas --- App_Code/ClsPaginas.vb | 3 +-- MQ/HorometroDiario.aspx.vb | 14 +++++++++++++- MQ/TipoOrdenTrabajo.aspx.vb | 3 ++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index c16b91bb9..090a76161 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -10391,8 +10391,7 @@ Public Class ClsPaginas PaginaDict.Add("/MQ/OrdenTrabajo.aspx".ToUpper, 1412) PaginaDict.Add("/MQ/CatOrdenTrabajo.aspx".ToUpper, 1413) PaginaDict.Add("/MQ/HorometroDiario.aspx".ToUpper, 1414) - - PaginaDict.Add("/MQ/TipoOrdenTrabajo.aspx".ToUpper, -1) + PaginaDict.Add("/MQ/TipoOrdenTrabajo.aspx".ToUpper, 1415) #End Region #Region "Nomina" diff --git a/MQ/HorometroDiario.aspx.vb b/MQ/HorometroDiario.aspx.vb index d4c1749d1..7b4ca2a7b 100644 --- a/MQ/HorometroDiario.aspx.vb +++ b/MQ/HorometroDiario.aspx.vb @@ -2,6 +2,7 @@ Imports System.Data Imports System.Linq +Imports CrystalDecisions.Shared.Json Imports Extensiones Partial Class AF_HorometroDiario @@ -60,10 +61,21 @@ Partial Class AF_HorometroDiario Private Sub CargCombos() - DdlAF.DataSource = GlobalDTActivoFijos(UsuarioActual.CveEmpresa) + Dim ObjActivosFijos As New ClsAF + + + If ObjActivosFijos.GetActivosFijos(-1, UsuarioActual.CveEmpresa, "-1", "-1", -1, -1, "-1", -1, -1, -1, -1, -1, "", -1) Then + DdlAF.DataSource = ObjActivosFijos.DtResultados.FiltraParametros(" MedidaVehicular in (2, 3) ") + Else + DdlAF.DataSource = Nothing + End If + + DdlAF.DataBind() + + DdlSubProyecto.Items.Clear() DdlSubProyecto.DataSource = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, CveEmpresa:=UsuarioActual.CveEmpresa) DdlSubProyecto.DataBind() diff --git a/MQ/TipoOrdenTrabajo.aspx.vb b/MQ/TipoOrdenTrabajo.aspx.vb index e734ff8f2..42f9edbfc 100644 --- a/MQ/TipoOrdenTrabajo.aspx.vb +++ b/MQ/TipoOrdenTrabajo.aspx.vb @@ -307,7 +307,7 @@ Partial Class MQ_TipoOrdenTrabajo GvMaterial.DataSource = DTMateriales Else - GvMaterial = Nothing + GvMaterial.DataSource = Nothing End If ObjAF.Dispose() @@ -1198,6 +1198,7 @@ Partial Class MQ_TipoOrdenTrabajo If ErrorProceso Then ObjAF.RollBack() + CveTipoServicio = -1 Else ObjAF.Commit() Alert("Tipo servicio guardado correctamente.", TipoMensaje.MsgInformacion)