Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

2024-01-12 20:30:38 -07:00
parent 30d35df6de 47eee107e5
commit c19159aadd
20 changed files with 773 additions and 668 deletions
--- a/App_Code/ClsOS.vb
+++ b/App_Code/ClsOS.vb
@@ -1871,6 +1871,32 @@ Public Class ClsOS
 #End Region


+    Public Function AddOrdenesServicioMateriales(CveOS As Integer, CvePS As Integer, Cantidad As Decimal, Serie As String, Lote As String, FechaCaducidad As Date, CveUsuario As Integer) As Boolean
+        Dim Retorno As Boolean = False
+
+        DataAdapter("PA_OS_OrdenesServicioMaterialesAdd")
+
+        With SqlAdapter.SelectCommand.Parameters
+            .Add("@CveOS", SqlDbType.Int).Value = CveOS
+            .Add("@CvePS", SqlDbType.Int).Value = CvePS
+            .Add("@Cantidad", SqlDbType.Decimal).Value = Cantidad
+            .Add("@Serie", SqlDbType.VarChar).Value = Serie
+            .Add("@Lote", SqlDbType.VarChar).Value = Lote
+            .Add("@FechaCaducidad", SqlDbType.Date).Value = FechaCaducidad
+            .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
+        End With
+
+        Try
+            SqlAdapter.Fill(Data)
+            Retorno = True
+
+        Catch ex As Exception
+            OnError("Ocurrió un error al guardar el material.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+        End Try
+
+        Return Retorno
+    End Function
+
    'Public Function GetCveCliente(CveVenta As Integer) As Boolean
    '    Dim Retorno As Boolean = False
    '    DataAdapter("PA_OS_ClienteGet")
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -3548,12 +3548,21 @@ Public Class ClsPaginas
    End Property
    Property GlobalDTAC_PD_Programas(CveEjeRector As Integer) As DataTable
        Get
+            Dim CveEmpresa As Integer = 48
+            Dim AppNombre As String = $"GlobalDTAC_PD_Programas-{CveEmpresa}"
+            'sino existe, recarga los datos
+            If HttpContext.Current.Application(AppNombre) Is Nothing Then
+                Using ObjAC As New ClsAC
+                    If ObjAC.GetClasificacionAdministrativa(CveEmpresa) Then HttpContext.Current.Application(AppNombre) = ObjAC.DtResultados
+                End Using
+            End If
+            GlobalDTAC_PD_Programas = DirectCast(HttpContext.Current.Application(AppNombre), DataTable)
            If CveEjeRector <> -1 Then
-                Dim Dv As New DataView(DirectCast(Application("GlobalDTAC_PD_Programas"), DataTable), String.Format("CveEjeRector = {0}", CveEjeRector), "", DataViewRowState.CurrentRows)
+                Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), String.Format("CveEjeRector = {0}", CveEjeRector), "", DataViewRowState.CurrentRows)
                GlobalDTAC_PD_Programas = Dv.ToTable
                Dv.Dispose()
            Else
-                GlobalDTAC_PD_Programas = DirectCast(Application("GlobalDTAC_PD_Programas"), DataTable)
+                GlobalDTAC_PD_Programas = DirectCast(Application(AppNombre), DataTable)
            End If
        End Get
        Set(value As DataTable)
@@ -6478,7 +6487,7 @@ Public Class ClsPaginas
                            If XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Name = "tfd:TimbreFiscalDigital" Then
                                Vta.FolioFiscal = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("UUID").InnerText
                                Vta.NoSerieCertificado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("NoCertificadoSAT").InnerText
-                                Vta.FechaCertificacion = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate
+                                Vta.FechaTimbrado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate
                                Vta.SelloCFDi = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("SelloCFD").InnerText
                                Vta.SelloSAT = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("SelloSAT").InnerText
                            End If
@@ -6597,7 +6606,7 @@ Public Class ClsPaginas
                            If XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Name = "tfd:TimbreFiscalDigital" Then
                                Vta.FolioFiscal = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("UUID").InnerText
                                Vta.NoSerieCertificado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("noCertificadoSAT").InnerText
-                                Vta.FechaCertificacion = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate
+                                Vta.FechaTimbrado = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("FechaTimbrado").InnerText.ToDate
                                Vta.SelloCFDi = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("selloCFD").InnerText
                                Vta.SelloSAT = XmlDoc.DocumentElement("cfdi:Complemento").ChildNodes(i).Attributes("selloSAT").InnerText
                            End If
@@ -6675,7 +6684,7 @@ Public Class ClsPaginas
        'ImgCBB = String.Format("{0}://{1}:{2}/Empresas/{3}/CBB/{4}.jpg", Request.Url.Scheme.Replace("https", "http"), Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa, Vta.SerieFolio)

        'Dim CadenaOriginals As String = "||1.0|" + Vta.FolioFiscal + "|" + Vta.FechaCertificacion.ToString("yyyy-MM-dd") + "T" + Vta.FechaCertificacion.ToString("HH:mm:ss") + "|" + Vta.SelloCFDi + "|" + Vta.NoSerieCertificado + "||"
-        Dim CadenaOriginals As String = String.Format("||{0}|{1}|{2}T{3}|{4}|{5}||", If(Vta.Version.Contiene("3.3", "4.0"), "1.1", "1.0"), Vta.FolioFiscal, Vta.FechaCertificacion.ToString("yyyy-MM-dd"), Vta.FechaCertificacion.ToString("HH:mm:ss"), Vta.SelloCFDi, Vta.NoSerieCertificado)
+        Dim CadenaOriginals As String = String.Format("||{0}|{1}|{2}T{3}|{4}|{5}||", If(Vta.Version.Contiene("3.3", "4.0"), "1.1", "1.0"), Vta.FolioFiscal, Vta.FechaTimbrado.ToString("yyyy-MM-dd"), Vta.FechaTimbrado.ToString("HH:mm:ss"), Vta.SelloCFDi, Vta.NoSerieCertificado)
        If Not ImagenCBB.Exists Then ImgCBB = ""
        Dim RutaFormato As String = ""
        Dim RutaFormatoDefault As String = ""
@@ -6741,7 +6750,7 @@ Public Class ClsPaginas
            params.Add(New ReportParameter("DomicilioSucursal", DomicilioSucursal))
            params.Add(New ReportParameter("Vencimiento", Vta.FechaVencimiento.ToString("dd/MM/yyyy")))
            params.Add(New ReportParameter("FolioFiscal", Vta.FolioFiscal))
-            params.Add(New ReportParameter("FechaCertificacion", String.Format("{0}T{1}", Vta.FechaCertificacion.ToString("yyyy-MM-dd"), Vta.FechaCertificacion.ToString("HH:mm:ss"))))
+            params.Add(New ReportParameter("FechaCertificacion", String.Format("{0}T{1}", Vta.FechaTimbrado.ToString("yyyy-MM-dd"), Vta.FechaTimbrado.ToString("HH:mm:ss"))))
            params.Add(New ReportParameter("SelloCFDI", Vta.SelloCFDi))
            params.Add(New ReportParameter("CadenaSAT", CadenaOriginals))
            params.Add(New ReportParameter("SelloSAT", Vta.SelloSAT))
--- a/App_Code/ClsTransportes.vb
+++ b/App_Code/ClsTransportes.vb
@@ -339,8 +339,6 @@ Public Class ClsTransportes
    End Function
 #End Region

-
-
 #Region "Rutas"
    Public Function GetRutas(CveRuta As Integer, CveUsuario As Integer, CveEmpresa As Integer, Ruta As String, Estatus As Boolean, FechaIng As DateTime) As Boolean
        Dim Retorno As Boolean = False
--- a/App_Code/ClsVentas.vb
+++ b/App_Code/ClsVentas.vb
@@ -424,7 +424,7 @@ Public Class ClsVentas
        Return Retorno
    End Function

