From 6f87291bf326149ed5e1b0f0f7bd9ccfb9718a5b Mon Sep 17 00:00:00 2001
From: HECTOR RODRIGUEZ <hecttor201@gmail.com>
Date: Wed, 5 May 2021 19:33:03 -0700
Subject: [PATCH] Cambio en orden de columnas

---
 CxC/RepCxCDetalle.aspx    | 59 ++++++++++++++++++++-------------------
 CxC/RepCxCDetalle.aspx.vb | 42 ++++++++++++++--------------
 2 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/CxC/RepCxCDetalle.aspx b/CxC/RepCxCDetalle.aspx
index d20c79363..72a3d882d 100644
--- a/CxC/RepCxCDetalle.aspx
+++ b/CxC/RepCxCDetalle.aspx
@@ -434,13 +434,14 @@
                         </ItemTemplate>
                     </asp:TemplateField>
                     <%--<asp:HyperLinkField HeaderText="Folio" DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" ControlStyle-Width ="85px"  DataTextField="SerieFolio" />--%>
-                    <asp:BoundField HeaderText="Total" DataField="Total" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
+
                     <asp:BoundField HeaderText="SubTotal" DataField="SubTotal" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
-                    <asp:BoundField HeaderText="IVA" DataField="IVA" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="Descuento" DataField="Descuento" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="Amortizacion" DataField="Amortizacion" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
+                    <asp:BoundField HeaderText="IVA" DataField="IVA" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="RetIVA" DataField="RetIVA" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="RetISR" DataField="RetISR" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
+                    <asp:BoundField HeaderText="Total" DataField="Total" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="Saldo" DataField="Saldo" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="Mon" DataField="Moneda"/>
                     <asp:BoundField HeaderText="Sucursal Venta" DataField="SubProyecto" DataFormatString="{0}" />
@@ -506,8 +507,7 @@
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkFolio" runat="server" Text="&nbsp;Folio" Checked="true" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkSubTotal" runat="server" Text="&nbsp;SubTotal" /></td>
-
+                                            <asp:CheckBox ID="ChkFecha" runat="server" Text="&nbsp;Fecha" Checked="true" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkSeEnvioMail" runat="server" Text="&nbsp;Se envió Mail" /></td>
                                         <td style="text-align: left;">
@@ -515,7 +515,7 @@
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkDescuento" runat="server" Text="&nbsp;Descuento" /></td>
+                                            <asp:CheckBox ID="ChkSubTotal" runat="server" Text="&nbsp;SubTotal" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChlMotivoDescuento" runat="server" Text="&nbsp;Motivo Descuento" /></td>
                                         <td style="text-align: left;">
@@ -525,9 +525,10 @@
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkAmortizacion" runat="server" Text="&nbsp;Amortización" /></td>
+                                            <asp:CheckBox ID="ChkDescuento" runat="server" Text="&nbsp;Descuento" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkIVA" runat="server" Text="&nbsp;IVA" Checked="true" /></td>
+                                            <asp:CheckBox ID="ChkVendedor" runat="server" Text="&nbsp;Vendedor" Checked="false" /></td>
+
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkSucursalEjecucion" runat="server" Text="&nbsp;Sucursal Ejecucion" /></td>
                                         <td style="text-align: left;">
@@ -535,9 +536,9 @@
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkRetIVA" runat="server" Text="&nbsp;Ret. IVA" /></td>
+                                            <asp:CheckBox ID="ChkAmortizacion" runat="server" Text="&nbsp;Amortización" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkRetISR" runat="server" Text="&nbsp;Ret. ISR" /></td>
+                                            <asp:CheckBox ID="ChkSucursal" runat="server" Text="&nbsp;Sucursal" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkTelefono" runat="server" Text="&nbsp;Telefono" /></td>
                                         <td style="text-align: left;">
@@ -545,9 +546,9 @@
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkTotal" runat="server" Text="&nbsp;Total" Checked="true" /></td>
+                                            <asp:CheckBox ID="ChkIVA" runat="server" Text="&nbsp;IVA" Checked="true" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkFecha" runat="server" Text="&nbsp;Fecha" Checked="true" /></td>
+                                            <asp:CheckBox ID="ChkCodigo" runat="server" Text="&nbsp;Código Cliente" Checked="true" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkLimiteCredito" runat="server" Text="&nbsp;Limite Credito" /></td>
                                         <td style="text-align: left;">
