From 3745123a0122f882577b7fee4c193e3d0d2a44bd Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Tue, 20 Jul 2021 12:54:16 -0700
Subject: [PATCH 1/3] -- carga excel, ignora la comilla sencilla

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

diff --git a/Contratos/ContratoObra.aspx.vb b/Contratos/ContratoObra.aspx.vb
index acff7db4c..716e6cac0 100644
--- a/Contratos/ContratoObra.aspx.vb
+++ b/Contratos/ContratoObra.aspx.vb
@@ -3327,7 +3327,7 @@ Partial Class Contratos_ContratoObra
         Dim StrReturn As String = String.Empty
         Dim CvePS As Integer = 0
 
-        CvePS = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CvePS", Opt & " = '" & Valor & "'").ToString.ToEntero
+        CvePS = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CvePS", String.Format("{0}= '{1}'", Opt, Valor.Replace("'", ""))).ToString.ToEntero
 
         If CvePS > 0 Then
             StrReturn = "True|" & CvePS.ToString

From 495323bf2ec893c9d6607828d035d20312d637e4 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Tue, 20 Jul 2021 12:54:40 -0700
Subject: [PATCH 2/3] - columnas de %Neto e $ Neto

---
 Ventas/RepVentasUtilidad.aspx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Ventas/RepVentasUtilidad.aspx b/Ventas/RepVentasUtilidad.aspx
index 755ce2a34..ce157c38a 100644
--- a/Ventas/RepVentasUtilidad.aspx
+++ b/Ventas/RepVentasUtilidad.aspx
@@ -231,9 +231,9 @@
             <div id="dvCa" style="width: 100%; top: 40px">
                 <table id="dTable" class="correcto table  Widthall Titulos">
                     <tr>
-                        <td id="dvInv" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 42%; font-size: 14px;"><b>Venta</b></td>
-                        <td id="dvVen" runat="server" class="dataTables_scrollHead" style="text-align: center!important; font-size: 14px; border-right-color: white!important; border-left-color: white!important; width: 25%; border-style: solid;"><b>Costo</b></td>
-                        <td id="dvUt" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 42%; font-size: 14px;"><b>Utilidad/Pérdida</b></td>
+                        <td id="dvInv" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 37%; font-size: 14px;"><b>Venta</b></td>
+                        <td id="dvVen" runat="server" class="dataTables_scrollHead" style="text-align: center!important; font-size: 14px; border-right-color: white!important; border-left-color: white!important; width: 22%; border-style: solid;"><b>Costo</b></td>
+                        <td id="dvUt" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 46%; font-size: 14px;"><b>Utilidad/Pérdida</b></td>
                     </tr>
                 </table>
             </div>
@@ -262,6 +262,16 @@
                     </asp:TemplateField>
                     <asp:HyperLinkField Text="Ir" DataNavigateUrlFields="CveMovimiento" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="2.5%" DataNavigateUrlFormatString="/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}" />
 
+                     <asp:TemplateField HeaderText="$ Neto" ItemStyle-Width="7.5%" ItemStyle-HorizontalAlign="Right">
+                        <ItemTemplate>
+                            <asp:HyperLink ID="HlNeto" runat="server" Text='<%# If(Eval("Neto").ToString() = "0", "-", Eval("Neto", "{0:#,##0.00}")) %>'></asp:HyperLink>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="% Neto" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right">
+                        <ItemTemplate>
+                            <asp:HyperLink ID="HlPorNeto" runat="server" Text='<%# If(Eval("PorNeto").ToString() = "0", "-", Eval("PorNeto", "{0:#,##0.00}%")) %>'></asp:HyperLink>
+                        </ItemTemplate>
+                    </asp:TemplateField>
 
                     <asp:TemplateField HeaderText="Utilidad" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right">
                         <ItemTemplate>
@@ -269,7 +279,7 @@
                         </ItemTemplate>
                     </asp:TemplateField>
 
-                    <asp:TemplateField HeaderText="%" ItemStyle-Width="7.5%" ItemStyle-HorizontalAlign="Right">
+                    <asp:TemplateField HeaderText="%" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right">
                         <ItemTemplate>
                             <asp:HyperLink ID="HlPorGanancia" runat="server" Text='<%# If(Eval("PorUtilidad").ToString() = "0", "-", Eval("PorUtilidad", "{0:#,##0.00}%")) %>'></asp:HyperLink>
                         </ItemTemplate>
@@ -281,7 +291,7 @@
                         </ItemTemplate>
                     </asp:TemplateField>
 
-                    <asp:TemplateField HeaderText="%" ItemStyle-Width="7.5%" ItemStyle-HorizontalAlign="Right">
+                    <asp:TemplateField HeaderText="%" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right">
                         <ItemTemplate>
                             <asp:HyperLink ID="HlPorPerdida" runat="server" Text='<%# If(Eval("PorPerdida").ToString() = "0", "-", Eval("PorPerdida", "{0:#,##0.00}%")) %>'></asp:HyperLink>
                         </ItemTemplate>

From cde33e42583ced9fefd52eccd7308500af75ed22 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Tue, 20 Jul 2021 14:08:22 -0700
Subject: [PATCH 3/3] =?UTF-8?q?al=20refacturar=20d=C3=B3lares,=20que=20rec?=
 =?UTF-8?q?alcule=20el=20TC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ventas/Ventas.aspx.vb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index efc318b5f..579b5afba 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -2452,9 +2452,12 @@ Partial Class Ventas
                             ObjInv.Dispose()
 
                         End If
-
+                        'regenrea el tipo de cambio
                         CargaNuevaFactura(Nothing)
 
+                        CambiaMoneda()
+
+
 
                         'NOTA DE CREDITO
                         If NuevaFactura = 2 Then