-    Public Function AddVenta(TipoDocto As String, FolioFact As Integer, CveCliente As Integer, CveClienteSucursal As Integer, SubTotal As Double, Descuento As Double, Amortizacion As Double, IVA As Double, RetIVA As Double, RetISR As Double, Total As Double,
+    Public Function AddVenta(TipoDocto As String, FolioFact As Integer, CveCliente As Integer, CveClienteSucursal As Integer, SubTotal As Decimal, Descuento As Decimal, Amortizacion As Decimal, IVA As Decimal, RetIVA As Decimal, RetISR As Decimal, Total As Decimal,
                             CveMoneda As Integer, TipoCambio As Double, CveMetodoPago As Integer, CondicionesPago As Integer, FormaPago As Integer, FechaVencimiento As DateTime, Fecha As DateTime, MotivoDescuento As String, Observaciones As String, FechaEjecucion As DateTime,
                             CveVendedor As Integer, Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Double, Num2 As Double, Num3 As Double,
                             Fech1 As Date, Fech2 As Date, Fech3 As Date, CveCorte As Integer, NumeroPersonas As Integer, CvePrePoliza As Integer, CveUsuario As Integer, CveEmpresa As Integer,
@@ -438,7 +438,8 @@ Public Class ClsVentas
                             Optional DiasCredito As Integer = 0, Optional EsDiasCreditoFijo As Boolean = False, Optional AnticipoEspecial As Boolean = False, Optional Kilometraje As Double = 0, Optional EsAmortizacion As Boolean = False, Optional CveTipoRetencion As Integer = 0,
                             Optional CorreoNotificacion As String = "", Optional FormaPaqueteria As Integer = 1, Optional FacturarSucursal As Boolean = False, Optional VentaDesglosaIEPS As Boolean = False, Optional ServicioDomicilio As Boolean = False, Optional RFCReceptor As String = "", Optional Adjunto As String = "-1",
                             Optional DevolucionImportePagado As Decimal = 0, Optional EsGarantia As Boolean = False, Optional CveLineaAdicional As Integer = -1, Optional DescripcionVenta As String = "",
-                              Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional RequiereOS As Boolean = False
+                             Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional RequiereOS As Boolean = False,
+                             Optional FechaParaSurtir As DateTime = MinFecha
                             ) As Boolean
        Dim Retorno As Boolean = False

@@ -449,15 +450,15 @@ Public Class ClsVentas
            .Add("@FolioFact", SqlDbType.Int).Value = FolioFact
            .Add("@CveCliente", SqlDbType.Int).Value = CveCliente
            .Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal
-            .Add("@SubTotal", SqlDbType.Float).Value = SubTotal.RoundSQL
-            .Add("@Descuento", SqlDbType.Float).Value = Descuento.RoundSQL
-            .Add("@Amortizacion", SqlDbType.Float).Value = Amortizacion.RoundSQL
-            .Add("@IVA", SqlDbType.Float).Value = IVA.RoundSQL
-            .Add("@IEPS", SqlDbType.Float).Value = IEPS.RoundSQL
-            .Add("@RetIVA", SqlDbType.Float).Value = RetIVA.RoundSQL
-            .Add("@RetISR", SqlDbType.Float).Value = RetISR.RoundSQL
-            .Add("@ImpuestoLocal", SqlDbType.Float).Value = ImpuestoLocal.RoundSQL
-            .Add("@Total", SqlDbType.Float).Value = Total.RoundSQL
+            .Add("@SubTotal", SqlDbType.Money).Value = SubTotal.RoundSQL
+            .Add("@Descuento", SqlDbType.Money).Value = Descuento.RoundSQL
+            .Add("@Amortizacion", SqlDbType.Money).Value = Amortizacion.RoundSQL
+            .Add("@IVA", SqlDbType.Money).Value = IVA.RoundSQL
+            .Add("@IEPS", SqlDbType.Money).Value = IEPS.RoundSQL
+            .Add("@RetIVA", SqlDbType.Money).Value = RetIVA.RoundSQL
+            .Add("@RetISR", SqlDbType.Money).Value = RetISR.RoundSQL
+            .Add("@ImpuestoLocal", SqlDbType.Money).Value = ImpuestoLocal.RoundSQL
+            .Add("@Total", SqlDbType.Money).Value = Total.RoundSQL
            .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda
            .Add("@TipoCambio", SqlDbType.Float).Value = TipoCambio
            .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago
@@ -480,7 +481,7 @@ Public Class ClsVentas
            .Add("@Fech3", SqlDbType.VarChar).Value = IIf(Fech3.ToString.Contiene("1/1/0001 12:00:00 a. m.", "01/01/0001 12:00:00 a. m."), "-1", Fech3.ToString("yyyy/MM/dd"))
            .Add("@CveCorte", SqlDbType.Int).Value = CveCorte
            .Add("@NumeroPersonas", SqlDbType.Int).Value = NumeroPersonas
-            .Add("@Propina", SqlDbType.Float).Value = Propina
+            .Add("@Propina", SqlDbType.Money).Value = Propina
            .Add("@CveVentaTerminal", SqlDbType.Int).Value = CveVentaTerminal
            .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza
            .Add("@AtencionA", SqlDbType.VarChar).Value = AtencionA
@@ -544,6 +545,7 @@ Public Class ClsVentas
            .Add("@CveProcedimiento", SqlDbType.Int).Value = CveProcedimiento
            .Add("@CveTipoVenta", SqlDbType.Int).Value = CveTipoVenta
            .Add("@RequiereOS", SqlDbType.Int).Value = RequiereOS
+            .Add("@FechaParaSurtir", SqlDbType.DateTime).Value = If(FechaParaSurtir = MinFecha, Fecha, FechaParaSurtir)


            .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue
--- a/App_Code/Modelos.vb
+++ b/App_Code/Modelos.vb
@@ -7094,7 +7094,6 @@ Namespace Modelos
        Public Property FacturarSucursal As Boolean = False
        'Public Property Sucursal As SucursalModel
        Public Property SubProyecto As Modelos.SubProyectoModel
-
        Public Property DtDetalle As Data.DataTable
        Public Property DtMercancias As Data.DataTable
        Public Property DtDetalleAC As Data.DataTable
@@ -7108,7 +7107,6 @@ Namespace Modelos
        Public Property DtDesgloseImpuestos As Data.DataTable
        Public Property DtDocumentosRelacionados As Data.DataTable
        Public Property DtNCVinculadas As Data.DataTable
-
        Public Property DtAnticipos As Data.DataTable
        Public Property DtPromociones As Data.DataTable
        Public Property DtImpuestosLocales As Data.DataTable
@@ -7122,10 +7120,8 @@ Namespace Modelos
        Public Property DtDocumentacionCliente As Data.DataTable
        Public Property DtContratosSerieDetalle As Data.DataTable
        Public Property DtOtrosConceptos As Data.DataTable
-
        Public Property DtRemisionesDocumentosRelacionados As Data.DataTable
        Public Property DtInventario As Data.DataTable
-        'Public Property DtAnticipoAmortizacion As Data.DataTable
        Public Property DtRemConceptosSurtidos As Data.DataTable
        Public Property UsadosBonificacion As List(Of Integer)
        Public Property TipoBonificacion As Integer = 0
@@ -7176,7 +7172,6 @@ Namespace Modelos
        Public Property RefDocto As String = ""
        Public Property RealizarDevolucionAlmacen As Boolean
        Public Property CveAlmacenDevolucionVenta As Integer
-
        Public Property TipoDocumento As String


@@ -7224,28 +7219,6 @@ Namespace Modelos
                End Select
            End Get
        End Property
-        Public ReadOnly Property TipodeComprobanteSAT As ClbNegBICFDv3_2.TipoDeComprobante
-            Get
-                Select Case TipoDocto
-                    Case "Ing"
-                        Return ClbNegBICFDv3_2.TipoDeComprobante.ingreso
-                    Case "Egs"
-                        Return ClbNegBICFDv3_2.TipoDeComprobante.egreso
-                    Case "Dev"
-                        Return ClbNegBICFDv3_2.TipoDeComprobante.egreso
-                    Case "Cot"
-                        Return Nothing
-                    Case "Rem"
-                        Return Nothing
-                    Case "Nom"
-                        Return Nothing
-                    Case "Ant"
-                        Return ClbNegBICFDv3_2.TipoDeComprobante.ingreso
-                    Case Else
-                        Return Nothing
-                End Select
-            End Get
-        End Property
        Public ReadOnly Property ClaseDoctoSat As Integer
            Get
                Select Case TipoDocto
@@ -7293,7 +7266,6 @@ Namespace Modelos
                Return retorno
            End Get
        End Property
-
        Public Property CondicionesPago As Integer = 0 ' 0 - Contado, 1 - Credito (CHECAR)

        Public ReadOnly Property CondicionesPagoText As String
@@ -7308,7 +7280,6 @@ Namespace Modelos
                Return retorno
            End Get
        End Property
-
        Public Property MotivoDescuento As String = ""
        Public Property EsGarantia As Boolean = False

@@ -7433,24 +7404,21 @@ Namespace Modelos
        Public Property Num1 As Double = 0
        Public Property Num2 As Double = 0
        Public Property Num3 As Double = 0
-
        Public Property DiasCredito As Integer
        Public Property EsDiasCreditoFijo As Boolean
-
        Public Property CveCorte As Integer = -1
        'Public Property CveMesa As Integer = -1
        Public Property NumeroPersonas As Integer = 0

        <ComponentModel.DataAnnotations.Schema.NotMapped>
        Public Property FechaPago As Date
-
        Public Property CveNCaVincular As Integer
        Public Property FolioFiscal As String = ""
        Public Property NoSerieCertificado As String
        Public Property SelloCFDi As String = ""
        Public Property SelloSAT As String = ""
        Public Property FechaEmision As Date
-        Public Property FechaCertificacion As Date
+        Public Property FechaTimbrado As Date
        Public Property NoSerieCertificadoContribuyente As String
        Public Property NumeroCuenta As String = ""
        Public Property CveTipoAmortizacionAnticipo As Integer = -1
@@ -7564,8 +7532,8 @@ Namespace Modelos
        Public Property VendedorCodigo As String = ""
        Public Property CveSucursalEjecucion As Integer
        Public Property FechaEjecucion As DateTime
+        Public Property FechaParaSurtir As DateTime = MinFecha
        Public Property CveSucursalCobranza As Integer
-
        Public Property CveSubProyectoCobranza As Integer
        Public Property CveSubProyectoEjecucion As Integer
        Public Property CveOS As Integer
@@ -7578,25 +7546,16 @@ Namespace Modelos
        Public Property TipoEstatus As Integer = 0
        Public Property CveCondicionEntrega As Integer = -1
        Public Property CondicionEntrega As String = ""
-
        Public Property TipoRelacion As String
        Public Property UUIDRelacionados As List(Of String)
-
-
        Public Property CveVentaRelacion As Integer = -1
        Public Property ImporteRelacion As Decimal
-
        Public Property EsNCAmortizacion As Boolean
        Public Property Kilometraje As Decimal
-
        Public Property CveTipoRetencion As Integer
-
        Public Property VentaDesglosaIEPS As Boolean
-
        Public Property CveMotivoCancelacion As Integer = -1
-
        Public Property MotivoCancelacion As String = ""
-
        Public Property TipoContable As Integer = -1

 #End Region
--- a/Empresas/188/Formatos/Boleto.mrt
+++ b/Empresas/188/Formatos/Boleto.mrt
@@ -10,19 +10,19 @@
    <Resources isList="true" count="0" />
    <Variables isList="true" count="14">
      <value>ReportParameters</value>
-      <value>ReportParameters,Ruta,Ruta,,System.String,RUTA_x0020_101_x0020_VIA_x0020_SAN_x0020_FRANCISCO,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0037_f0f80c11ace4980af534dea0e66ae04</value>
-      <value>ReportParameters,Origen,Origen,,System.String,GUAYMAS_x0020_SON,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0039_e9facc30b104f86b1e310401529dae5</value>
-      <value>ReportParameters,Destino,Destino,,System.String,NAPA_x0020_101,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,c10a083d19ff438aaf2166b8875ae769</value>
-      <value>ReportParameters,FechaSalida,FechaSalida,,System.String,_x0032_024-01-03,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0033_a01d4856a0f4f379f5dceff384f582e</value>
-      <value>ReportParameters,HoraSalida,HoraSalida,,System.String,_x0031_7:00,False,False,False,False,,_x0038_dc813ab476543688554b291a9de132d</value>
-      <value>ReportParameters,Asiento,Asiento,,System.String,_x0034_4,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,b3bc9f2902964064bbe83f38e0ca7de2</value>
-      <value>ReportParameters,Nombre,Nombre,,System.String,José_x0020_Manuel_x0020_Méndez_x0020_Jr.,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0038_f7d3778d21040f5904a142bc66e56c1</value>
-      <value>ReportParameters,Visa,Visa,,System.String,_x0030_8_x002F_22_x002F_2022,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,b491315f90ef44f8895d4e835adf914a</value>
-      <value>ReportParameters,Agencia,Agencia,,System.String,Lolys_x0020_Travel,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_</value>
-      <value>ReportParameters,TelefonoAgencia,TelefonoAgencia,,System.String,_x0033_2232,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_</value>
-      <value>ReportParameters,Celular,Celular,,System.String,_x0039_526422037,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0034_ed4e36d5bab4f9e8e2929348b73f345</value>
-      <value>ReportParameters,Importe,Importe,,System.String,_x0031_70,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_</value>
-      <value>ReportParameters,TipoBoleto,TipoBoleto,,System.String,Tercera_x0020_Edad,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_</value>
+      <value>ReportParameters,Ruta,Ruta,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0037_f0f80c11ace4980af534dea0e66ae04</value>
+      <value>ReportParameters,Origen,Origen,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0039_e9facc30b104f86b1e310401529dae5</value>
+      <value>ReportParameters,Destino,Destino,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,c10a083d19ff438aaf2166b8875ae769</value>
+      <value>ReportParameters,FechaSalida,FechaSalida,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0033_a01d4856a0f4f379f5dceff384f582e</value>
+      <value>ReportParameters,HoraSalida,HoraSalida,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0038_dc813ab476543688554b291a9de132d</value>
+      <value>ReportParameters,Asiento,Asiento,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,b3bc9f2902964064bbe83f38e0ca7de2</value>
+      <value>ReportParameters,Nombre,Nombre,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0038_f7d3778d21040f5904a142bc66e56c1</value>
+      <value>ReportParameters,Visa,Visa,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,b491315f90ef44f8895d4e835adf914a</value>
+      <value>ReportParameters,Agencia,Agencia,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0039_ede7a959adc4e459aa7ac9f86523dd2</value>
+      <value>ReportParameters,TelefonoAgencia,TelefonoAgencia,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,be0d0073323c434c982871e06e55a31d</value>
+      <value>ReportParameters,Celular,Celular,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0034_ed4e36d5bab4f9e8e2929348b73f345</value>
+      <value>ReportParameters,Importe,Importe,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,c473eff1d3a641e98082465b9abf47aa</value>
+      <value>ReportParameters,TipoBoleto,TipoBoleto,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0036_950e3622f0241bebf1ac2ca57d34b01</value>
    </Variables>
  </Dictionary>
  <EngineVersion>EngineV2</EngineVersion>
@@ -36,7 +36,7 @@
      <Components isList="true" count="33">
        <Image1 Ref="3" type="Image" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>0.4,1.4,5.4,2.6</ClientRectangle>
+          <ClientRectangle>0.4,2,5.4,2.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
          <HorAlignment>Right</HorAlignment>
@@ -561,10 +561,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        <Text2 Ref="4" type="Text" isKey="true">
          <Border>Bottom;[191:191:191];1;Solid;False;4;Black</Border>
          <Brush>Transparent</Brush>
-          <ClientRectangle>0,0,19,1.4</ClientRectangle>
+          <ClientRectangle>0,0,19,1.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,20</Font>
+          <Font>Arial,20</Font>
          <Margins>0,0,0,0</Margins>
          <Name>Text2</Name>
          <Page isRef="2" />
@@ -575,10 +575,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text2>
        <Text3 Ref="5" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>6,1.8,1.2,0.6</ClientRectangle>
+          <ClientRectangle>6,2,1.2,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text3</Name>
@@ -591,10 +591,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text3>
        <Text1 Ref="6" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>6,3.8,1.2,0.6</ClientRectangle>
+          <ClientRectangle>6,3.8,1.2,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text1</Name>
@@ -607,10 +607,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text1>
        <Text4 Ref="7" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>6,2.8,1.2,0.6</ClientRectangle>
+          <ClientRectangle>6,3,1.2,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text4</Name>
@@ -623,10 +623,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text4>
        <Text5 Ref="8" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>11,1.8,1.8,0.6</ClientRectangle>
+          <ClientRectangle>11,2,1.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text5</Name>
@@ -639,10 +639,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text5>
        <Text6 Ref="9" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>11,2.8,1.8,0.6</ClientRectangle>
+          <ClientRectangle>11,3,1.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text6</Name>
@@ -655,10 +655,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text6>
        <Text7 Ref="10" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>1.4,4.8,2.4,0.6</ClientRectangle>
+          <ClientRectangle>1.4,4.8,2.4,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text7</Name>
@@ -671,10 +671,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text7>
        <Text8 Ref="11" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>1.4,6.8,2.4,0.6</ClientRectangle>
+          <ClientRectangle>1.4,6.8,2.4,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text8</Name>
@@ -687,10 +687,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text8>
        <Text9 Ref="12" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>1.4,5.8,2.4,0.6</ClientRectangle>
+          <ClientRectangle>1.4,5.8,2.4,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text9</Name>
@@ -703,10 +703,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text9>
        <Text10 Ref="13" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>11,5.8,1.8,0.6</ClientRectangle>
+          <ClientRectangle>11,5.8,1.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text10</Name>
@@ -719,10 +719,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text10>
        <Text11 Ref="14" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>1.4,7.8,2.4,0.6</ClientRectangle>
+          <ClientRectangle>1.4,7.8,2.4,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text11</Name>
@@ -735,10 +735,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text11>
        <Text12 Ref="15" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>11,6.8,1.8,0.6</ClientRectangle>
+          <ClientRectangle>11,6.8,1.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Right</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text12</Name>
@@ -751,10 +751,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text12>
        <Text13 Ref="16" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>0.4,9.2,2.8,0.6</ClientRectangle>
+          <ClientRectangle>0.4,9,2.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,8,Bold</Font>
+          <Font>Arial,8,Bold</Font>
          <Margins>0,0,0,0</Margins>
          <Name>Text13</Name>
          <Page isRef="2" />
@@ -766,10 +766,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text13>
        <Text14 Ref="17" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>0.4,9.8,9.2,0.4</ClientRectangle>
+          <ClientRectangle>0.4,9.6,9.2,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7</Font>
+          <Font>Arial,7</Font>
          <Margins>0,0,0,0</Margins>
          <Name>Text14</Name>
          <Page isRef="2" />
@@ -781,10 +781,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text14>
        <Text15 Ref="18" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>0.4,10.2,9.2,0.4</ClientRectangle>
+          <ClientRectangle>0.4,10,9.2,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7</Font>
+          <Font>Arial,7</Font>
          <Margins>0,0,0,0</Margins>
          <Name>Text15</Name>
          <Page isRef="2" />
@@ -796,10 +796,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text15>
        <Text16 Ref="19" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>0.4,10.6,9.2,0.4</ClientRectangle>
+          <ClientRectangle>0.4,10.4,9.2,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7</Font>
+          <Font>Arial,7</Font>
          <Margins>0,0,0,0</Margins>
          <Name>Text16</Name>
          <Page isRef="2" />
@@ -811,10 +811,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text16>
        <Text17 Ref="20" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>0.4,11,2.8,0.4</ClientRectangle>
+          <ClientRectangle>0.4,10.8,2.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7</Font>
+          <Font>Arial,7</Font>
          <Margins>0,0,0,0</Margins>
          <Name>Text17</Name>
          <Page isRef="2" />
@@ -826,10 +826,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text17>
        <Text18 Ref="21" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>15.8,1.8,2.8,0.6</ClientRectangle>
+          <ClientRectangle>15.8,2,2.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Center</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text18</Name>
@@ -842,10 +842,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Text18>
        <Text19 Ref="22" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>15.8,4.8,2.8,0.6</ClientRectangle>
+          <ClientRectangle>15.8,4.8,2.8,0.8</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,7,Bold</Font>
+          <Font>Arial,7,Bold</Font>
          <HorAlignment>Center</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text19</Name>
@@ -860,10 +860,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <BackgroundColor>216, 216, 216</BackgroundColor>
          <BorderColor>191, 191, 191</BorderColor>
          <Brush>[216:216:216]</Brush>
-          <ClientRectangle>7.2,1.8,3.6,0.6</ClientRectangle>
+          <ClientRectangle>7.2,2,3.6,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -873,16 +873,16 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ShapeType Ref="24" type="Stimulsoft.Report.Components.ShapeTypes.StiRoundedRectangleShapeType" isKey="true">
            <Round>0.2</Round>
          </ShapeType>
-          <Text> {Ruta}</Text>
+          <Text>{Ruta}</Text>
        </Shape1>
        <Shape2 Ref="25" type="Shape" isKey="true">
          <BackgroundColor>216, 216, 216</BackgroundColor>
          <BorderColor>191, 191, 191</BorderColor>
          <Brush>[216:216:216]</Brush>
-          <ClientRectangle>7.2,2.8,3.6,0.6</ClientRectangle>
+          <ClientRectangle>7.2,3,3.6,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -901,7 +901,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>7.2,3.8,3.6,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -917,10 +917,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <BackgroundColor>216, 216, 216</BackgroundColor>
          <BorderColor>191, 191, 191</BorderColor>
          <Brush>[216:216:216]</Brush>
-          <ClientRectangle>12.8,1.8,2.8,0.6</ClientRectangle>
+          <ClientRectangle>12.8,2,2.8,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -936,10 +936,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <BackgroundColor>216, 216, 216</BackgroundColor>
          <BorderColor>191, 191, 191</BorderColor>
          <Brush>[216:216:216]</Brush>
-          <ClientRectangle>12.8,2.8,2.8,0.6</ClientRectangle>
+          <ClientRectangle>12.8,3,2.8,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -953,10 +953,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Shape5>
        <Text20 Ref="33" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>15.8,2.4,2.8,2</ClientRectangle>
+          <ClientRectangle>15.8,2.6,2.8,2.4</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,26,Bold</Font>
+          <Font>Arial,26,Bold</Font>
          <HorAlignment>Center</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text20</Name>
@@ -974,7 +974,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>3.8,4.8,11.8,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -984,7 +984,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ShapeType Ref="35" type="Stimulsoft.Report.Components.ShapeTypes.StiRoundedRectangleShapeType" isKey="true">
            <Round>0.2</Round>
          </ShapeType>
-          <Text> {Nombre}</Text>
+          <Text>{Nombre}</Text>
        </Shape6>
        <Shape7 Ref="36" type="Shape" isKey="true">
          <BackgroundColor>216, 216, 216</BackgroundColor>
@@ -993,7 +993,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>3.8,5.8,7,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -1012,7 +1012,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>3.8,6.8,7,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -1031,7 +1031,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>3.8,7.8,7,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -1050,7 +1050,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>12.8,5.8,2.8,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -1069,7 +1069,7 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
          <ClientRectangle>12.8,6.8,2.8,0.6</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,6</Font>
+          <Font>Arial,6</Font>
          <ForeColor>63, 63, 63</ForeColor>
          <HorAlignment>Left</HorAlignment>
          <Margins>0,0,0,0</Margins>
@@ -1083,10 +1083,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
        </Shape11>
        <Text21 Ref="46" type="Text" isKey="true">
          <Brush>Transparent</Brush>
-          <ClientRectangle>15.8,5.4,2.8,2</ClientRectangle>
+          <ClientRectangle>15.8,5.4,2.8,2.4</ClientRectangle>
          <Conditions isList="true" count="0" />
          <Expressions isList="true" count="0" />
-          <Font>Sans Serif Collection,26,Bold</Font>
+          <Font>Arial,26,Bold</Font>
          <HorAlignment>Center</HorAlignment>
          <Margins>0,0,0,0</Margins>
          <Name>Text21</Name>
@@ -1120,10 +1120,10 @@ MdwarMEnCGsMtwZr8IkB8P8Dxed6+p2t88EAAAAASUVORK5CYII=</ImageBytes>
  </ReferencedAssemblies>
  <ReportAlias>Report</ReportAlias>
  <ReportAuthor>jesus moreno quintana</ReportAuthor>
-  <ReportChanged>1/8/2024 12:08:07 PM</ReportChanged>
+  <ReportChanged>1/10/2024 4:23:24 PM</ReportChanged>
  <ReportCreated>1/8/2024 11:08:51 AM</ReportCreated>
  <ReportFile>C:\inetpub\WWWSIGIT\Empresas\188\Formatos\Boleto.mrt</ReportFile>
-  <ReportGuid>8a0ed87b2c1746c486241406fa90a841</ReportGuid>
+  <ReportGuid>12003dc43203426781fb798356b41920</ReportGuid>
  <ReportName>Report</ReportName>
  <ReportUnit>Centimeters</ReportUnit>
  <ReportVersion>2023.3.2.0</ReportVersion>
--- a/General/SaldosIniciales.aspx.vb
+++ b/General/SaldosIniciales.aspx.vb
@@ -4,8 +4,7 @@ Imports System.Data
 Imports System.Math
 Imports ClosedXML.Excel
 Imports Extensiones
-Imports GemBox.Spreadsheet
-Imports log4net.Filter
+

 Partial Class General_SaldosIniciales
    Inherits ClsPaginas
@@ -1601,14 +1600,14 @@ Partial Class General_SaldosIniciales
                    Dim Fecha As Date = Row("Fecha").ToString().ToDate
                    Dim FechaVencimiento As Date = Row("Fecha Vencimiento").ToString().ToDate
                    Dim ImpuestoLocal As Decimal = If(dt.Columns.Contains("ImpuestoLocal"), Row("ImpuestoLocal").ToString().ToDecimal, 0D)
-                    Dim Amortizacion As Double = If(dt.Columns.Contains("Amort.Ant"), Row("Amort.Ant").ToString().ToDouble, 0.0)
+                    Dim Amortizacion As Decimal = If(dt.Columns.Contains("Amort.Ant"), Row("Amort.Ant").ToString().ToDecimal, 0)
                    Dim SubTotal As Decimal = Row("SubTotal").ToString().ToDecimal
                    Dim IVA As Decimal = Row("IVA").ToString().ToDecimal
                    Dim Total As Decimal = Row("Total").ToString().ToDecimal
                    Dim Saldo As Decimal = Row("Saldo").ToString().ToDecimal
                    Dim CveCliente As Integer = DtClientes.FiltroPrimeroValor("CveCliente", $"RFC = '{RFC}'").ToString().ToEntero()
                    Dim RetIVA As Decimal = Row("Ret IVA").ToString().ToDecimal
-                    Dim RetISR As Double = Row("Ret ISR").ToString().ToDouble
+                    Dim RetISR As Decimal = Row("Ret ISR").ToString().ToDecimal
                    Dim Moneda As String = Row("Moneda").ToString()
                    Dim TipoCambio As String = Row("Tipo Cambio").ToString()
                    Dim CveMoneda As Integer = 1
--- a/OS/OrdenesServicios.aspx.vb
+++ b/OS/OrdenesServicios.aspx.vb
@@ -8,6 +8,8 @@ Imports Telerik.Web.UI
 Imports System.Data.SqlClient
 Imports Stimulsoft.Report.StiOptions.Export
 Imports Modelos
+Imports System.Runtime.InteropServices.ComTypes
+Imports APP_Code_CSharp

 Partial Class OS_OrdenesServicios
    Inherits ClsPaginas
@@ -670,7 +672,7 @@ Partial Class OS_OrdenesServicios
                    '    End If
                    'End If

-                ElseIf TipoEstatus = 4 Then
+                ElseIf TipoEstatus = 4 AndAlso Not UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
                    'DisableAll()
                    If SeFacturara = "True" Then
                        HplFacturar.Visible = True
@@ -2955,6 +2957,20 @@ Partial Class OS_OrdenesServicios
        LnkModalMaterialUtilizado.Visible = True
        DTSolicitudDev = New DataTable
        Dim Opcion As Integer = If(DdlTipoVenta.SelectedValue.Contiene("2", "3"), 2, 1)
+
+
+        Select Case DdlTipoVenta.SelectedValue.ToEntero
+            Case 2, 3
+                Opcion = 2
+                Exit Select
+            Case 5
+                Opcion = 3
+                Exit Select
+            Case Else
+                Opcion = 1
+                Exit Select
+        End Select
+
        Dim ObjOS As New ClsOS
        If ObjOS.GetOrdenesServicioDevolucionMaterial(CveOS, CveVenta, Opcion, UsuarioActual.CveEmpresa) Then
            DTSolicitudDev = ObjOS.DtResultados
@@ -2996,176 +3012,241 @@ Partial Class OS_OrdenesServicios
        Dim CveVentaPedido As Integer = DTSolicitudDev.FiltroPrimeroValor("CveVenta").ToEntero
        Dim CveAlmacenDestino As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa, 10).FiltroPrimeroValor("CveAlmacen", $"CveSubProyecto = {CveSubProyectoPedido}").ToEntero

