From f8e4276021ca0c0832144154d8d4ab64da840f40 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Mon, 11 Nov 2024 14:34:59 -0700
Subject: [PATCH 1/4] -- activas dias de caducidad para E199

---
 Ventas/ProductosServicios.aspx.vb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ventas/ProductosServicios.aspx.vb b/Ventas/ProductosServicios.aspx.vb
index f6173c45f..bb6174d4e 100644
--- a/Ventas/ProductosServicios.aspx.vb
+++ b/Ventas/ProductosServicios.aspx.vb
@@ -3266,7 +3266,7 @@ Partial Class ProductosyServicios
         HabilitaAplicaCaducidadTiempo()
     End Sub
     Private Sub HabilitaAplicaCaducidadTiempo()
-        If UsuarioActual.CveEmpresa.Contiene(119, 158) Then
+        If UsuarioActual.CveEmpresa.Contiene(119, 158, 199) Then
             DivTiempoCaducidad.Visible = ChkCaducidad.Checked
             RfvTxtTiempoCaducidad.Enabled = ChkCaducidad.Checked
         End If

From e760029fd06ddfeab9b81798dcb64d090910b88d Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Mon, 11 Nov 2024 14:35:20 -0700
Subject: [PATCH 2/4] -- que sea cero el valor de enrada en almacen, de
 prestamo de proveedor

---
 Inventarios/EntradasSalidas.aspx.vb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Inventarios/EntradasSalidas.aspx.vb b/Inventarios/EntradasSalidas.aspx.vb
index 601203387..6dc4f95bb 100644
--- a/Inventarios/EntradasSalidas.aspx.vb
+++ b/Inventarios/EntradasSalidas.aspx.vb
@@ -2541,6 +2541,7 @@ Partial Class Inventarios_EntradasSalidas
         DivDepartamentoEntrega.Visible = False
         TxtDepartamentoEntrega.Text = ""
         TxtPedidoContrato.Text = ""
+        txtPrecio.Enabled = True
 
         Select Case CveConcepto
             Case "1", "2", "22", "32", "33" ' ENTRADAS
@@ -2588,6 +2589,7 @@ Partial Class Inventarios_EntradasSalidas
                 TrProveedor.Visible = True
                 DdlProveedor.DataSource = GlobalDTCompProveedores(UsuarioActual.CveEmpresa)
                 DdlProveedor.DataBind()
+                txtPrecio.Enabled = False
 
             Case Else
                 TrSubProyecto.Visible = False
@@ -5414,6 +5416,7 @@ Partial Class Inventarios_EntradasSalidas
         limpiarModalDetalle()
         UpAgregar.Update()
         RegistraScript("$('#ModalAgregar').modal()")
+        If DdlConcepto.SelectedValue = "28" Then txtPrecio.Text = "0.00" 'préstamo proveedor
     End Sub
 
     Private Sub ActualizarPS()

From ac673d7dcb512c060bba11d72913013d33ab8c67 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Mon, 11 Nov 2024 14:35:57 -0700
Subject: [PATCH 3/4] -- mejorar oc

---
 OC/OC.aspx    | 2 +-
 OC/OC.aspx.vb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OC/OC.aspx b/OC/OC.aspx
index b49e9bba0..91fc4cf73 100644
--- a/OC/OC.aspx
+++ b/OC/OC.aspx
@@ -2925,7 +2925,7 @@
         </div>
     </div>
 
-        <div id="DivmodalConmtrato" class="modal ADS fade">
+        <div id="DivmodalContrato" class="modal ADS fade" runat="server" >
         <div class="modal-dialog" style="width: 650px; min-width: 470px;">
             <asp:UpdatePanel ID="UpModalContrato" runat="server" class="modal-content rowpadding" tabindex="-1" UpdateMode="Conditional">
                 <ContentTemplate>
diff --git a/OC/OC.aspx.vb b/OC/OC.aspx.vb
index c44ec7f36..3e43ca635 100644
--- a/OC/OC.aspx.vb
+++ b/OC/OC.aspx.vb
@@ -724,6 +724,7 @@ Partial Class OC_OC
                 ConfiguraRetencionesProveedor()
             Else
                 LIContratos.Visible = VisualizaContrato
+                DivmodalContrato.Visible = VisualizaContrato
                 EsNuevo = True
                 InicializarValores()
                 HlAgregarExcel.Visible = True

From 63fe5db8e4c7493361d38acdaa233d392f81cf00 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Mon, 11 Nov 2024 16:26:22 -0700
Subject: [PATCH 4/4] -

---
 Transportes/RepContratoDetalle.aspx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Transportes/RepContratoDetalle.aspx b/Transportes/RepContratoDetalle.aspx
index 8e526529a..0ca5a6ff9 100644
--- a/Transportes/RepContratoDetalle.aspx
+++ b/Transportes/RepContratoDetalle.aspx
@@ -381,7 +381,7 @@
 
                                                                 <div class="row" runat="server" visible="false"  id="DVFactura">
                                                                     <label class="col-md-2">Factura: </label>
-                                                                    <div class="col-md-2">
+                                                                    <div class="col-md-3">
                                                                         <asp:HyperLink runat="server" Text=""  Target="_blank" id="HypRemision" CssClass="Texto"></asp:HyperLink>
                                                                     </div>
                                                                     <div class="col-md-4">