@@ -555,57 +556,57 @@
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkSucursal" runat="server" Text="&nbsp;Sucursal" /></td>
+                                            <asp:CheckBox ID="ChkRetIVA" runat="server" Text="&nbsp;Ret. IVA" /></td>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkCliente" runat="server" Text="&nbsp;Cliente" Checked="true" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkCodigo" runat="server" Text="&nbsp;Código Cliente" Checked="true" /></td>
-                                        <td>
                                             <asp:CheckBox ID="ChkIEPS" runat="server" Text="&nbsp;IEPS" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkEstatusCliente" runat="server" Text="&nbsp;Estatus Cliente" /></td>
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkCliente" runat="server" Text="&nbsp;Cliente" Checked="true" /></td>
+                                            <asp:CheckBox ID="ChkRetISR" runat="server" Text="&nbsp;Ret. ISR" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkSucursalCliente" runat="server" Text="&nbsp;Sucursal Cliente" Checked="true" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkEstatusCobranza" runat="server" Text="&nbsp;Estatus Cobranza" />
-                                        </td>
+                                            <asp:CheckBox ID="ChkEstatusCobranza" runat="server" Text="&nbsp;Estatus Cobranza" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkTurnoCobranza" runat="server" Text="&nbsp;TurnoCobranza" />
-                                        </td>
+                                            <asp:CheckBox ID="ChkTurnoCobranza" runat="server" Text="&nbsp;TurnoCobranza" /></td>
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkVendedor" runat="server" Text="&nbsp;Vendedor" Checked="false" /></td>
+                                            <asp:CheckBox ID="ChkTotal" runat="server" Text="&nbsp;Total" Checked="true" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkEstatusFactura" runat="server" Text="&nbsp;Estatus de Factura" /></td>
                                         <td style="text-align: left;">
-                                            <asp:CheckBox ID="ChkObsCobranza" runat="server" Text="&nbsp;Observación Cobranza" />
-                                        </td>
+                                            <asp:CheckBox ID="ChkObsCobranza" runat="server" Text="&nbsp;Observación Cobranza" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkCuentaContableReferencia" runat="server" Text="&nbsp;CuentaContableReferencia" Visible="False" /></td>
-                                        <td></td>
+                                        <td style="text-align: left;">
+                                            
                                     </tr>
                                     <tr>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkMotivoCancelacion" runat="server" Text="&nbsp;Motivo Cancelacion" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkSeTimbro" runat="server" Text="&nbsp;Se Timbró" /></td>
-                                        <td>
-                                            <asp:CheckBox ID="ChkFechaCobranza" runat="server" Text="&nbsp;Fecha Cobranza" Checked="true" /></td>
-                                        <td> <asp:CheckBox ID="ChkDiasTranscurridos" runat="server" Text="&nbsp;Días Transcurridos" /></td>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkFechaCobranza" runat="server" Text="&nbsp;Fecha Cobranza" Checked="true" /> </td>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkDiasTranscurridos" runat="server" Text="&nbsp;Días Transcurridos" /></td>
                                     </tr>
                                      <tr>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkHorario" runat="server" Text="&nbsp;Horario" Checked="false" /></td>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkDiasPago" runat="server" Text="&nbsp;Dias Pago" /></td>
-                                          <td style="text-align: left;">
+                                        <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkFechaEjecucion" runat="server" Text="&nbsp;Fecha Ejecución" /></td>
+                                        <td style="text-align: left;">
+                                              <asp:CheckBox ID="ChkTC" runat="server" Text="&nbsp;Tipo Cambio" /></td>
+                                                                                 
 
-                                          <td> <asp:CheckBox ID="ChkTC" runat="server" Text="&nbsp;Tipo Cambio" /></td>
-                                        <td></td>
                                     </tr>
                                 </tbody>
                             </table>
diff --git a/CxC/RepCxCDetalle.aspx.vb b/CxC/RepCxCDetalle.aspx.vb
index 1ebca9cb7..c166a273a 100644
--- a/CxC/RepCxCDetalle.aspx.vb
+++ b/CxC/RepCxCDetalle.aspx.vb
@@ -534,47 +534,47 @@ Partial Class RepCxCDetalle
         End If
 
         If ChkTotal.Checked Then
+            GvDatos.Columns(9).Visible = True
+            SePersonalizo = 1
+        Else
+            GvDatos.Columns(9).Visible = False
+        End If
+
+        If ChkSubTotal.Checked Then
             GvDatos.Columns(3).Visible = True
             SePersonalizo = 1
         Else
             GvDatos.Columns(3).Visible = False
         End If
 
-        If ChkSubTotal.Checked Then
-            GvDatos.Columns(4).Visible = True
-            SePersonalizo = 1
-        Else
-            GvDatos.Columns(4).Visible = False
-        End If
-
         If ChkIVA.Checked Then
-            GvDatos.Columns(5).Visible = True
-            SePersonalizo = 1
-        Else
-            GvDatos.Columns(5).Visible = False
-        End If
-
-        If ChkDescuento.Checked Then
             GvDatos.Columns(6).Visible = True
             SePersonalizo = 1
         Else
             GvDatos.Columns(6).Visible = False
         End If
 
+        If ChkDescuento.Checked Then
+            GvDatos.Columns(4).Visible = True
+            SePersonalizo = 1
+        Else
+            GvDatos.Columns(4).Visible = False
+        End If
+
         If ChkAmortizacion.Checked Then
+            GvDatos.Columns(5).Visible = True
+            SePersonalizo = 1
+        Else
+            GvDatos.Columns(5).Visible = False
+        End If
+
+        If ChkRetIVA.Checked Then
             GvDatos.Columns(7).Visible = True
             SePersonalizo = 1
         Else
             GvDatos.Columns(7).Visible = False
         End If
 
-        If ChkRetIVA.Checked Then
-            GvDatos.Columns(8).Visible = True
-            SePersonalizo = 1
-        Else
-            GvDatos.Columns(8).Visible = False
-        End If
-
         If ChkRetISR.Checked Then
             GvDatos.Columns(9).Visible = True
             SePersonalizo = 1