-        If Not CveAlmacenDestino > 0 Then
-            Alert("No se encontró almacen de entrega por adelantado", TipoMensaje.MsgAdvertencia)
-            Exit Sub
+        If DdlTipoVenta.SelectedValue.ToEntero = 5 Then
+            Dim TotalSeleccionado As Decimal = 0
+
+            For Each GVRow As GridViewRow In GvMU.Rows
+                TotalSeleccionado = TotalSeleccionado + GVRow.FCTextBox("TxtUtilizado").Text.ToDecimal
+            Next
+
+            If TotalSeleccionado = 0 Then
+                Alert("No se selecciono ningun material", TipoMensaje.MsgAdvertencia)
+                Exit Sub
+            End If
+        Else
+
+            If Not CveAlmacenDestino > 0 Then
+                Alert("No se encontró almacen de entrega por adelantado", TipoMensaje.MsgAdvertencia)
+                Exit Sub
+            End If
+
        End If

+
+
        Dim ProcesoOK As Boolean = True
        Dim ObjV As New ClsVentas
-        Dim ClsOS As New ClsOS(ObjV.IniciaTransacSQL())
+        Dim ObjOS As New ClsOS(ObjV.IniciaTransacSQL())
        Dim ObjInventario As New ClsInventarios(ObjV.IniciaTransacSQL())
        Dim ObjConta As New ClsContabilidad(ObjV.IniciaTransacSQL())
-
        Dim GenrarRemisionMovimientos As Boolean = False
-        If ProcesoOK Then
-            Dim AplicaDevolucion As Boolean = False
-            For Each GvRow As GridViewRow In GvMU.Rows
-                Dim CveVentaDetalle As Integer = GvRow.DataKey("CveVentaDetalle").ToEntero
-                Dim CantidadDev As Decimal = GvRow.DataKey("Cantidad").ToDecimal - GvRow.FCTextBox("TxtUtilizado").Text.ToDecimal

-                If CantidadDev > 0 Then
-                    AplicaDevolucion = True
-                    If Not ObjV.UpdateVentasDetalleCantidadDevolucion(CveVentaDetalle, CantidadDev) Then
+
+
+        If DdlTipoVenta.SelectedValue.ToEntero = 5 Then
+
+            For Each GVRow As GridViewRow In GvMU.Rows
+                Dim CantidadRegistro As Decimal = GVRow.FCTextBox("TxtUtilizado").Text.ToDecimal
+                Dim CvePS As Integer = GVRow.DataKey("CvePS").ToEntero
+
+                If CantidadRegistro > 0 Then
+
+                    Dim Serie As String = If(GVRow.DataKey("Serie") = "", "-1", GVRow.DataKey("Serie"))
+                    Dim Lote As String = If(GVRow.DataKey("Lote") = "", "-1", GVRow.DataKey("Lote"))
+                    Dim FechaCaducidad As DateTime = If(GVRow.DataKey("FechaCaducidad") = "", MinFecha, GVRow.DataKey("FechaCaducidad").ToDate)
+
+                    If Not ObjOS.AddOrdenesServicioMateriales(CveOS, CvePS, CantidadRegistro, Serie, Lote, FechaCaducidad, UsuarioActual.CveUsuario) Then
+                        Alert("Ocurrió un error al guardar el material.", TipoMensaje.MsgAdvertencia)
                        ProcesoOK = False
-                        GenrarRemisionMovimientos = False
-                        AplicaDevolucion = False
                        Exit For
                    End If
-                End If

-                If GvRow.FCTextBox("TxtUtilizado").Text.ToDecimal > 0 Then
-                    GenrarRemisionMovimientos = True
                End If
-
            Next
