From 2f25614e40e681178d2f80aab5539d3582b4ce5a Mon Sep 17 00:00:00 2001
From: Rakcsle Supertramp <rakcsle@outlook.com>
Date: Fri, 6 Nov 2020 10:42:03 -0700
Subject: [PATCH] Contratos obras se  agrega CveCliente

---
 Contratos/ContratoObra.aspx    | 26 ++++++++++++++++++++++----
 Contratos/ContratoObra.aspx.vb | 27 ++++++++++++++++-----------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/Contratos/ContratoObra.aspx b/Contratos/ContratoObra.aspx
index d42a38359..4ee9ea4b0 100644
--- a/Contratos/ContratoObra.aspx
+++ b/Contratos/ContratoObra.aspx
@@ -326,20 +326,40 @@
                                                     <ajax:ValidatorCalloutExtender ID="VCEDescripcionContrato" runat="server" HighlightCssClass="vco" TargetControlID="RFVDescripcionContrato" Width="300px" BehaviorID="_content_VCEDescripcionContrato"></ajax:ValidatorCalloutExtender>
                                                 </div>
                                             </div>
+
                                             <div id="trLicitacion" runat="server" class="row">
                                                 <label class="col-md-2 truncate">Número Licitación:</label>
                                                 <div class="col-md-10">
                                                     <asp:TextBox ID="TxtNumeroLicitacion" runat="server" MaxLength="70" Width="200px"></asp:TextBox>
                                                 </div>
                                             </div>
+
                                             <div class="row" id="TrProveedor" runat="server">
                                                 <label class="col-md-2 truncate ">
-                                                    <asp:Label ID="LblProveedor" runat="server" Text="Proveedor:"></asp:Label></label><div class="col-md-10">
+                                                    <asp:Label ID="LblProveedor" runat="server" Text="Proveedor:"></asp:Label></label>
+                                                <div class="col-md-10">
                                                         <asp:DropDownList ID="DdlContratista" runat="server" CssClass="input-sm form-control select2me" AppendDataBoundItems="True" DataTextField="RazonSocial" DataValueField="CveProveedor" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 350px !important;" ValidationGroup="GrpGuardar">
                                                             <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
                                                     </div>
                                             </div>
+
+ 
+                                             <div class="row"  >
+                                                  <label class="col-md-2 truncate ">
+                                                    <asp:Label ID="LblCliente" runat="server" Text="Cliente:"></asp:Label></label>
+
+                                                   <div class="col-md-10">
+                                                  <asp:DropDownList ID="DdlCliente"   runat="server" AppendDataBoundItems="True" DataTextField="NombreComercial" DataValueField="CveCliente" Class="table-group-action-input form-control input-inline  input-sm select2me" Style="width: 350px !important;"  ValidationGroup="GrpGuardar">
+                                                            <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
+                                                        </asp:DropDownList>
+                                                       </div>
+
+
+                                             </div>
+                                           
+
+
                                             <div class="row" style="display: none;">
                                                 <label class="col-md-2 truncate ">Ubicacion:</label>
                                                 <div class="col-md-10">
@@ -460,9 +480,7 @@
                                             <div class="row" id="TrCliente" runat="server" visible="False">
                                                 <label class="col-md-2 truncate">
                                                     <asp:Label ID="Label1" runat="server" Text="Cliente:"></asp:Label></label><div class="col-md-10">
-                                                        <asp:DropDownList ID="DdlCliente" AutoPostBack="True" OnSelectedIndexChanged="DdlCliente_SelectedIndexChanged" runat="server" AppendDataBoundItems="True" DataTextField="NombreComercial" DataValueField="CveCliente" Class="table-group-action-input form-control input-inline  input-sm select2me" Width="75%" ValidationGroup="GrpGuardar">
-                                                            <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                        </asp:DropDownList>
+                                                        
                                                     </div>
                                             </div>
                                             <asp:UpdatePanel runat="server">
diff --git a/Contratos/ContratoObra.aspx.vb b/Contratos/ContratoObra.aspx.vb
index 1dccd7ef6..fe738afd7 100644
--- a/Contratos/ContratoObra.aspx.vb
+++ b/Contratos/ContratoObra.aspx.vb
@@ -362,12 +362,12 @@ Partial Class Contratos_ContratoObra
     Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
         If Not IsPostBack Then
             CargaValoresIniciales()
-            CreaDtTmpFianzas()
-
-            If Request("CveCliente") IsNot Nothing Then
-                cargaClientes()
-            End If
-
+            CreaDtTmpFianzas()
+
+
+            cargaClientes()
+
+
             If Request("CveContrato") IsNot Nothing AndAlso IsNumeric(Request("CveContrato")) AndAlso Request("CveContrato").ToEntero > 0 Then
                 ViewState("CveContrato") = Request("CveContrato")
 
@@ -474,6 +474,11 @@ Partial Class Contratos_ContratoObra
 
         End If
 
+
+        TabAvanveDocumento.Visible = False
+        TabContratosGastos.Visible = False
+        TabPed.Visible = False
+
     End Sub
 
 #Region "   CARGA VALORES INICIALES   "
@@ -545,13 +550,13 @@ Partial Class Contratos_ContratoObra
     End Sub
     Public Function isWithFamily() As Boolean
         Return UsuarioActual.CveEmpresa = 66
-    End Function
-    Private Sub cargaClientes()
-        TrCliente.Visible = True
-        TrProveedor.Visible = False
+    End Function
+
+    Private Sub cargaClientes()
         DdlCliente.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1)
         DdlCliente.DataBind()
     End Sub
+
     Private Sub CreaDT()
         TmpDT = New DataTable
         TmpDT.Columns.Add("CveContratoDetalle", GetType(Integer))
@@ -951,7 +956,7 @@ Partial Class Contratos_ContratoObra
                 ' TxtPorcentajeComision.Text = ObjContratos.PorcentajeComision.ToString
                 CveTipoContrato = ObjContratos.DtResultados.Rows(0)("CveContratoTipo").ToString.ToEntero
                 TxtCorreoNotificacion.Text = ObjContratos.DtResultados.Rows(0)("CorreoNotificacionPedDev").ToString
-
+                DdlCliente.SelectedValueExist(ObjContratos.DtResultados.Rows(0)("CveCliente").ToString)
 
                 If ObjContratos.CveProveedor > 0 Then
                     TrProveedor.Visible = True