From a2d11a8acc8f6c2b8f05db04ef4fc4625612e3e6 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Fri, 21 Feb 2020 19:17:26 -0700
Subject: [PATCH] validaciones en ventas

---
 Ventas/Ventas.aspx    | 8 +-------
 Ventas/Ventas.aspx.vb | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx
index 2ef2ff065..2533b3e46 100644
--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -5261,7 +5261,7 @@
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
-                        <h4 class="modal-title" id="myModalLabelVenta">Registrar Venta</h4>
+                        <h4 class="modal-title" id="myModalLabelVenta">Registrar Producto/Servicio</h4>
                     </div>
                     <div class="modal-body">
                         <div class="form-group form-md-line-input input-iconright">
@@ -5286,12 +5286,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <%--                                <div class="form-group form-md-line-input input-iconright">
-                                    <ADS:Dropdownlost runat="server" ID="DdlPSPyME" CssStyle="width: 50%;" CssClass="form-control input-sm DdlPS" CssClassDdl="select2me " IncluyeTodos="false" DataTextField="PSCodigo" DataValueField="CvePS" data-onresult="CargaExistenciaAlmacenes" />
-                                    <label for="<%= DdlPSPyME.ClientID.ToString()%>">
-                                        Productos / Servicio:
-                                                            <label>
-                                </div>--%>
                             </ContentTemplate>
                         </asp:UpdatePanel>
                         <br />
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 3097d4661..91fe33059 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -2447,7 +2447,7 @@ Partial Class Ventas
             End If
 
             'MOSTRAR LA OPCION DE AGREGAR PS EN BDH
-            If UsuarioActual.CveEmpresa = 140 Then
+            If UsuarioActual.CveEmpresa = 140 AndAlso CveVenta <= 0 Then
                 ImgOtrosConceptos.Visible = False
                 TrFormaEntrega.Visible = False
                 TabDetalleVentas.Visible = False
@@ -14037,7 +14037,7 @@ Partial Class Ventas
         Dim PromocionPorcentaje As Decimal = 0
         Dim CantMinima As Integer = 0
 
-        If DtPromociones.Rows.Count > 0 And DtPromociones IsNot Nothing Then
+        If DtPromociones IsNot Nothing AndAlso DtPromociones.Rows.Count > 0 Then
             Dim dr As DataRow = DtPromociones.FiltroPrimero($"CvePS = {CvePS}")
             If dr IsNot Nothing Then
                 TipoPromo = dr("TipoPromocion").ToString.ToEntero