-            If AplicaDevolucion Then
-                If Not ObjV.UpdateVentasDevolucionAlmacen(1, CveVenta) Then
+
+            If ProcesoOK Then
+
+                Dim CveOSEstatusFinalizada As Integer = GlobalDTEstatusOrdenServicios(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveEstatusOrdenServicio", "TipoEstatus = 4").ToEntero
+
+                If CveOSEstatusFinalizada > 0 Then
+                    If Not ObjOS.UpdateOrdenesServiciosEstatus(CveOSEstatusFinalizada, UsuarioActual.CveUsuario, CveOS) Then
+                        ProcesoOK = False
+                    End If
+                Else
+                    Alert("No se pudo obtener el estado para finalizar la orden de servicio.")
                    ProcesoOK = False
                End If
+
+
            End If
-        End If
-        Dim Respuesta As New RespuestaFacturacion()
-        Dim DtVentaDetalle As New DataTable
-        Dim CveMovimientoSalida, CveMovimientoEntrada As Integer
-        Dim ImporteAlmacen As Decimal
-        Dim Fecha As DateTime = ClsPaginas.NowADS()
-
-        If GenrarRemisionMovimientos AndAlso ProcesoOK Then
-            Respuesta = GeneraRemision(CveVentaPedido, ObjV.IniciaTransacSQL())
-
-            If Respuesta.CveVenta > 0 Then
-                If ObjV.GetVentaDetalle(Respuesta.CveVenta) Then
-                    Dim dtClon As DataTable = ObjV.DtResultados.Copy
-                    dtClon.DefaultView.Sort = "CveVentaDetalle ASC"
-                    DtVentaDetalle = dtClon.DefaultView.ToTable()
-                End If
-            Else
-                ProcesoOK = False
-            End If
-        End If
-
-        If GenrarRemisionMovimientos AndAlso ProcesoOK Then
-
-            CveMovimientoSalida = ObjInventario.AddMovimiento(CveAlmacenActual, 8, CveMoneda, Fecha, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, Respuesta.CveVenta, CveSubProyectoPedido, -1, CveOS:=CveOS, CveAlmacenDestino:=CveAlmacenDestino, Modulo:="OS/MatUtil")
-            Dim Folio As Integer = ObjInventario.Folio
-
-            If CveMovimientoSalida > 0 Then
-
-                Dim IndexMov1 As Integer = 0
+        Else
+            If ProcesoOK Then
+                Dim AplicaDevolucion As Boolean = False
                For Each GvRow As GridViewRow In GvMU.Rows
+                    Dim CveVentaDetalle As Integer = GvRow.DataKey("CveVentaDetalle").ToEntero
+                    Dim CantidadDev As Decimal = GvRow.DataKey("Cantidad").ToDecimal - GvRow.FCTextBox("TxtUtilizado").Text.ToDecimal

-                    Dim Cantidad As Decimal = GvRow.DataKey("Cantidad").ToDecimal
-                    Dim CantidadRegistro As Decimal = GvRow.FCTextBox("TxtUtilizado").Text.ToDecimal
-                    Dim CvePS As Integer = GvRow.DataKey("CvePS").ToEntero
-                    Dim CveUM As Integer = GvRow.DataKey("CveUM").ToEntero
-                    Dim PU As Decimal = GvRow.DataKey("PU").ToDecimal
-
-                    If CantidadRegistro > 0 Then
-                        Dim CveVentaDetalle As Integer = GvRow.DataKey("CveVentaDetalle").ToEntero   ' DtVentaDetalle.Rows(IndexMov1)("CveVentaDetalle").ToString.ToEntero
-                        Dim CveMovimientoDetalle As Integer = GvRow.DataKey("CveMovimientoDetalle").ToEntero
-
-                        Dim Serie As String = GvRow.DataKey("Serie")
-                        Dim Lote As String = GvRow.DataKey("Lote")
-                        Dim FechaCaducidad As DateTime = GvRow.DataKey("FechaCaducidad").ToDate
-                        If Not ObjInventario.AddMovimientoDetalle(CveMovimientoSalida, CantidadRegistro, CveUM, CvePS, PU, CveVentaDetalle:=CveVentaDetalle, CveMovimientoDetalleEntrada:=CveMovimientoDetalle, Lote:=Lote, Serie:=Serie, FechaCaducidad:=FechaCaducidad) Then
-                            Alert("Error al agregar detalle de movimiento.", TipoMensaje.MsgAdvertencia)
+                    If CantidadDev > 0 Then
+                        AplicaDevolucion = True
+                        If Not ObjV.UpdateVentasDetalleCantidadDevolucion(CveVentaDetalle, CantidadDev) Then
                            ProcesoOK = False
+                            GenrarRemisionMovimientos = False
+                            AplicaDevolucion = False
                            Exit For
                        End If
                    End If
-                    IndexMov1 = IndexMov1 + 1
+
+                    If GvRow.FCTextBox("TxtUtilizado").Text.ToDecimal > 0 Then
+                        GenrarRemisionMovimientos = True
+                    End If
+
                Next
+                If AplicaDevolucion Then
+                    If Not ObjV.UpdateVentasDevolucionAlmacen(1, CveVenta) Then
+                        ProcesoOK = False
+                    End If
+                End If
+            End If
+            Dim Respuesta As New RespuestaFacturacion()
+            Dim DtVentaDetalle As New DataTable
+            Dim CveMovimientoSalida, CveMovimientoEntrada As Integer
+            Dim ImporteAlmacen As Decimal
+            Dim Fecha As DateTime = ClsPaginas.NowADS()

-                If ProcesoOK Then
+            If GenrarRemisionMovimientos AndAlso ProcesoOK Then
+                Respuesta = GeneraRemision(CveVentaPedido, ObjV.IniciaTransacSQL())

-                    CveMovimientoEntrada = ObjInventario.AddMovimiento(CveAlmacenDestino, 9, CveMoneda, Fecha, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, Respuesta.CveVenta, CveSubProyectoPedido, -1, CveOS:=CveOS, CveMovimientoRelacionado:=CveMovimientoSalida, Modulo:="OS/MatUtil2")
+                If Respuesta.CveVenta > 0 Then
+                    If ObjV.GetVentaDetalle(Respuesta.CveVenta) Then
+                        Dim dtClon As DataTable = ObjV.DtResultados.Copy
+                        dtClon.DefaultView.Sort = "CveVentaDetalle ASC"
+                        DtVentaDetalle = dtClon.DefaultView.ToTable()
+                    End If
+                Else
+                    ProcesoOK = False
+                End If
+            End If

-                    If ObjInventario.GetMovimientosDetalle(CveMovimientoSalida, UsuarioActual.CveEmpresa) AndAlso ObjInventario.DtResultados.Rows.Count > 0 Then
-                        ImporteAlmacen = ObjInventario.DtResultados.SUM("Total")
-                        Dim IndexMov2 As Integer = 0
-                        For Each dRow As DataRow In ObjInventario.DtResultados.Rows
+            If GenrarRemisionMovimientos AndAlso ProcesoOK Then

-                            Dim Cantidad As Decimal = dRow("Cantidad").ToString.ToDecimal
-                            Dim CvePS As Integer = dRow("CvePS").ToString.ToEntero
-                            Dim CveUM As Integer = dRow("CveUM").ToString.ToEntero
-                            Dim PU As Decimal = dRow("PU").ToString.ToDecimal
-                            Dim CveVentaDetalle As Integer = dRow("CveVentaDetalle").ToString.ToEntero
-                            Dim CveMovimientoDetalle As Integer = dRow("CveMovimientoDetalle").ToString.ToEntero
+                CveMovimientoSalida = ObjInventario.AddMovimiento(CveAlmacenActual, 8, CveMoneda, Fecha, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, Respuesta.CveVenta, CveSubProyectoPedido, -1, CveOS:=CveOS, CveAlmacenDestino:=CveAlmacenDestino, Modulo:="OS/MatUtil")
+                Dim Folio As Integer = ObjInventario.Folio

-                            Dim Lote As String = dRow("Lote").ToString
-                            Dim Serie As String = dRow("Serie").ToString
-                            Dim FechaCaducidad As DateTime = dRow("FechaCaducidad").ToString.ToDateTime
+                If CveMovimientoSalida > 0 Then

-                            If Not ObjInventario.AddMovimientoDetalle(CveMovimientoEntrada, Cantidad, CveUM, CvePS, PU, CveVentaDetalle:=CveVentaDetalle, CveMovimientoDetalleEntrada:=CveMovimientoDetalle, Lote:=Lote, Serie:=Serie, FechaCaducidad:=FechaCaducidad) Then
+                    Dim IndexMov1 As Integer = 0
+                    For Each GvRow As GridViewRow In GvMU.Rows
+
+                        Dim Cantidad As Decimal = GvRow.DataKey("Cantidad").ToDecimal
+                        Dim CantidadRegistro As Decimal = GvRow.FCTextBox("TxtUtilizado").Text.ToDecimal
+                        Dim CvePS As Integer = GvRow.DataKey("CvePS").ToEntero
+                        Dim CveUM As Integer = GvRow.DataKey("CveUM").ToEntero
+                        Dim PU As Decimal = GvRow.DataKey("PU").ToDecimal
+
+                        If CantidadRegistro > 0 Then
+                            Dim CveVentaDetalle As Integer = GvRow.DataKey("CveVentaDetalle").ToEntero   ' DtVentaDetalle.Rows(IndexMov1)("CveVentaDetalle").ToString.ToEntero
+                            Dim CveMovimientoDetalle As Integer = GvRow.DataKey("CveMovimientoDetalle").ToEntero
+
+                            Dim Serie As String = GvRow.DataKey("Serie")
+                            Dim Lote As String = GvRow.DataKey("Lote")
+                            Dim FechaCaducidad As DateTime = GvRow.DataKey("FechaCaducidad").ToDate
+                            If Not ObjInventario.AddMovimientoDetalle(CveMovimientoSalida, CantidadRegistro, CveUM, CvePS, PU, CveVentaDetalle:=CveVentaDetalle, CveMovimientoDetalleEntrada:=CveMovimientoDetalle, Lote:=Lote, Serie:=Serie, FechaCaducidad:=FechaCaducidad) Then
                                Alert("Error al agregar detalle de movimiento.", TipoMensaje.MsgAdvertencia)
                                ProcesoOK = False
                                Exit For
                            End If
-                            IndexMov2 = IndexMov2 + 1
-                        Next
-                        If ProcesoOK Then
-                            Dim ObjEventos As New ClsOIEventos(ObjInventario.IniciaTransacSQL)
-                            Dim LigaVenta As String = String.Format("Venta {2} en Folio: <a href=""/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}"" target=""_blank"">{1}</a>", CveMovimientoEntrada, Folio, "Material utilizado")
+                        End If
+                        IndexMov1 = IndexMov1 + 1
+                    Next

-                            If Not ObjEventos.AddEventoBitacora(LigaVenta, "-1", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveVenta:=Respuesta.CveVenta, CveOS:=CveOS) Then
+                    If ProcesoOK Then
+
+                        CveMovimientoEntrada = ObjInventario.AddMovimiento(CveAlmacenDestino, 9, CveMoneda, Fecha, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, Respuesta.CveVenta, CveSubProyectoPedido, -1, CveOS:=CveOS, CveMovimientoRelacionado:=CveMovimientoSalida, Modulo:="OS/MatUtil2")
+
+                        If ObjInventario.GetMovimientosDetalle(CveMovimientoSalida, UsuarioActual.CveEmpresa) AndAlso ObjInventario.DtResultados.Rows.Count > 0 Then
+                            ImporteAlmacen = ObjInventario.DtResultados.SUM("Total")
+                            Dim IndexMov2 As Integer = 0
+                            For Each dRow As DataRow In ObjInventario.DtResultados.Rows
+
+                                Dim Cantidad As Decimal = dRow("Cantidad").ToString.ToDecimal
+                                Dim CvePS As Integer = dRow("CvePS").ToString.ToEntero
+                                Dim CveUM As Integer = dRow("CveUM").ToString.ToEntero
+                                Dim PU As Decimal = dRow("PU").ToString.ToDecimal
+                                Dim CveVentaDetalle As Integer = dRow("CveVentaDetalle").ToString.ToEntero
+                                Dim CveMovimientoDetalle As Integer = dRow("CveMovimientoDetalle").ToString.ToEntero
+
+                                Dim Lote As String = dRow("Lote").ToString
+                                Dim Serie As String = dRow("Serie").ToString
+                                Dim FechaCaducidad As DateTime = dRow("FechaCaducidad").ToString.ToDateTime
+
+                                If Not ObjInventario.AddMovimientoDetalle(CveMovimientoEntrada, Cantidad, CveUM, CvePS, PU, CveVentaDetalle:=CveVentaDetalle, CveMovimientoDetalleEntrada:=CveMovimientoDetalle, Lote:=Lote, Serie:=Serie, FechaCaducidad:=FechaCaducidad) Then
+                                    Alert("Error al agregar detalle de movimiento.", TipoMensaje.MsgAdvertencia)
+                                    ProcesoOK = False
+                                    Exit For
+                                End If
+                                IndexMov2 = IndexMov2 + 1
+                            Next
+                            If ProcesoOK Then
+                                Dim ObjEventos As New ClsOIEventos(ObjInventario.IniciaTransacSQL)
+                                Dim LigaVenta As String = String.Format("Venta {2} en Folio: <a href=""/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}"" target=""_blank"">{1}</a>", CveMovimientoEntrada, Folio, "Material utilizado")
+
+                                If Not ObjEventos.AddEventoBitacora(LigaVenta, "-1", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveVenta:=Respuesta.CveVenta, CveOS:=CveOS) Then
+                                    ProcesoOK = False
+                                End If
+                            End If
+                        Else
+                            ProcesoOK = False
+                        End If
+                    End If
+                    If ProcesoOK Then
+                        If Not ObjOS.UpdateOrdenesServiciosFinaliza(CveOS, -1, -1, UsuarioActual.CveEmpresa) Then
+                            ProcesoOK = False
+                        End If
+                    End If
+                    If ProcesoOK Then
+                        Dim Contabilizable As Boolean = False
+                        Dim Concepto As String = "Material utilizado"
+                        Dim CvePrePoliza As Integer = ObjConta.AddPrePolizas("OS-MatUtil", 53, 0, 0, 1, Fecha, Concepto, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
+                        If CveMovimientoSalida > 0 Then
+                            If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, ImporteAlmacen, ImporteAlmacen, 68, "", Concepto, CveMovimientoAlmacen:=CveMovimientoSalida, Contabilizable:=Contabilizable) Then
                                ProcesoOK = False
                            End If
                        End If
-                    Else
-                        ProcesoOK = False
-                    End If
-                End If
-                If ProcesoOK Then
-                    If Not ClsOS.UpdateOrdenesServiciosFinaliza(CveOS, -1, -1, UsuarioActual.CveEmpresa) Then
-                        ProcesoOK = False
-                    End If
-                End If
-                If ProcesoOK Then
-                    Dim Contabilizable As Boolean = False
-                    Dim Concepto As String = "Material utilizado"
-                    Dim CvePrePoliza As Integer = ObjConta.AddPrePolizas("OS-MatUtil", 53, 0, 0, 1, Fecha, Concepto, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
-                    If CveMovimientoSalida > 0 Then
-                        If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, ImporteAlmacen, ImporteAlmacen, 68, "", Concepto, CveMovimientoAlmacen:=CveMovimientoSalida, Contabilizable:=Contabilizable) Then
-                            ProcesoOK = False
+                        If CveMovimientoEntrada > 0 Then
+                            If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, False, ImporteAlmacen, ImporteAlmacen, 68, "", Concepto, CveMovimientoAlmacen:=CveMovimientoEntrada, Contabilizable:=Contabilizable) Then
+                                ProcesoOK = False
+                            End If
                        End If
-                    End If
-                    If CveMovimientoEntrada > 0 Then
-                        If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, False, ImporteAlmacen, ImporteAlmacen, 68, "", Concepto, CveMovimientoAlmacen:=CveMovimientoEntrada, Contabilizable:=Contabilizable) Then
-                            ProcesoOK = False
-                        End If
-                    End If

+                    End If
+                Else
+                    ProcesoOK = False
                End If
-            Else
-                ProcesoOK = False
            End If
        End If


+
+
        If ProcesoOK Then
+
            ObjV.Commit()

-            If GenrarRemisionMovimientos = False Then
-                Alert("El material sera recibido en almacén.")
+            If DdlTipoVenta.SelectedValue.ToEntero = 5 Then
+                Dim Liga As String = $" document.location.href=""/OS/OrdenesServicios.aspx?CveOS={CveOS}""; "
+                Alert("El material utilizado se guardó correctamente", TipoMensaje.MsgInformacion, Liga)
            Else
-                Alert("El material utilizado se guardó correctamente")
+                If GenrarRemisionMovimientos = False Then
+                    Alert("El material sera recibido en almacén.")
+                Else
+                    Alert("El material utilizado se guardó correctamente")
+                End If
            End If

            RegistraScript("$('#DivModalMaterialUtilizado').modal('hide');")
        Else
            ObjV.RollBack()
-            Alert("El material utilizado no se guardó correctamente", TipoMensaje.MsgAdvertencia)
+            Alert("Se presento un error al guardar el material", TipoMensaje.MsgAdvertencia)
        End If

        ObjV.Dispose()
@@ -3194,6 +3275,9 @@ Partial Class OS_OrdenesServicios
            ObjFactura.CveMedico = DdlMedico.SelectedValue.ToEntero
            ObjFactura.CveProcedimiento = DdlProcedimiento.SelectedValue.ToEntero
            ObjFactura.CveTipoVenta = DdlTipoVenta.SelectedValue.ToEntero
+            ObjFactura.FechaParaSurtir = TxtFechaCita.Text.ToDateTime
+            ObjFactura.CveClienteSucursal = DdlSucursalCliente.SelectedValue.ToEntero
+            ObjFactura.CveVentaRelacion = CveVentaPedido

            For Each GvRow As GridViewRow In GvMU.Rows

--- a/RH/CalculoSBC.aspx
+++ b/RH/CalculoSBC.aspx
@@ -31,6 +31,9 @@
            <li>
                <asp:LinkButton ID="LnkModalCargaMasiva" OnClick="LnkModalCargaMasiva_Click" runat="server"><i class="fa fa-save"></i> Carga masiva</asp:LinkButton>
            </li>
