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

Compras/Compras.aspx

@@ -5103,7 +5103,7 @@
                                             <asp:RangeValidator ID="RVR" Display="Dynamic" ControlToValidate="TxtCant" runat="server" MinimumValue="0" Type="Double" ErrorMessage="Supera el total disponible"></asp:RangeValidator>
                                         </ItemTemplate>
                                     </asp:TemplateField>
-                                    <asp:BoundField DataField="Cantidad" HeaderText="Total" />
+                                    <asp:BoundField DataField="Cantidad" HeaderText="Total" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:#,##0.######}" />
                                     <asp:BoundField DataField="UM" HeaderText="UM" />
                                     <asp:BoundField DataField="CodigoPS" HeaderText="Producto" />
                                     <asp:BoundField DataField="Total" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Right" />

Compras/Compras.aspx.vb

@@ -14808,8 +14808,6 @@ Partial Class Compras_Compras
                     Vinculacion()
                 End If
 
-
-
             Else
                 LbSubTotalDif.Visible = True
                 LbSubTotalDif.Text = (SubTotalCompra - SubTotalGV).FormatoNumero
@@ -18396,7 +18394,9 @@ Partial Class Compras_Compras
 
 #Region "  DEVOLUCION DE ALMACEN - DEVOLUCION AL PROVEEDOR  "
     Private Sub InicializaDevolucionAlmacen()
-        If Not GvInv.Rows.Count > 0 Or LblCompraEstatus.Text = "CANCELADA" Then
+        Dim numpsalmacen As Integer = 1 'TmpDT.COUNT("CveTipoPS", "CveTipoPS = 2")
+
+        If LblCompraEstatus.Text = "CANCELADA" Or numpsalmacen = 0 Then 'Not GvInv.Rows.Count > 0
             Exit Sub
         End If
 
@@ -18421,7 +18421,7 @@ Partial Class Compras_Compras
     End Sub
 
     Protected Sub LBDevolucionAlmacen_Click(sender As Object, e As EventArgs)
-        GvSolDev.DataSource = TmpDT
+        GvSolDev.DataSource = TmpDT.FiltraParametros("CveTipoPS = 2")
         GvSolDev.DataBind()
         RegistraScript("$('#DivDevolucion').modal('show');", "DivDevolucion")
         UPPSolDev.Update()

Compras/eFacturas.aspx.vb

@@ -2852,7 +2852,7 @@ Partial Class Compras_eFacturas
 
     Protected Sub LnkSolicitarSat_Click(ByVal sender As Object, ByVal e As EventArgs)
 
-        Exit Sub
+
 
         Dim sbResultado As StringBuilder = New StringBuilder()
         Dim idSolicitudCFDI As Integer = 0