From b5b497430054fe5b5d3fdfe634cb58b56e37c0d0 Mon Sep 17 00:00:00 2001
From: rakcsle <rakcsle.rakcsle@gmail.com>
Date: Fri, 30 Jul 2021 20:41:43 -0700
Subject: [PATCH] GvPS se agrega columna de porcentaje de IEPS

---
 Compras/Compras.aspx    | 28 +++++++++++++++++++---------
 Compras/Compras.aspx.vb | 19 ++++++++++---------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx
index f25ecfa5d..90b1948f5 100644
--- a/Compras/Compras.aspx
+++ b/Compras/Compras.aspx
@@ -689,6 +689,7 @@
                                                 </th>
                                                 <th style="width: 80px">P.U.&nbsp;</th>
                                                 <th style="width: 50px">% IVA&nbsp;</th>
+                                                <th style="width: 50px">% IEPS&nbsp;</th>
                                                 <th style="width: 80px">Total&nbsp;</th>
                                                 <div id="dvNoDeducible" runat="server" visible="false">
                                                     <th style="width: 80px">¿No Deducible?&nbsp;</th>
@@ -792,53 +793,62 @@
                                                     <asp:Label ID="LblIVAPorcentaje" runat="server" Text='<%# String.Format("{0} {1}", (CDbl(Eval("IVAPorcentaje").ToString) * 100).ToString("#####"), If(CDbl(Eval("IVAPorcentaje").ToString) * 100 > 0, "%", "")) %>'></asp:Label>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 9 --%>
-                                            <asp:BoundField DataField="Total" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Right" />
+                                             <%-- 9 --%>
+                                            <asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80px">
+                                                <ItemTemplate>
+                                                    <asp:Label ID="LtlIEPSPSPorcentaje" runat="server" Text='<%# String.Format("{0} {1}", (CDbl(Eval("IEPSPSPorcentaje").ToString) * 100).ToString("#####"), If(CDbl(Eval("IEPSPSPorcentaje").ToString) * 100 > 0, "%", "")) %>'></asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+
+
 
                                             <%-- 10 --%>
+                                            <asp:BoundField DataField="Total" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Right" />
+
+                                            <%-- 11 --%>
                                             <asp:TemplateField ItemStyle-HorizontalAlign="Center" ControlStyle-Width="100px" Visible="false">
                                                 <ItemTemplate>
                                                     <asp:CheckBox ID="ChkEsNoDeduciblePS" runat="server" Checked='<%# If(Eval("NoDeducible").ToString = "", 0, Eval("NoDeducible")) %>' AutoPostBack="true" OnCheckedChanged="ChkEsNoDeduciblePS_CheckedChanged" />
                                                 </ItemTemplate>
                                             </asp:TemplateField>
 
-                                            <%-- 11 --%>
+                                            <%-- 12 --%>
                                             <asp:TemplateField ItemStyle-HorizontalAlign="Center">
                                                 <ItemTemplate>
                                                     <asp:LinkButton ID="imgE" runat="server" AlternateText="Editar" CausesValidation="False" CssClass="btn btn-circle btn-sm green" OnClick="Edit_Click" Text="<i class='fa fa-pencil'></i>" />
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 12 --%>
+                                            <%-- 13 --%>
                                             <asp:TemplateField ItemStyle-HorizontalAlign="Center">
                                                 <ItemTemplate>
                                                     <asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 13 --%>
+                                            <%-- 14 --%>
                                             <asp:TemplateField HeaderText="Clasificacion" Visible="false">
                                                 <ItemTemplate>
                                                     <asp:DropDownList runat="server" ID="DdlAC5" CssClass="form-control input-sm select2me" AutoPostBack="true" DataTextField="CodigoClasificacion" DataValueField="CveClasificacion" Width="150px" OnSelectedIndexChanged="CompruebaSaldoAC" Visible="true"></asp:DropDownList>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 14 --%>
+                                            <%-- 15 --%>
                                             <asp:TemplateField HeaderText="Programa Operativo" Visible="False">
                                                 <ItemTemplate>
                                                     <asp:DropDownList runat="server" ID="DdlAC1" CssClass="form-control input-sm select2me" AutoPostBack="true" DataTextField="ProgramaOperativo" DataValueField="CveProgramaOperativo" Width="150px" OnSelectedIndexChanged="CompruebaSaldoAC"></asp:DropDownList>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 15 --%>
+                                            <%-- 16 --%>
                                             <asp:TemplateField HeaderText="Unidad Administrativa" Visible="False">
                                                 <ItemTemplate>
                                                     <asp:DropDownList runat="server" ID="DdlAC2" CssClass="form-control input-sm select2me" AutoPostBack="true" DataTextField="UnidadAdministrativa" DataValueField="CveUnidadAdministrativa" Width="150px" OnSelectedIndexChanged="CompruebaSaldoAC"></asp:DropDownList>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 16 --%>
+                                            <%-- 17 --%>
                                             <asp:TemplateField HeaderText="Fuente Financiamiento" Visible="False">
                                                 <ItemTemplate>
                                                     <asp:DropDownList runat="server" ID="DdlAC3" CssClass="form-control input-sm select2me" AutoPostBack="true" DataTextField="FuenteFinanciamiento" DataValueField="CveFuenteFinanciamiento" Width="150px" OnSelectedIndexChanged="CompruebaSaldoAC"></asp:DropDownList>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <%-- 17 --%>