+            <li>
+                <asp:LinkButton ID="lnksalariomenoralminimo" OnClick="lnksalariomenoralminimo_Click" runat="server"><i class="fa fa-save"></i> Salario menor al mínimo</asp:LinkButton>
+            </li>
            <li>
                <asp:LinkButton ID="LnkGuardarCambios" OnClick="LnkGuardarCambios_Click" runat="server"><i class="fa fa-save"></i> Guardar</asp:LinkButton>
            </li>
@@ -946,7 +949,48 @@
        </asp:UpdatePanel>
    </div>

+    
+    <div id="DmodalSalariomenoralminimo" class="modal ADS fade" role="dialog">
+        <asp:UpdatePanel ID="UpdatePanel1" class="modal-dialog" tabindex="-1" runat="server" UpdateMode="Conditional">
+            <ContentTemplate>
+                <div class="modal-content rowpadding">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title" runat="server" style="text-align: left">Actualización de salarios mínimos </h4>
+                    </div>
+                    <div class="modal-body">

+                        <div class="portlet light smmallpadding bordered">
+                            <div class="portlet-title">
+                                <div class="caption font-green">
+                                    <i class="fa fa-upload font-green"></i>
+                                    <span class="caption-subject bold uppercase">Actualización de salarios mínimos </span>
+                                    <!-- Caudillo-->
+                                </div>
+                                <div class="tools">
+                                    <a href="javascript:;" class="collapse" data-original-title="" title=""></a>
+                                </div>
+                                <div class="actions">
+                                    <div class="btn-group">
+                                    </div>
+                                     
+                                </div>
+                            </div>
+                            <div class="portlet-body rowpadding "> 
+                                
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="modal-footer"> 
+                    </div>
+                </div>
+            </ContentTemplate> 
+        </asp:UpdatePanel>
+    </div>

 </asp:Content>
 <asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
--- a/RH/CalculoSBC.aspx.cs
+++ b/RH/CalculoSBC.aspx.cs
@@ -952,6 +952,11 @@ public partial class RH_CalculoSBC : ClsPaginas
        }

    }
+
+    protected void lnksalariomenoralminimo_Click(object sender, EventArgs e)
+    {
+
+    }
 }
 public class archivosD
 {
--- a/RH/Personal.aspx
+++ b/RH/Personal.aspx
@@ -118,6 +118,9 @@
            <li>
                <asp:LinkButton ID="LnkModsalario" OnClick="LnkModsalario_Click" runat="server"><i class="fa fa-pencil"></i> Modificar salario </asp:LinkButton>
            </li>
+            <li>
+                <asp:LinkButton ID="LnkModsalarioIMSS" OnClick="LnkModsalarioIMSS_Click" runat="server"><i class="fa fa-pencil"></i> Modificar salario IMSS</asp:LinkButton>
+            </li>

            <li>
                <asp:LinkButton ID="LnkContratoAgropecuaria" OnClick="LnkContratoAgropecuaria_Click" runat="server"><i class="fa fa-list-alt"></i> Contrato </asp:LinkButton>
@@ -5713,6 +5716,60 @@
        </asp:UpdatePanel>
    </div>

+    
+
+    <div id="DmodamodificarsalarioIMSS" class="modal ADS fade" role="dialog">
+        <asp:UpdatePanel ID="UpModSalarioIMSS" class="modal-dialog" tabindex="-1" runat="server" UpdateMode="Conditional">
+            <ContentTemplate>
+                <div class="modal-content rowpadding">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title" runat="server" style="text-align: left">Modificar salario</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div>
+                            <div style="width: 200px; display: inline-block;">
+                                <div class="form-group form-md-line-input">
+                                    <asp:TextBox ID="TxtFechamodIMSSSalario" CssClass="form-control" runat="server"></asp:TextBox>
+                                    <asp:Label runat="server" AssociatedControlID="TxtFechamodIMSSSalario">Fecha:</asp:Label>
+                                    <ajax:MaskedEditExtender ID="MEETxtFechamodIMSSS" runat="server" TargetControlID="TxtFechamodIMSSSalario" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
+                                    <ajax:CalendarExtender runat="server" ID="CEETxtFechamodIMSSS" TargetControlID="TxtFechamodIMSSSalario" PopupButtonID="LnkFechaModImssSalario" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                    <asp:RequiredFieldValidator ID="RFVTxtFechamodIMSSS" runat="server" ControlToValidate="TxtFechamodIMSSSalario" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''FechaNacimiento''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardarModSalarioIMSS"></asp:RequiredFieldValidator>
+                                    <asp:CompareValidator ID="CVTxtFechamodIMSSS" runat="server" ControlToValidate="TxtFechamodIMSSSalario" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''FechaNacimiento''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpGuardarModSalarioIMSS"></asp:CompareValidator>
+
+                                </div>
+                            </div>
+                            <div style="width: 80px; display: inline-block;">
+                                <span class="input-group-btn ">
+                                    <asp:LinkButton ID="LnkFechaModImssSalario" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
+                                </span>
+                            </div>
+
+                        </div>
+
+
+                        <div class="form-group form-md-line-input">
+                            <asp:TextBox ID="TxtMImssSalarioDiarioImSS"  CssClass="form-control" runat="server"></asp:TextBox>
+                            <asp:Label runat="server" AssociatedControlID="TxtMImssSalarioDiarioImSS">Salario diario(IMSS):</asp:Label>
+                        </div>
+                        <div class="form-group form-md-line-input">
+                            <asp:TextBox ID="TxtMImssSDI"  CssClass="form-control" runat="server"></asp:TextBox>
+                            <asp:Label runat="server"  AssociatedControlID="TxtMImssSDI">Salario Diario Integrado(SDI):</asp:Label>
+                        </div>
+
+                    </div>
+
+                    <div class="modal-footer">
+                                <asp:LinkButton ID="LnkModificarSalarioIMSSGuardar" OnClick="LnkModificarSalarioIMSSGuardar_Click" ValidationGroup="GrpGuardarModSalarioIMSS" CssClass="btn btn-primary" runat="server">Guardar</asp:LinkButton>
+                                <button type="button" class="btn btn-danger" data-dismiss="modal">Cancelar</button>
+                          
+                    </div>
+                </div>
+            </ContentTemplate>
+        </asp:UpdatePanel>
+    </div>


    <div id="DVDescargaDocumentoParametrosModal" class="modal ADS fade" role="dialog">
--- a/RH/Personal.aspx.vb
+++ b/RH/Personal.aspx.vb
@@ -1142,11 +1142,11 @@ Partial Class RH_Personal
            tdCliente2.Visible = True
            GVAsistencia.Columns(1).Visible = True
        End If
-
-        If UsuarioActual.TienePermisoProceso(372) Then
-            TxtSalarioDiarioImSS.Enabled = True
-            TxtSalarioDiarioIntegrado.Enabled = True
-        End If
+        'no sedeben habilitar ya que solo son informativos
+        'If UsuarioActual.TienePermisoProceso(372) Then
+        '    TxtSalarioDiarioImSS.Enabled = True
+        '    TxtSalarioDiarioIntegrado.Enabled = True
+        'End If

    End Sub
    Private Sub SetPermisos()
@@ -6961,7 +6961,7 @@ Partial Class RH_Personal
        Dim DiasVacaciones As Decimal = TxtFIDiasVacaciones.Text.ToDecimal()
        Dim diasaguinaldo As Decimal = TxtFIAguinaldo.Text.ToDecimal()
        Dim FI As Decimal = (365D + diasaguinaldo + (DiasVacaciones * (primav / 100D))) / 365D
-        Dim SDI As Decimal = (SD * FI)
+        Dim SDI As Decimal = Math.Round((SD * FI), 2)
        TxtFactordeIntegracion.Text = FI.ToString()
        TxtFISalarioDiarioIntegrado.Text = String.Format("{0:###0.########}", SDI)
        UpFactordeintegracion.Update()
@@ -7040,6 +7040,39 @@ Partial Class RH_Personal
        UpModSalario.Update()
    End Sub

+    Protected Sub LnkModificarSalarioIMSSGuardar_Click(sender As Object, e As EventArgs)
+
+        Using ObjPersonal As ClsRH = New ClsRH()
+            ObjPersonal.IniciaTransacSQL()
+            If ObjPersonal.UpdateSalarios(CvePersonal, TxtFechamodIMSSSalario.Text.ToDate().ToString("yyyy/MM/dd"), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa,
+                                          TxtSalarioDiario.Text.ToDecimal(), TxtMImssSDI.Text.ToDecimal(), TxtMImssSalarioDiarioImSS.Text.ToDecimal(), -1) Then
+
+
+                ObjPersonal.Commit()
+
+                RegistraScript("$('#DmodamodificarsalarioIMSS').modal('hide')")
+                TxtSalarioCotizado.Text = TxtMImssSalarioDiarioImSS.Text
+                TxtSDI.Text = TxtMImssSDI.Text
+                Dim sdi As Decimal = TxtSDI.Text.ToDecimal()
+                Dim sbc As Decimal = TxtMImssSalarioDiarioImSS.Text.ToDecimal()
+                salarioVariable = If(sbc > sdi, sbc - sdi, 0)
+                UpModSalario.Update()
+                UpDatos.Update()
+                Alert("Se ha actualizado el salario", TipoMensaje.ToastInformacion)
+            Else
+                ObjPersonal.RollBack()
+            End If
+        End Using
+
+    End Sub
+    Protected Sub LnkModsalarioIMSS_Click(sender As Object, e As EventArgs)
+        TxtFechamodIMSSSalario.Text = NowADS().ToString("dd/MM/yyyy")
+        TxtMImssSalarioDiarioImSS.Text = TxtSalarioCotizado.Text
+        TxtMImssSDI.Text = TxtSDI.Text
+        RegistraScript("$('#DmodamodificarsalarioIMSS').modal()")
+        UpModSalarioIMSS.Update()
+    End Sub
+
    Protected Sub UpdatePersonalAlta_Click(sender As Object, e As EventArgs)

    End Sub
@@ -8067,5 +8100,6 @@ Partial Class RH_Personal
        ddlSubTipoPeriodo.SelectedValueExist(CveSubTipoPeriodo.ToString())
        UpDatos.Update()
    End Sub
+
 End Class

--- a/Transportes/RepBoletos.aspx
+++ b/Transportes/RepBoletos.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="VB" Title="Transportes V&A - Boletos"  AutoEventWireup="false"
+<%@ Page Language="VB" Title="Transportes V&A - Boletos" AutoEventWireup="false"
    MasterPageFile="~/Site.master" CodeFile="RepBoletos.aspx.vb"
    Inherits="ListadoBoletos" EnableEventValidation="true" %>

@@ -32,7 +32,7 @@
        <asp:GridView ID="GvBoletos" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningún boleto registrado"
            CssClass="table table-striped table-hover Widthall ScrollAD mysmallbtn" GridLines="None"
            data-sort="true" DataKeyNames="Asiento,Nombre, Visa,Celular,Sexo,Estatus,Partida,Destino, Importe">
-          <Columns>
+            <Columns>

                <asp:TemplateField HeaderText="No. Asiento">
                    <ItemTemplate>
@@ -71,28 +71,28 @@
                    </ItemTemplate>
                </asp:TemplateField>

-              <asp:TemplateField HeaderText="Partida">
-                  <ItemTemplate>
-                      <asp:Literal ID="LtlPartida" runat="server" Text='<%# Eval("Partida") %>'></asp:Literal>
-                  </ItemTemplate>
-              </asp:TemplateField>
+                <asp:TemplateField HeaderText="Partida">
+                    <ItemTemplate>
+                        <asp:Literal ID="LtlPartida" runat="server" Text='<%# Eval("Partida") %>'></asp:Literal>
+                    </ItemTemplate>
+                </asp:TemplateField>

-              <asp:TemplateField HeaderText="Destino">
-                  <ItemTemplate>
-                      <asp:Literal ID="LtlDestino" runat="server" Text='<%# Eval("Destino") %>'></asp:Literal>
-                  </ItemTemplate>
-              </asp:TemplateField>
+                <asp:TemplateField HeaderText="Destino">
+                    <ItemTemplate>
+                        <asp:Literal ID="LtlDestino" runat="server" Text='<%# Eval("Destino") %>'></asp:Literal>
+                    </ItemTemplate>
+                </asp:TemplateField>

-              <asp:TemplateField HeaderText="Importe">
-                  <ItemTemplate>
-                      <asp:Literal ID="LtlImporte" runat="server" Text='<%# Eval("Importe") %>'></asp:Literal>
-                  </ItemTemplate>
-              </asp:TemplateField>
+                <asp:TemplateField HeaderText="Importe">
+                    <ItemTemplate>
+                        <asp:Literal ID="LtlImporte" runat="server" Text='<%# Eval("Importe", "{0:n}") %>'></asp:Literal>
+                    </ItemTemplate>
+                </asp:TemplateField>

                <asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Acciones">
                    <ItemTemplate>
                        <asp:LinkButton ID="BtnEditar" runat="server" AlternateText="Editar"
-                            CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" ToolTip="Editar"/>
+                            CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" ToolTip="Editar" />
                        <asp:LinkButton ID="BtnToggle" runat="server" AlternateText="Activar"
                            ToolTip="Activar" CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-cancel'></i>"
                            data-toggle="confirmation" data-popout="true" data-original-title='<%# If(Eval("Estatus").ToString = "True", "Cancelar Boleto", "Reactivar") %>'
--- a/Transportes/RepBoletos.aspx.vb
+++ b/Transportes/RepBoletos.aspx.vb
@@ -89,23 +89,22 @@ Partial Class ListadoBoletos
        Dim dtResult As New DataTable()
        Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow)

-        Dim params As New List(Of ReportParameter)
-
-        params.Add(New ReportParameter("Ruta", Ruta))
-        params.Add(New ReportParameter("Origen", GvRow.DataKey("Partida")))
-        params.Add(New ReportParameter("Destino", GvRow.DataKey("Destino")))
-        params.Add(New ReportParameter("FechaSalida", "2024-01-03"))
-        params.Add(New ReportParameter("HoraSalida", "17:00"))
-        params.Add(New ReportParameter("Nombre", GvRow.DataKey("Nombre")))
-        params.Add(New ReportParameter("Visa", GvRow.DataKey("Visa")))
-        params.Add(New ReportParameter("Celular", GvRow.DataKey("Celular")))
-        params.Add(New ReportParameter("Importe", GvRow.DataKey("Importe")))
-        params.Add(New ReportParameter("TipoBoleto", "Tipo Boleto"))
-        params.Add(New ReportParameter("Agencia", "Agencia"))
-        params.Add(New ReportParameter("TelefonoAgencia", "Telefono Agencia"))
-
-        ImprimirPDFStimul("Empresas/188/Formatos/Boleto.mrt", dtResult, params, NombreArchivo:="Boleto")
+        Dim params As New List(Of ReportParameter) From {
+            New ReportParameter("Ruta", Ruta),
+            New ReportParameter("Origen", GvRow.DataKey("Partida")),
+            New ReportParameter("Destino", GvRow.DataKey("Destino")),
+            New ReportParameter("FechaSalida", "2024-01-03"),
+            New ReportParameter("HoraSalida", "17:00"),
+            New ReportParameter("Nombre", GvRow.DataKey("Nombre")),
+            New ReportParameter("Visa", GvRow.DataKey("Visa")),
+            New ReportParameter("Celular", GvRow.DataKey("Celular")),
+            New ReportParameter("Importe", GvRow.DataKey("Importe")),
+            New ReportParameter("TipoBoleto", "Tipo Boleto"),
+            New ReportParameter("Agencia", "Agencia"),
+            New ReportParameter("TelefonoAgencia", "Telefono Agencia")
+        }

