From bd1523ab4b73b09aeedb7aa9062417ec8e794af5 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Fri, 19 Jun 2020 17:35:42 -0700
Subject: [PATCH] puntos 1 y 2

---
 General/PopUpPaqueteriasGuias.aspx   | 9 +++++----
 Inventarios/EntregasPorRealizar.aspx | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/General/PopUpPaqueteriasGuias.aspx b/General/PopUpPaqueteriasGuias.aspx
index 2a677b59d..05fb07060 100644
--- a/General/PopUpPaqueteriasGuias.aspx
+++ b/General/PopUpPaqueteriasGuias.aspx
@@ -114,10 +114,11 @@
                     <td>
                         <asp:DropDownList ID="DdlEstatus" runat="server" Class="table-group-action-input form-control input-inline input-sm select2me" Width="200px">
                             <%-- <asp:ListItem Selected="False" Text="Seleccione" Value="-1"></asp:ListItem>--%>
-                            <asp:ListItem Selected="True" Text="En Proceso" Value="1"></asp:ListItem>
-                            <asp:ListItem Selected="False" Text="Confirmado por Proveedor" Value="2"></asp:ListItem>
+                            <asp:ListItem Selected="True" Text="Pendiente" Value="1"></asp:ListItem>
+                            <asp:ListItem Selected="False" Text="En Proceso" Value="2"></asp:ListItem>
                             <asp:ListItem Selected="False" Text="Entregado" Value="3"></asp:ListItem>
-                            <asp:ListItem Selected="False" Text="Confirmado por Cliente" Value="4"></asp:ListItem>
+                            <asp:ListItem Selected="False" Text="Reasignar Nueva Entrega" Value="4"></asp:ListItem>
+                            <asp:ListItem Selected="False" Text="Directo a Clientes" Value="5"></asp:ListItem>
                         </asp:DropDownList>
                         <%-- <asp:RequiredFieldValidator ID="RFVDdlEstatus" runat="server" ControlToValidate="DdlEstatus" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Estatus''</b> es necesario." InitialValue="-1" ValidationGroup="GrpCrearGuia"></asp:RequiredFieldValidator>
                         <ajax:ValidatorCalloutExtender ID="VCEDdlEstatus" runat="server" HighlightCssClass="vco" TargetControlID="RFVDdlEstatus" Width="250px"></ajax:ValidatorCalloutExtender>--%>
@@ -200,7 +201,7 @@
 
                 </tr>
 
-                <tr runat="server" id="TrTipo" align="left" visible ="false">
+                <tr runat="server" id="TrTipo" align="left" visible="false">
                     <td class="text-right" align="left" valign="top" style="width: 140px; padding-top: 4px;"><b>Tipo:</b></td>
                     <td align="left" valign="top" style="width: 200px;">
                         <asp:DropDownList ID="DdlPaqueteriaGuiaTipo" runat="server" AppendDataBoundItems="true" DataTextField="PaqueteriaGuiaTipo" DataValueField="CvePaqueteriaGuiaTipo" Class="table-group-action-input form-control input-inline input-sm select2me" Width="200px"></asp:DropDownList>
diff --git a/Inventarios/EntregasPorRealizar.aspx b/Inventarios/EntregasPorRealizar.aspx
index 7c71eac19..c15583329 100644
--- a/Inventarios/EntregasPorRealizar.aspx
+++ b/Inventarios/EntregasPorRealizar.aspx
@@ -89,7 +89,7 @@
                                 </ItemTemplate>
 
                             </asp:TemplateField>
-                            <asp:BoundField HeaderText="Estatus" DataField="Estatus" HeaderStyle-Width="25px" ItemStyle-HorizontalAlign="Center" />
+                            <asp:BoundField HeaderText="Estatus" DataField="Estatus" HeaderStyle-Width="150px" ItemStyle-Width="150px" ItemStyle-HorizontalAlign="Left" />
                             <asp:TemplateField HeaderText="Fecha" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%" HeaderStyle-Width="10%">
                                 <ItemTemplate>
                                     &nbsp;<asp:Literal ID="LblFechaIng" runat="server" Text='<%# Eval("FechaIng", "{0:dd/MM/yyyy}") %>'></asp:Literal>