+                                            <%-- 18 --%>
                                             <asp:TemplateField HeaderText="Tipo Gasto" Visible="False">
                                                 <ItemTemplate>
                                                     <asp:DropDownList runat="server" ID="DdlAC4" CssClass="form-control input-sm select2me" AutoPostBack="true" DataTextField="TipoGasto" DataValueField="CveTipoGasto" Width="100px" OnSelectedIndexChanged="CompruebaSaldoAC"></asp:DropDownList>
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index f0e41fc77..6b1c3d08d 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -11022,11 +11022,12 @@ Partial Class Compras_Compras
                     'e.Row.Cells(11).Width = Unit.Pixel(43)
 
                     If UsuarioActual.Empresa.UsaAC Then 'AndAlso (CveFactura > 0 Or CveCompra > 0) 
-                        e.Row.Cells(12).Width = Unit.Pixel(150)
                         e.Row.Cells(13).Width = Unit.Pixel(150)
                         e.Row.Cells(14).Width = Unit.Pixel(150)
                         e.Row.Cells(15).Width = Unit.Pixel(150)
-                        e.Row.Cells(16).Width = Unit.Pixel(100)
+                        e.Row.Cells(16).Width = Unit.Pixel(150)
+                        e.Row.Cells(17).Width = Unit.Pixel(150)
+                        e.Row.Cells(18).Width = Unit.Pixel(100)
                     End If
                 End If
 
@@ -11127,11 +11128,11 @@ Partial Class Compras_Compras
 
                 'CargaPresupuestosEgresos
                 If UsuarioActual.Empresa.UsaAC Then
-                    e.Row.Cells(13).Visible = True
                     e.Row.Cells(14).Visible = True
                     e.Row.Cells(15).Visible = True
                     e.Row.Cells(16).Visible = True
                     e.Row.Cells(17).Visible = True
+                    e.Row.Cells(18).Visible = True
 
                     e.Row.FCDropDownList("DdlAC1").Items.Clear()
                     e.Row.FCDropDownList("DdlAC1").DataSource = DtPresupuestos.FiltraParametros("", DistinctColumns:={"CveProgramaOperativo", "ProgramaOperativo"})
@@ -11162,19 +11163,19 @@ Partial Class Compras_Compras
                     'SI EL PRESUPUESTO DE EGRESOS VIENE DESDE LA OC, SE BLOQUEA PE
                     If e.Row.DBCampo("CveOrdenCompraDetalle").ToEntero > 0 AndAlso e.Row.DBCampo("CvePresupuestoEgreso").ToEntero > 0 Then
 
-                        e.Row.Cells(13).Enabled = False
                         e.Row.Cells(14).Enabled = False
                         e.Row.Cells(15).Enabled = False
                         e.Row.Cells(16).Enabled = False
                         e.Row.Cells(17).Enabled = False
+                        e.Row.Cells(18).Enabled = False
                     End If
                 Else
 
-                    e.Row.Cells(13).Visible = False
                     e.Row.Cells(14).Visible = False
                     e.Row.Cells(15).Visible = False
                     e.Row.Cells(16).Visible = False
                     e.Row.Cells(17).Visible = False
+                    e.Row.Cells(18).Visible = False
                 End If
 
             End If
@@ -13291,11 +13292,11 @@ Partial Class Compras_Compras
 
         'Seccion Grid
         GvPS.Width = 1760
-        GvPS.Columns(12).Visible = True
         GvPS.Columns(13).Visible = True
         GvPS.Columns(14).Visible = True
         GvPS.Columns(15).Visible = True
         GvPS.Columns(16).Visible = True
+        GvPS.Columns(17).Visible = True
 
         'Panel General
         UpPresupuestosAC.Visible = True
@@ -17506,7 +17507,7 @@ Partial Class Compras_Compras
         CargaRetISRConcepto()
 
         Dim NumNoDed As Integer = TmpDT.COUNT("CvePS", "NoDeducible = True ")
-        If NumNoDed > 0 Then GvPS.Columns(10).Visible = True 'visualiza columnas de nodeducibles
+        If NumNoDed > 0 Then GvPS.Columns(11).Visible = True 'visualiza columnas de nodeducibles
 
         If DdlTipoComprobante.SelectedValue.Contiene("NC", "DEV") Then
             InicializaAplicaNCFact()
@@ -20506,12 +20507,12 @@ Partial Class Compras_Compras
         If ChkEsNoDeducible.Checked Then
             EsNoDeducible = True
             dvNoDeducible.Visible = True
-            GvPS.Columns(10).Visible = True
+            GvPS.Columns(11).Visible = True
             UpEsNoDeduciblePS.Visible = True
         Else
             EsNoDeducible = False
             dvNoDeducible.Visible = False
-            GvPS.Columns(10).Visible = False
+            GvPS.Columns(11).Visible = False
             UpEsNoDeduciblePS.Visible = False
         End If
         'DivEsNoDeducible.Visible = False