+        ImprimirPDFStimul($"{UsuarioActual.Empresa.Ruta}Formatos\Boleto.mrt", dtResult, params, NombreArchivo:="Boleto")
        'Empresas/Grales/Formatos/EntradaSalida.mrt
        'Empresas/188/Formatos/Boleto.mrt

--- a/Transportes/RepContratos.aspx
+++ b/Transportes/RepContratos.aspx
@@ -1,4 +1,5 @@
-<%@ Page Language="VB" AutoEventWireup="false" Title="Transportes V&A - Contratos" MasterPageFile="~/Site.master"
+<%@ Page Language="VB" AutoEventWireup="false" Title="Transportes V&A - Contratos"
+    MasterPageFile="~/Site.master"
    CodeFile="RepContratos.aspx.vb"
    Inherits="ListadoContratos" %>

@@ -38,7 +39,7 @@
            <li>
                <asp:LinkButton ID="LBAgregarContrato" runat="server"><i class='fa fa-plus'></i>Agregar Contrato</asp:LinkButton>
            </li>
-<%--            <li>
+            <%--            <li>
                <asp:HyperLink ID="LBListadoContratos" runat="server" NavigateUrl="RepContratos.aspx"
                    Target="_blank"><i class='fa fa-file'></i>Contratos</asp:HyperLink>
            </li>
@@ -46,7 +47,6 @@
                <asp:HyperLink ID="LBListadoViajes" runat="server" NavigateUrl="RepViajes.aspx"
                    Target="_blank"><i class='fa fa-road'></i>Viajes</asp:HyperLink>
            </li>--%>
-
        </ContentTemplate>
    </asp:UpdatePanel>
 </asp:Content>
@@ -85,6 +85,12 @@
                    </ItemTemplate>
                </asp:TemplateField>

+                <asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Cliente">
+                    <ItemTemplate>
+                        <asp:Literal ID="LtNombreComercial" runat="server" Text='<%# Eval("NombreComercial") %>'></asp:Literal>
+                    </ItemTemplate>
+                </asp:TemplateField>
+
                <asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Width="100px">
                    <HeaderTemplate>
                        Fecha<br />
@@ -119,158 +125,165 @@
            </Columns>
        </asp:GridView>

-        <div id="ModalAgregar" class="modal ADS fade" role="dialog">
-            <div class="modal-dialog">
-                <div id="UpAddChofer" class="modal-content rowpadding" tabindex="-1"
-                    runat="server">
-                    <contenttemplate>
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                <span aria-hidden="true">&times;</span>
-                            </button>
-                            <h4 class="modal-title" id="myModalLabel" runat="server">Agregar Contrato</h4>
+        <asp:UpdatePanel runat="server" ID="UpModal">
+            <ContentTemplate>
+                <div id="ModalAgregar" class="modal ADS fade" role="dialog">
+                    <div class="modal-dialog">
+                        <div id="UpAddChofer" class="modal-content rowpadding" tabindex="-1"
+                            runat="server">
+                            <contenttemplate>
+                                <div class="modal-header">
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                    <h4 class="modal-title" id="myModalLabel" runat="server">Agregar Contrato</h4>
+                                </div>
+                                <div class="modal-body">
+
+                                    <div class="portlet-body">
+                                        <div class="row my-1" id="TrCliente" runat="server">
+                                            <label class="col-md-4 bold">
+                                                <asp:Label ID="Label1" runat="server" Text="Cliente:"></asp:Label></label><div class="col-md-8">
+                                                    <ADS:Dropdownlost CssClassDdl="select2me" ID="DdlClientes" Width="100%" data-metodo="getcliente"
+                                                        runat="server" DataTextField="NombreComercial" DataValueField="CveCliente" CssStyle="width: 100%;"
+                                                        UsaWebService="true"></ADS:Dropdownlost>
+                                                </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Servicio:</label>
+                                            <div class="col-md-8">
+                                                <asp:TextBox ID="TxtDescripcion" runat="server" MaxLength="70" Width="100%"
+                                                    TextMode="MultiLine"></asp:TextBox>
+                                                <asp:RequiredFieldValidator ID="RFVDescripcion" runat="server" ControlToValidate="TxtDescripcion"
+                                                    Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripcion''</b> es necesario, por favor ingréselo."
+                                                    ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                <ajax:ValidatorCalloutExtender ID="VCEDescripcion" runat="server" HighlightCssClass="vco"
+                                                    TargetControlID="RFVDescripcion" Width="100%" BehaviorID="_content_VCEDescripcion">
+                                                </ajax:ValidatorCalloutExtender>
+                                            </div>
+                                        </div>
+
+                                        <div class="row">
+                                            <label class="col-md-4 bold">Lugar de Salida:</label>
+                                            <div class="col-md-8">
+                                                <asp:TextBox ID="TxtUbicacion" runat="server" MaxLength="70" Width="100%"></asp:TextBox>
+                                                <asp:RequiredFieldValidator ID="RFVUbicacion" runat="server" ControlToValidate="TxtUbicacion"
+                                                    Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Ubicación''</b> es necesario, por favor ingréselo."
+                                                    ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                <ajax:ValidatorCalloutExtender ID="VCEUbicacion" runat="server" HighlightCssClass="vco"
+                                                    TargetControlID="RFVUbicacion" Width="100%" BehaviorID="_content_VCEUbicacion">
+                                                </ajax:ValidatorCalloutExtender>
+                                            </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Fecha Salida:</label>
+                                            <div class="col-md-8">
+                                                <div class="input-group input-sm input-small date date-picker">
+                                                    <asp:TextBox ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="True"
+                                                        type="datetime-local"></asp:TextBox>
+
+                                                    <asp:RequiredFieldValidator ID="RFVTxtFechaSalida" runat="server" ControlToValidate="TxtFechaSalida"
+                                                        Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Salida''</b> es necesario, por favor ingréselo."
+                                                        ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                    <ajax:ValidatorCalloutExtender ID="VCETxtFechaSalida" runat="server" HighlightCssClass="vco"
+                                                        TargetControlID="RFVTxtFechaSalida" Width="100%" BehaviorID="_content_VCETxtFechaSalida">
+                                                    </ajax:ValidatorCalloutExtender>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Fecha Regreso:</label>
+                                            <div class="col-md-8">
+                                                <div class="input-group input-sm input-small date date-picker">
+                                                    <asp:TextBox ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="True"
+                                                        type="datetime-local"></asp:TextBox>
+
+                                                    <asp:RequiredFieldValidator ID="RFVTxtFechaRegreso" runat="server" ControlToValidate="TxtFechaRegreso"
+                                                        Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Regreso''</b> es necesario, por favor ingréselo."
+                                                        ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                    <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender1" runat="server" HighlightCssClass="vco"
+                                                        TargetControlID="RFVTxtFechaRegreso" Width="100%" BehaviorID="_content_VCETxtFechaRegreso">
+                                                    </ajax:ValidatorCalloutExtender>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row margin-bottom-5" id="TrAF" runat="server">
+                                            <label class="col-md-4 bold">
+                                                <asp:Label runat="server" Text="Tipo de Unidad:"></asp:Label></label><div
+                                                    class="col-md-8">
+
+                                                    <asp:DropDownList ID="DdlTransporte" AppendDataBoundItems="true" DataTextField="Descripcion"
+                                                        DataValueField="CveTipoActivoFijo" Class="table-group-action-input form-control input-inline text-center"
+                                                        Width="200px" runat="server">
+                                                    </asp:DropDownList>
+                                                    <asp:RequiredFieldValidator ID="RFVTransporte" runat="server" ControlToValidate="DdlTransporte"
+                                                        Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Transporte''</b> es necesario, por favor ingréselo."
+                                                        ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                    <ajax:ValidatorCalloutExtender ID="VCETransporte" runat="server" HighlightCssClass="vco"
+                                                        TargetControlID="RFVTransporte" Width="400px" BehaviorID="_content_VCETransporte">
+                                                    </ajax:ValidatorCalloutExtender>
+
+                                                </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Observaciones:</label>
+                                            <div class="col-md-8">
+                                                <asp:TextBox ID="TxtObservaciones" runat="server" MaxLength="70" Width="100%"
+                                                    TextMode="MultiLine"></asp:TextBox>
+                                                <asp:RequiredFieldValidator ID="RFVObservaciones" runat="server" ControlToValidate="TxtObservaciones"
+                                                    Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripcion''</b> es necesario, por favor ingréselo."
+                                                    ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                                <ajax:ValidatorCalloutExtender ID="VCEObservaciones" runat="server" HighlightCssClass="vco"
+                                                    TargetControlID="RFVObservaciones" Width="100%" BehaviorID="_content_VCEObservaciones">
+                                                </ajax:ValidatorCalloutExtender>
+                                            </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Costo dólares:</label>
+                                            <div class="col-md-8">
+                                                <asp:TextBox ID="TxtDolares" runat="server" type="number"></asp:TextBox>
+                                            </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Costo pesos:</label>
+                                            <div class="col-md-8">
+                                                <asp:TextBox ID="TxtPesos" runat="server" type="number"></asp:TextBox>
+                                            </div>
+                                        </div>
+
+                                        <div class="row my-1">
+                                            <label class="col-md-4 bold">Anticipo:</label>
+                                            <div class="col-md-8">
+                                                <asp:TextBox ID="TxtAnticipo" runat="server" type="number"></asp:TextBox>
+                                            </div>
+                                        </div>
+
+                                    </div>
+
+                                    <div class="modal-footer">
+                                        <asp:Button ID="BtnGuardar" OnClick="AddContrato" runat="server" CssClass="btn btn-primary"
+                                            Text="Guardar"
+                                            ValidationGroup="GrpGuardar"></asp:Button>
+                                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancelar</button>
+
+                                    </div>
+                                </div>
+                            </contenttemplate>
                        </div>
-                        <div class="modal-body">
-
-                            <div class="portlet-body">
-                                <div class="row my-1" id="TrCliente" runat="server">
-                                    <label class="col-md-4 bold">
-                                        <asp:Label ID="Label1" runat="server" Text="Cliente:"></asp:Label></label><div class="col-md-8">
-                                            <ADS:Dropdownlost CssClassDdl="select2me" ID="DdlClientes" Width="100%" data-metodo="getcliente"
-                                                runat="server" DataTextField="NombreComercial" DataValueField="CveCliente" CssStyle="width: 100%;"
-                                                UsaWebService="true"></ADS:Dropdownlost>
-                                        </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Servicio:</label>
-                                    <div class="col-md-8">
-                                        <asp:TextBox ID="TxtDescripcion" runat="server" MaxLength="70" Width="100%"
-                                            TextMode="MultiLine"></asp:TextBox>
-                                        <asp:RequiredFieldValidator ID="RFVDescripcion" runat="server" ControlToValidate="TxtDescripcion"
-                                            Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripcion''</b> es necesario, por favor ingréselo."
-                                            ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                        <ajax:ValidatorCalloutExtender ID="VCEDescripcion" runat="server" HighlightCssClass="vco"
-                                            TargetControlID="RFVDescripcion" Width="100%" BehaviorID="_content_VCEDescripcion">
-                                        </ajax:ValidatorCalloutExtender>
-                                    </div>
-                                </div>
-
-                                <div class="row">
-                                    <label class="col-md-4 bold">Lugar de Salida:</label>
-                                    <div class="col-md-8">
-                                        <asp:TextBox ID="TxtUbicacion" runat="server" MaxLength="70" Width="100%"></asp:TextBox>
-                                        <asp:RequiredFieldValidator ID="RFVUbicacion" runat="server" ControlToValidate="TxtUbicacion"
-                                            Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Ubicación''</b> es necesario, por favor ingréselo."
-                                            ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                        <ajax:ValidatorCalloutExtender ID="VCEUbicacion" runat="server" HighlightCssClass="vco"
-                                            TargetControlID="RFVUbicacion" Width="100%" BehaviorID="_content_VCEUbicacion">
-                                        </ajax:ValidatorCalloutExtender>
-                                    </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Fecha Salida:</label>
-                                    <div class="col-md-8">
-                                        <div class="input-group input-sm input-small date date-picker">
-                                            <asp:TextBox ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="True"
-                                                type="datetime-local"></asp:TextBox>
-
-                                            <asp:RequiredFieldValidator ID="RFVTxtFechaSalida" runat="server" ControlToValidate="TxtFechaSalida"
-                                                Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Salida''</b> es necesario, por favor ingréselo."
-                                                ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                            <ajax:ValidatorCalloutExtender ID="VCETxtFechaSalida" runat="server" HighlightCssClass="vco"
-                                                TargetControlID="RFVTxtFechaSalida" Width="100%" BehaviorID="_content_VCETxtFechaSalida">
-                                            </ajax:ValidatorCalloutExtender>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Fecha Regreso:</label>
-                                    <div class="col-md-8">
-                                        <div class="input-group input-sm input-small date date-picker">
-                                            <asp:TextBox ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="True"
-                                                type="datetime-local"></asp:TextBox>
-
-                                            <asp:RequiredFieldValidator ID="RFVTxtFechaRegreso" runat="server" ControlToValidate="TxtFechaRegreso"
-                                                Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Regreso''</b> es necesario, por favor ingréselo."
-                                                ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                            <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender1" runat="server" HighlightCssClass="vco"
-                                                TargetControlID="RFVTxtFechaRegreso" Width="100%" BehaviorID="_content_VCETxtFechaRegreso">
-                                            </ajax:ValidatorCalloutExtender>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="row margin-bottom-5" id="TrAF" runat="server">
-                                    <label class="col-md-4 bold">
-                                        <asp:Label runat="server" Text="Tipo de Unidad:"></asp:Label></label><div
-                                            class="col-md-8">
-
-                                            <asp:DropDownList ID="DdlTransporte" AppendDataBoundItems="true" DataTextField="Descripcion"
-                                                DataValueField="CveTipoActivoFijo" Class="table-group-action-input form-control input-inline text-center"
-                                                Width="200px" runat="server">
-                                            </asp:DropDownList>
-                                            <asp:RequiredFieldValidator ID="RFVTransporte" runat="server" ControlToValidate="DdlTransporte"
-                                                Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Transporte''</b> es necesario, por favor ingréselo."
-                                                ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                            <ajax:ValidatorCalloutExtender ID="VCETransporte" runat="server" HighlightCssClass="vco"
-                                                TargetControlID="RFVTransporte" Width="400px" BehaviorID="_content_VCETransporte">
-                                            </ajax:ValidatorCalloutExtender>
-
-                                        </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Observaciones:</label>
-                                    <div class="col-md-8">
-                                        <asp:TextBox ID="TxtObservaciones" runat="server" MaxLength="70" Width="100%"
-                                            TextMode="MultiLine"></asp:TextBox>
-                                        <asp:RequiredFieldValidator ID="RFVObservaciones" runat="server" ControlToValidate="TxtObservaciones"
-                                            Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripcion''</b> es necesario, por favor ingréselo."
-                                            ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                        <ajax:ValidatorCalloutExtender ID="VCEObservaciones" runat="server" HighlightCssClass="vco"
-                                            TargetControlID="RFVObservaciones" Width="100%" BehaviorID="_content_VCEObservaciones">
-                                        </ajax:ValidatorCalloutExtender>
-                                    </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Costo dólares:</label>
-                                    <div class="col-md-8">
-                                        <asp:TextBox ID="TxtDolares" runat="server" type="number"></asp:TextBox>
-                                    </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Costo pesos:</label>
-                                    <div class="col-md-8">
-                                        <asp:TextBox ID="TxtPesos" runat="server" type="number"></asp:TextBox>
-                                    </div>
-                                </div>
-
-                                <div class="row my-1">
-                                    <label class="col-md-4 bold">Anticipo:</label>
-                                    <div class="col-md-8">
-                                        <asp:TextBox ID="TxtAnticipo" runat="server" type="number"></asp:TextBox>
-                                    </div>
-                                </div>
-
-                            </div>
-
-                            <div class="modal-footer">
-                                <asp:Button ID="BtnGuardar" OnClick="AddContrato" runat="server" CssClass="btn btn-primary"
-                                    Text="Guardar"
-                                    ValidationGroup="GrpGuardar"></asp:Button>
-                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancelar</button>
-
-                            </div>
-                        </div>
-                    </contenttemplate>
+                    </div>
                </div>
-            </div>
-        </div>
+            </ContentTemplate>
+
+
+        </asp:UpdatePanel>
+

    </contenttemplate>
 </asp:Content>
--- a/Transportes/RepContratos.aspx.vb
+++ b/Transportes/RepContratos.aspx.vb
@@ -5,13 +5,20 @@ Imports Extensiones.ModExtensiones
 Partial Class ListadoContratos
    Inherits ClsPaginas

+    Private Property CveContrato As Integer
+        Get
+            Return ViewState("CveContrato").ToString().ToEntero
+        End Get
+        Set(value As Integer)
+            ViewState("CveContrato") = value
+        End Set
+    End Property
    Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
        If Not IsPostBack Then
            InicializaCombos()
            CargaDatos()
        End If
    End Sub
-
    Private Sub InicializaCombos()
        DdlClientes.setEsWebService(True)
        'Lista Activos Fijos'
@@ -25,7 +32,6 @@ Partial Class ListadoContratos
        DdlTransporte.DataBind()
        ObjAF.Dispose()
    End Sub
-
    Private Sub CargaDatos()
        Dim ObjContratos As New ClsContratos
        If ObjContratos.GetContratos(-1, UsuarioActual.CveEmpresa, TipoContrato:=2) Then
@@ -34,7 +40,6 @@ Partial Class ListadoContratos
        ObjContratos.Dispose()
        GvContratos.DataBind()
    End Sub
-
    Protected Sub MostrarModal()
        TxtDescripcion.Text = ""
        TxtFechaSalida.Text = ""
@@ -43,6 +48,8 @@ Partial Class ListadoContratos
        TxtUbicacion.Text = ""
        DdlTransporte.SelectedValue = ""
        BtnGuardar.Text = "Guardar"
+        myModalLabel.InnerHtml = "Agregar Contrato"
+
        RegistraScript(String.Format("$('#{0}').modal('show');", "ModalAgregar"))
    End Sub
    Private Sub LBAgregarContrato_Click(sender As Object, e As EventArgs) Handles LBAgregarContrato.Click
@@ -63,27 +70,39 @@ Partial Class ListadoContratos
            Dim CveEstatusInicial As Integer = 10
            Dim CveContratoHijo As Integer = -1
            Dim CveContratoTipo As Integer = 2
+            Dim retorno As Boolean = False

            If ObjContratos.GetContratosEstatus(UsuarioActual.CveEmpresa) Then
                CveEstatusInicial = ObjContratos.DtResultados.FiltroPrimeroValor("CveContratoEstatus", "TipoEstatus=1").ToEntero
            End If
-
-            CveContratoHijo = ObjContratos.AddContratos("", TxtDescripcion.Text, "", UsuarioActual.CveProveedor, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDate, TxtFechaRegreso.Text.ToDate, TxtUbicacion.Text, "", 10, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, -1, 0, CveContratoTipo:=2, CveContratosEstatus:=1, CveTipoAF:=DdlTransporte.SelectedValue.ToEntero)
-
+            'Agregar contrato
+            If BtnGuardar.Text = "Guardar" Then
+                CveContratoHijo = ObjContratos.AddContratos("", TxtDescripcion.Text, "", UsuarioActual.CveProveedor, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDate, TxtFechaRegreso.Text.ToDate, TxtUbicacion.Text, "", 10, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, -1, 0, CveContratoTipo:=2, CveContratosEstatus:=1, CveTipoAF:=DdlTransporte.SelectedValue.ToEntero)
+            End If

            If CveContratoHijo > 0 Then
                ObjContratos.Commit()
                Alert("Agregado Correctamente.")
-                TxtDescripcion.Text = ""
-                TxtFechaSalida.Text = ""
-                TxtFechaRegreso.Text = ""
-                TxtObservaciones.Text = ""
-                TxtUbicacion.Text = ""
-                DdlClientes.SelectedValue = ""
-                DdlTransporte.SelectedValue = ""
-
            End If

+            'Actualizar contrato
+            If BtnGuardar.Text = "Editar" Then
+                retorno = ObjContratos.UpdateContratos(CveContrato, "", TxtDescripcion.Text, "", -1, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDate, TxtFechaRegreso.Text.ToDate, TxtUbicacion.Text, "", 10, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, -1, -1, -1, -1, 0, CveContratoTipo:=2, CveContratosEstatus:=1)
+            End If
+
+            If retorno Then
+                ObjContratos.Commit()
+                Alert("Actualizado Correctamente.")
+            End If
+
+            TxtDescripcion.Text = ""
+            TxtFechaSalida.Text = ""
+            TxtFechaRegreso.Text = ""
+            TxtObservaciones.Text = ""
+            TxtUbicacion.Text = ""
+            DdlClientes.SelectedValue = ""
+            DdlTransporte.SelectedValue = ""
+            BtnGuardar.Text = "Guardar"
        Catch ex As Exception
            Alert($"Ocurrió un error {ex}", TipoMensaje.MsgError)
            ObjContratos.RollBack()
@@ -94,7 +113,6 @@ Partial Class ListadoContratos
        End Try

    End Sub
-
    Protected Sub UpdateContrato(sender As Object, e As EventArgs)

        Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow)
@@ -102,7 +120,11 @@ Partial Class ListadoContratos
        Dim fechaInicial As DateTime
        Dim fechaFinal As DateTime

+        CveContrato = GvRow.DataKey("CveContrato").ToEntero
        DdlClientes.SelectedValue = GvRow.DataKey("CveCliente")
+        If GvRow.DataKey("CveCliente").ToEntero > 0 Then
+            DdlClientes.SelectedText = GlobalDTCliente(UsuarioActual.CveEmpresa, CveCliente:=GvRow.DataKey("CveCliente").ToEntero).FiltroPrimeroValor("NombreComercial")
+        End If
        TxtDescripcion.Text = GvRow.DataKey("DescripcionContrato")
        TxtObservaciones.Text = GvRow.DataKey("DescripcionContrato")
        TxtUbicacion.Text = GvRow.DataKey("Ubicacion")
@@ -112,12 +134,10 @@ Partial Class ListadoContratos
            TxtFechaRegreso.Text = fechaFinal.ToString("yyyy-MM-dd HH:mm:ss").Replace(" ", "T")
        End If

-
        BtnGuardar.Text = "Editar"
-
+        myModalLabel.InnerHtml = "Editar Contrato"
        RegistraScript(String.Format("$('#{0}').modal('show');", "ModalAgregar"))
    End Sub
-
    Protected Sub RemoveContrato(sender As Object, e As EventArgs)
        Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow)
        Dim ObjContratos As New ClsContratos
--- a/Ventas/CatProcedimientoDetalle.aspx
+++ b/Ventas/CatProcedimientoDetalle.aspx
@@ -54,7 +54,7 @@
                                            <div class="portlet-body">                                               

                                                <div class="form-group form-md-line-input input-iconright">
-                                                    <asp:TextBox ID="TxtProcedimiento" CssClass="form-control" runat="server" MaxLength="50"></asp:TextBox>
+                                                    <asp:TextBox ID="TxtProcedimiento" CssClass="form-control" runat="server" MaxLength="150"></asp:TextBox>
                                                    <asp:RequiredFieldValidator ID="RFVRol" runat="server" ControlToValidate="TxtProcedimiento" Display="None" 
                                                        ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>'Nombre del Procedimiento''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>                                                    
                                                    <label for="<%= TxtProcedimiento.ClientID.ToString()%>">Nombre Procedimiento:</label>
--- a/Ventas/ClientesAbonar.aspx.vb
+++ b/Ventas/ClientesAbonar.aspx.vb
@@ -236,7 +236,7 @@ Partial Class Ventas_ClientesAbonar
                LnkAccionesModalSeleccionLayout.Visible = True
            End If

-            If UsuarioActual.CveEmpresa.Contiene(13, 1) Then
+            If UsuarioActual.CveEmpresa.Contiene(13, 1, 15) Then
                DVImporteDeduccionesPago.Visible = True
            End If

--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -589,7 +589,7 @@
                                    <b>Requiere Técnico:</b>
                                </td>
                                <td runat="server" id="TdRequiereTecnico2" visible="true">
-                                    <asp:CheckBox ID="ChkRequiereTecnico" runat="server" CssClass="chksino" OnCheckedChanged="ChkRequiereTecnico_CheckedChanged" AutoPostBack="true" Text="Requiere Técnico:" />
+                                    <asp:CheckBox ID="ChkRequiereTecnico" runat="server" CssClass="chksino" OnCheckedChanged="ChkRequiereTecnico_CheckedChanged" AutoPostBack="true" Text="Requiere Técnico:" Checked="false" />
                                </td>
                                <td runat="server" id="TdFechaOS1" visible="true">
                                    <b>Fecha de Cirugia:</b>
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -3438,7 +3438,7 @@ Partial Class Ventas
                End If
            End If

-            If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+            If UsuarioActual.Empresa.Funcionalidad(578) = "1" Then
                If CveVenta <= 0 Then
                    EsVentaMedica = True
                    CargaTiposVenta()
@@ -11628,6 +11628,7 @@ Partial Class Ventas
        If UsuarioActual.Empresa.Funcionalidad(578) = "1" AndAlso DvModalRequiereOSFecha.Visible Then
            ObjFactura.Alfa1 = TxtFechaOS.Text.Trim
            ObjFactura.FechaEjecucion = TxtFechaOS.Text.Trim.ToDateTime
+            ObjFactura.FechaParaSurtir = TxtFechaOS.Text.Trim.ToDateTime
        Else
            ObjFactura.Alfa1 = TxtAlfa1.Text.Trim
        End If
@@ -13264,7 +13265,7 @@ Partial Class Ventas
        Dim CveProcedimiento As Integer = -1
        Dim CveTipoVentaGuardar As Integer = -1

-        If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+        If UsuarioActual.Empresa.Funcionalidad(578) = "1" Then
            CveMedico = DdlMedico.SelectedValue.ToEntero
            CveProcedimiento = DdlProcedimiento.SelectedValue.ToEntero
            CveTipoVentaGuardar = If(SeEstaFActurandoVentaMedica, CveTipoVenta, RBLTipoVenta.SelectedValue.ToEntero)
@@ -13288,7 +13289,7 @@ Partial Class Ventas
                           Kilometraje:=TxtKilometraje.Text.ToDouble, EsAmortizacion:=EsNCAmortizacion, CveTipoRetencion:=factura.CveTipoRetencion, CorreoNotificacion:=TxtCorreoNotificaciones.Text,
                           FormaPaqueteria:=RblPaqueteria.SelectedValue.ToEntero, FacturarSucursal:=factura.FacturarSucursal, VentaDesglosaIEPS:=factura.VentaDesglosaIEPS, RFCReceptor:=RFCReceptor, Adjunto:=Adjunto, DevolucionImportePagado:=factura.DevolucionImportePagado, EsGarantia:=factura.EsGarantia, ServicioDomicilio:=TrServicioDomicilio.Visible,
                           CveLineaAdicional:=DdlLineaAdicional.SelectedValue.ToEntero(), DescripcionVenta:=DescripcionVenta,
-                           CveMedico:=CveMedico, CveProcedimiento:=CveProcedimiento, CveTipoVenta:=CveTipoVentaGuardar, RequiereOS:=ChkRequiereTecnico.Checked) Then
+                           CveMedico:=CveMedico, CveProcedimiento:=CveProcedimiento, CveTipoVenta:=CveTipoVentaGuardar, RequiereOS:=ChkRequiereTecnico.Checked, FechaParaSurtir:=factura.FechaParaSurtir) Then
            ErrorList.Add("Ocurrió un error al Generar la Venta.<br />Revise su factura y cualquier detalle comuníquese a Soporte Técnico")
        Else
            If factura.TipoDocto.Contiene("Dev", "Egs") OrElse DtVentasNC IsNot Nothing OrElse CveEstatusRefacturacion > 0 OrElse CveAnticipoPadre > 0 Then
@@ -16367,7 +16368,6 @@ Partial Class Ventas
    End Function
 #End Region

-
 #Region "  BTN ELIMINAR   "
    Protected Sub BtnEmitir_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles BtnEmitir.Click

@@ -16643,8 +16643,6 @@ Partial Class Ventas
    End Sub
 #End Region

-
-
 #Region "  VISTA PREVIA  "
    Protected Sub BtnVistaPrevia_Click(sender As Object, e As System.EventArgs) Handles BtnVistaPrevia.Click
        VistaPreviaNew()
@@ -16653,195 +16651,6 @@ Partial Class Ventas
 #End Region

 #Region "I M A G E - B U T T O N S"
-    'Protected Function CancelarFactura(ByRef ObjVentas As ClsVentas, ByRef ObjConta As ClsContabilidad, ByRef ObjAC As ClsContPAQi, ByRef ObjBancos As ClsBancos) As Boolean
-    '    Dim IDPoliza As Integer = -1
-    '    Dim CvePrePoliza As Integer
-    '    Dim CvePlantillaPoliza As Integer
-
-    '    Dim ErrorCancelar As Boolean = False
-    '    Dim Mensaje As String = ""
-
-    '    Try
-    '        ObjFacturaDevolucion.TipoDocto = ObjFactura.TipoDocto
-
-    '        Dim TipoContable As Integer = -1
-    '        If ObjFacturaDevolucion.TipoDocto.Contiene("Egs", "Dev") Then
-    '            CvePlantillaPoliza = 7
-    '        ElseIf ObjFacturaDevolucion.TipoDocto.Contiene("Ing", "Rem", "Ant") Then
-    '            CvePlantillaPoliza = 4
-    '        End If
-
-    '        If UsuarioActual.Empresa.Funcionalidad(706) = "1" AndAlso  Then
-
-    '        End If
-
-
-    '        CvePrePoliza = ObjConta.AddPrePolizas("Ventas/GuardaEstatus", CvePlantillaPoliza, TxtTotal.Text.ToDouble, TxtTotal.Text.Replace(",", "").ToDouble, DdlMoneda.SelectedValue.ToEntero(), NowADS(), NombreCliente, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
-    '        ObjFacturaDevolucion.CveVenta = CveVenta
-    '        ObjFacturaDevolucion.CvePrePoliza = CvePrePoliza
-
-
-    '        If NuevaFactura = 1 AndAlso UsuarioActual.TienePermisoProceso(222) Then
-    '            If ObjVentas.GetVentaDetalle(ObjFacturaDevolucion.CveVenta) Then
-    '                TmpDT = ObjVentas.DtResultados
-    '                TmpDT.Columns.Add("CveVentaDetalleRNC", GetType(Integer))
-    '                TmpDT.Columns.Add("TieneProntoPago", GetType(String))
-    '                TmpDT.Columns.Add("ImporteProntoPago", GetType(Decimal))
-    '            End If
-    '            ErrorCancelar = ProcesoPrepolizas(ObjConta, ObjFacturaDevolucion, -1, TmpDT, ObjAC, -1, ObjBancos, ObjVentas)
-    '        Else
-    '            ErrorCancelar = ProcesoPrepolizas(ObjConta, ObjFacturaDevolucion, -1, TmpDT, ObjAC, -1, ObjBancos, ObjVentas)
-    '        End If
-
-    '        If Not ErrorCancelar Then
-    '            ErrorCancelar = GuardarVentaImpuestosLocales(ObjVentas, ObjConta, ObjFacturaDevolucion, -1)
-    '        End If
-
-    '        If CveEstatus = 4 Then
-
-    '            If ObjVentas.UpdateEstatusFactura(CveEstatus, FolioFiscal, "", NowADS(), CveVenta, IDPoliza) Then
-    '                Mensaje = "El nuevo estatus se guardó correctamente"
-    '            Else
-    '                ErrorCancelar = True
-    '            End If
-
-    '            'Si se está mandando a Cancelada SAT
-    '        ElseIf CveEstatus = 5 Then
-
-    '            Dim DT As DataTable = Nothing
-
-    '            If FolioFiscal = "" Then
-    '                Dim XmlDoc As New XmlDocument
-    '                XmlDoc.Load(Ruta & "XML\" & DdlTipoComprobante.SelectedValue & "\" & VentaFolio & ".xml")
-    '                ViewState("FolioFiscal") = XmlDoc.DocumentElement("cfdi:Complemento").FirstChild.Attributes("UUID").InnerText
-    '            End If
-
-    '            Dim ObjCancelacion As New Timbrado
-
-    '            Dim Total As Decimal = TxtTotal.Text.ToDecimal
-    '            Dim RFCReceptor As String = HdnRFCVenta.Value
-
-    '            If Not ObjVentas.UpdateEstatusFactura(13, FolioFiscal, "", NowADS(), CveVenta, IDPoliza) Then 'Marcamos la factura como refacturada, si no se cancelo en el SAT el estatus nos dejara cancelarla despues
-    '                ErrorCancelar = True
-    '            End If
-    '            Dim RespCancelacion = ObjCancelacion.CFDICancelar(UsuarioActual.Empresa, FolioFiscal, Total, RFCReceptor, UsuarioActual.Empresa.RFC)
-    '            If RespCancelacion.Verificado Then
-    '                'falta verificar traer el acuse y reenviarlo 
-
-    '                If UsuarioActual.Empresa.TipoContabilidad = 2 AndAlso UsuarioActual.Empresa.UsaAC Then
-    '                    Dim IDMPoliza As Modelos.RetornoPolizaConta = GenerarPolizaAC(ObjAC, ObjFacturaDevolucion, True)
-    '                    IDPoliza = IDMPoliza.IdPoliza
-    '                    If IDMPoliza.IdPoliza <= 0 Then
-    '                        Mensaje = "No se pudo generar la poliza"
-    '                        ErrorCancelar = True
-    '                    End If
-    '                End If
-
-    '                If Not ErrorCancelar Then
-    '                    If ObjVentas.UpdateEstatusFactura(CveEstatus, FolioFiscal, ObjCancelacion.CancelacionAcuse, NowADS(), CveVenta, IDPoliza, CvePAC:=UsuarioActual.Empresa.CvePAC) Then
-    '                        Mensaje = "El nuevo estatus se guardó correctamente"
-    '                    Else
-    '                        ErrorCancelar = True
-    '                    End If
-    '                End If
-    '            Else
-    '                ErrorCancelar = True
-    '            End If
-
-    '            ObjCancelacion = Nothing
-
-    '        End If
-    '    Catch ex As Exception
-    '        GuardaLog("CancelF." & ex.ToString())
-    '        ErrorCancelar = True
-    '    End Try
-
-    '    Return Not ErrorCancelar
-    'End Function
-    'Protected Function CancelarFactura2(ObjVentas As ClsVentas, ObjConta As ClsContabilidad, ObjAC As ClsContPAQi, ObjBancos As ClsBancos) As Boolean
-
-    '    Dim IDPoliza As Integer = -1
-    '    Dim CvePrePoliza As Integer
-    '    Dim CvePlantillaPoliza As Integer
-
-    '    Dim ErrorCancelar As Boolean = False
-    '    Dim Mensaje As String = ""
-
-    '    CreaObjetosVenta()
-
-    '    If ObjFactura.TipoDocto.Contiene("Egs", "Dev") Then
-    '        CvePlantillaPoliza = 7
-    '    ElseIf ObjFactura.TipoDocto.Contiene("Ing", "Rem") Then
-    '        CvePlantillaPoliza = 4
-    '    End If
-
-
-    '    CvePrePoliza = ObjConta.AddPrePolizas("Ventas/GuardaEstatus", CvePlantillaPoliza, TxtTotal.Text.ToDouble, TxtTotal.Text.Replace(",", "").ToDouble, DdlMoneda.SelectedValue.ToEntero(), NowADS(), NombreCliente, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
-    '    ObjFactura.CveVenta = CveVenta
-    '    ObjFactura.CvePrePoliza = CvePrePoliza
-
-    '    If HplSaldoAuxiliar.Text.ToDecimal > 0 Then
-    '        ErrorCancelar = ProcesoPrepolizas(ObjConta, ObjFactura, -1, TmpDT, ObjAC, -1, ObjBancos, ObjVentas)
-    '    End If
-
-    '    If Not ErrorCancelar Then
-    '        ErrorCancelar = GuardarVentaImpuestosLocales(ObjVentas, ObjConta, ObjFactura, -1)
-    '    End If
-
-    '    If CveEstatus = 4 Then
-
-    '        If ObjVentas.UpdateEstatusFactura(CveEstatus, FolioFiscal, "", NowADS(), CveVenta, IDPoliza) Then
-    '            Mensaje = "El nuevo estatus se guardó correctamente"
-    '        Else
-    '            ErrorCancelar = True
-    '        End If
-
-    '        'Si se está mandando a Cancelada SAT
-    '    ElseIf CveEstatus = 5 Then
-
-    '        Dim DT As DataTable = Nothing
-
-    '        If FolioFiscal = "" Then
-    '            Dim XmlDoc As New XmlDocument
-    '            XmlDoc.Load(Ruta & "XML\" & DdlTipoComprobante.SelectedValue & "\" & VentaFolio & ".xml")
-    '            ViewState("FolioFiscal") = XmlDoc.DocumentElement("cfdi:Complemento").FirstChild.Attributes("UUID").InnerText
-    '        End If
-
-    '        'Si es cancelar en el SAT:
-    '        Dim CFDi As New ClbNegBICFDv3_2.ClsNegEDI
-    '        Dim Respuesta As New ClbNegBICFDv3_2.ClsNegRespuesta
-    '        Respuesta = CFDi.CancelaCFdi(UsuarioActual.Empresa.BIUsuario, UsuarioActual.Empresa.BIContraseña, Ruta & "Certificados\" & UsuarioActual.Empresa.ArchivoPfx, UsuarioActual.Empresa.ContraseñaKey, UsuarioActual.Empresa.RFC, FolioFiscal, "http://208.43.160.178/srvCFDi/service1.asmx")
-
-    '        If Respuesta Is Nothing Then
-    '            'Alert("La factura no se pudo cancelar. <br />Posbiles causas:<br />&nbsp;&nbsp;- Los servicios del SAT están ocupados.<br />&nbsp;&nbsp;- El Folio Fiscal no ha quedado registrado.", TipoMensaje.MsgError)
-    '            Me.GuardaLog(CFDi.MsgError)
-    '            ErrorCancelar = True
-    '            Mensaje = "La factura no se pudo cancelar. <br />Posbiles causas:<br />&nbsp;&nbsp;- Los servicios del SAT están ocupados.<br />&nbsp;&nbsp;- El Folio Fiscal no ha quedado registrado."
-    '        ElseIf Respuesta.NoCertificadoSAT <> String.Empty Then
-
-    '            If UsuarioActual.Empresa.TipoContabilidad = 2 AndAlso UsuarioActual.Empresa.UsaAC Then
-    '                Dim IDMPoliza As Modelos.RetornoPolizaConta = GenerarPolizaAC(ObjAC, ObjFacturaDevolucion, True)
-    '                IDPoliza = IDMPoliza.IdPoliza
-    '                If IDMPoliza.IdPoliza <= 0 Then
-    '                    Mensaje = "No se pudo generar la poliza"
-    '                    ErrorCancelar = True
-    '                End If
-    '            End If
-
-    '            If Not ErrorCancelar Then
-    '                If ObjVentas.UpdateEstatusFactura(CveEstatus, FolioFiscal, Respuesta.NoCertificadoSAT, Respuesta.FechaTimbrado, CveVenta, IDPoliza) Then
-    '                    Mensaje = "El nuevo estatus se guardó correctamente"
-    '                Else
-    '                    ErrorCancelar = True
-    '                End If
-    '            End If
-    '        End If
-
-    '    End If
-
-    '    Return Not ErrorCancelar
-    'End Function
-
    Protected Sub ImgBtnAddC_Click(sender As Object, e As ImageClickEventArgs) Handles ImgBtnAddC.Click
        Dim Row As DataRow = Nothing
        Row = DTmpC.NewRow
@@ -21781,6 +21590,7 @@ Partial Class Ventas
        UPCondicionesPago.Update()
        If Me.PermiteCredito Then RBLPago.Enabled = True
        DdlVendedor.Enabled = True
+        DdlSucursalCliente.Enabled = True

        ModalidadEdicion = True

@@ -21869,6 +21679,7 @@ Partial Class Ventas
        Dim Moneda As Integer = DdlMoneda.SelectedValue.ToEntero()
        Dim TipoCambio As Decimal = TxtTipoCambio.Text.ToDecimal
        EditoRemision = True
+        CveClienteSucursal = DdlClienteSucursal.SelectedValue.ToEntero
        Try
            'CONVERTIR REMISION - TIPO MONEDA  -DOLARES A PESOS
            If DdlMoneda.SelectedValue.ToEntero() <> 2 AndAlso ChkConvertirDolares.Checked Then
@@ -31174,6 +30985,10 @@ Partial Class Ventas
                Exit Sub
            End If

+            If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+                AsignaMedicoProcedimientoFacturaRemisionesModal()
+            End If
+
            DdlMoneda.SelectedValue = GlobalDTMonedas.FiltroPrimeroValor("CveMoneda", $"Abreviatura = '{dtSeleccionadas.FiltroPrimeroValor("Abreviatura")}'")
            DdlMoneda.Enabled = False
            CambiaMoneda()
@@ -31444,6 +31259,9 @@ Partial Class Ventas

        RegistraScript("$('#DivRemisiones').modal('hide');", "DivRemisionesHide")
    End Sub
+
+
+
    Private Function VerificaRemisiones(ByRef dt As DataTable) As Boolean
        Dim Valido As Boolean = True
        If ChkRemProductos.Checked Then
@@ -36065,6 +35883,44 @@ Partial Class Ventas

    End Sub

+    Private Sub AsignaMedicoProcedimientoFacturaRemisionesModal()
+
+        Dim CveVentaConsultar As Integer = -1
+        If ChkRemProductos.Checked Then
+
+            For Each gvRow As GridViewRow In GvRemPS.Rows
+                If gvRow.FCCheckBox("Chk").Checked Then
+                    CveVentaConsultar = gvRow.DataKey("CveVenta").ToEntero
+                    Exit For
+                End If
+            Next
+
+        Else
+            For Each gvRow As GridViewRow In GvRem.Rows
+                If gvRow.FCCheckBox("Chk").Checked Then
+                    CveVentaConsultar = gvRow.DataKey("CveVenta").ToEntero
+                    Exit For
+                End If
+            Next
+        End If
+
+        If CveVentaConsultar > 0 Then
+            Dim objVenta As New ClsVentas
+            If objVenta.GetVenta(CveVentaConsultar, UsuarioActual.CveEmpresa) Then
+                Dim dRow As DataRow = objVenta.DtResultados.Rows(0)
+                DdlMedico.SelectedValueExist(dRow("CveMedico").ToString.ToEntero)
+                DdlProcedimiento.SelectedValueExist(dRow("CveProcedimiento").ToString.ToEntero)
+                SeEstaFActurandoVentaMedica = True
+                CveTipoVenta = dRow("CveTipoVenta").ToString.ToEntero
+                ChkRequiereTecnico_CheckedChanged(Nothing, Nothing)
+            End If
+            objVenta.Dispose()
+        End If
+
+        UpCliente.Update()
+
+
+    End Sub

 #Region "VENTAS MEDICAS"