Cambios en comparativo de compras y ventas

SAT/SolicitudesIngresoSat.aspx

@@ -319,7 +319,7 @@
             </div>
             <div class="row" runat="server" id="DVResumen2" visible="false">
 
-                <div class="col-md-7">
+                <div class="col-md-12">
                     <asp:GridView ID="GvResumen" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" AutoGenerateColumns="False" OnRowDataBound="GvResumen_RowDataBound"
                         ShowHeaderWhenEmpty="true" EmptyDataText="No se encontraron registros"
                         DataKeyNames="Fecha">
@@ -329,12 +329,52 @@
                                     <asp:Label ID="LblMes" runat="server" Text='<%# Eval("Mes")%>'></asp:Label>
                                 </ItemTemplate>
                             </asp:TemplateField>
-                            <asp:TemplateField HeaderText="SIG" ItemStyle-HorizontalAlign="Right">
+                            <asp:TemplateField HeaderText="IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("VIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="IEPS" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("VIEPS", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label  runat="server" Text='<%# Eval("VRetIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret ISR" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("VRetISR", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="TOTAL SIG" ItemStyle-HorizontalAlign="Right">
                                 <ItemTemplate>
                                     <asp:Label ID="LblVTotal" runat="server" Text='<%# Eval("VTotal","{0:N2}")%>'></asp:Label>
                                 </ItemTemplate>
                             </asp:TemplateField>
-                            <asp:TemplateField HeaderText="SAT" ItemStyle-HorizontalAlign="Right">
+                            <asp:TemplateField HeaderText="IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("CBTIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="IEPS" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("CBTIEPS", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label  runat="server" Text='<%# Eval("CBTRetIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret ISR" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("CBTRetISR", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="TOTAL SAT" ItemStyle-HorizontalAlign="Right">
                                 <ItemTemplate>
                                     <asp:Label ID="LblCBTTotal" runat="server" Text='<%# Eval("CBTTotal","{0:N2}")%>'></asp:Label>
                                 </ItemTemplate>
@@ -368,11 +408,7 @@
                         DataKeyNames="UUID,CountRegistros,VTotal,CBTTotal,CountRegistrosSIG,CountRegistrosSAT,DifImporte,Abreviatura,CBTMoneda,CFDIData,CveSolicitudDetalle,CveVenta,VSerieFolio,Sistema">
                         <Columns>
 
-                            <asp:TemplateField HeaderText="Folio">
+                            <asp:BoundField HeaderText="Cliente" DataField="NombreCliente" ItemStyle-Width="150px" ></asp:BoundField>
-                                <ItemTemplate>
-                                    <asp:Label runat="server" ID="LblUUID" Text='<%# Eval("UUID")%>'></asp:Label>
-                                </ItemTemplate>
-                            </asp:TemplateField>
 
 
                             <asp:HyperLinkField HeaderText="Sistema" DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" DataTextField="Sistema" ControlStyle-CssClass='Texto' Target='_blank'></asp:HyperLinkField>
@@ -495,6 +531,17 @@
                                 </ItemTemplate>
                             </asp:TemplateField>
 
+                            <asp:TemplateField HeaderText="Folio">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" ID="LblUUID" Text='<%# Eval("UUID")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+
+                            <asp:TemplateField HeaderText="RFC">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" ID="LblRFC" Text='<%# Eval("RFC")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
 
 
 

SAT/SolicitudesIngresoSat.aspx.cs

@@ -75,7 +75,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
 
     protected void LnkDownloadExcel_Click(object sender, EventArgs e)
     {
-        if(TipoDescarga == 1) {
+        if (TipoDescarga == 1)
+        {
             GvResumen.ExportToExcel2($"Resumen{DateTime.Now.ToString("yyyyMMddhhmmss")}");
         }
 
@@ -153,7 +154,7 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
 
             if (nom.SolicitudesGet(-1, UsuarioActual.CveEmpresa, CveTipoSolicitud: 3, Estatus: 1, Top: 50))
             {
-                GVSolicitudesNominas.DataSource = nom.DtResultados;
+                GVSolicitudesNominas.DataSource = nom.DtResultados.FiltraParametros("EfectoComprobante = 'I'");
                 GVSolicitudesNominas.DataBind();
             }
         }
@@ -218,7 +219,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
             {
                 sbResultado.Append($"Solicitud registrada. {resultSolicitud[1]}<br> Folio: {Folio}");
             }
-            else{
+            else
+            {
 
 
                 if (ObjApiSolicitud != null && resultSolicitud.Count == 4)
@@ -397,11 +399,57 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
         if (e.Row.RowType == DataControlRowType.DataRow)
         {
             if (e.Row.DataKey("Fecha") == "")
-            {
-                // e.Row.Cells[0].Text = "Total";                
                 e.Row.Attributes.Add("class", "Totales");
 
+            if (UsuarioActual.Empresa.Funcionalidad(713) != "1")
+            {
+                e.Row.Cells[2].Visible = false;
             }
+
+
+            if (UsuarioActual.Empresa.Funcionalidad(713) != "1")
+            {
+                e.Row.Cells[7].Visible = false;
+            }
+
+
+        }
+
+        if (e.Row.RowType == DataControlRowType.Header)
+        {
+            e.Row.Cells[1].BackColor = System.Drawing.Color.FromName("#3598dc");
+            e.Row.Cells[2].BackColor = System.Drawing.Color.FromName("#3598dc");
+            e.Row.Cells[3].BackColor = System.Drawing.Color.FromName("#3598dc");
+            if (UsuarioActual.Empresa.Funcionalidad(713) != "1")
+            {
+                e.Row.Cells[2].Visible = false;
+            }
+
+            e.Row.Cells[4].BackColor = System.Drawing.Color.FromName("#3598dc");
+            e.Row.Cells[5].BackColor = System.Drawing.Color.FromName("#3598dc");
+
+            e.Row.Cells[6].BackColor = System.Drawing.Color.FromName("#C46B06");
+            e.Row.Cells[7].BackColor = System.Drawing.Color.FromName("#C46B06");
+            e.Row.Cells[8].BackColor = System.Drawing.Color.FromName("#C46B06");
+            if (UsuarioActual.Empresa.Funcionalidad(713) != "1")
+            {
+                e.Row.Cells[7].Visible = false;
+            }
+
+            e.Row.Cells[9].BackColor = System.Drawing.Color.FromName("#C46B06");
+            e.Row.Cells[10].BackColor = System.Drawing.Color.FromName("#C46B06");
+
+
+            e.Row.Cells[1].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[2].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[3].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[4].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[5].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[6].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[7].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[8].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[9].ForeColor = System.Drawing.Color.FromName("white");
+            e.Row.Cells[10].ForeColor = System.Drawing.Color.FromName("white");
         }
     }
 
@@ -446,7 +494,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
                         SBMsgToolTip.AppendLine("Comprobante no se encuentra en descargas de SAT.<br>");
                     }
                 }
-                else {
+                else
+                {
                     if (e.Row.DataKey("DifImporte").ToDecimal() != 0)
                     {
                         SBMsgToolTip.AppendLine($" Diferencia importes {e.Row.DataKey("DifImporte").ToDecimal().ToString("###,###,###.00")}");
@@ -569,7 +618,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
             {
                 var UrlDescarga = $"{UsuarioActual.Empresa.Ruta}NomXMLSAT\\Descargas\\{e.Row.DataKey("ArchivoXML")}";
 
-                if (System.IO.File.Exists(UrlDescarga)){
+                if (System.IO.File.Exists(UrlDescarga))
+                {
                     LinkButton LnkDescargaXML = e.Row.FCLinkButton("LnkDescargaXML");
                     ScriptManager.GetCurrent(this).RegisterPostBackControl(LnkDescargaXML);
                     LnkDescargaXML.Visible = true;
@@ -662,10 +712,12 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas
 
                 if (UUID.Length > 0)
                 {
-                    try {
+                    try
+                    {
                         System.IO.File.Move(f.FullName, $@"{f.DirectoryName}\{UUID.ToUpper()}.XML");
                         Contador++;
-                    } catch (Exception ex3)
+                    }
+                    catch (Exception ex3)
                     {
                         ModExtensiones.GuardaLog(ex3.StackTrace);
                     }

SAT/SolicitudesRecibidasSAT.aspx

@@ -499,6 +499,12 @@
                                 </ItemTemplate>
                             </asp:TemplateField>
 
+                            <asp:TemplateField HeaderText="RFC">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" ID="LblRFC" Text='<%# Eval("RFC")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+
 
                         </Columns>
                     </asp:GridView>

SAT/SolicitudesRecibidasSAT.aspx.vb

@@ -212,6 +212,9 @@ Partial Class SAT_SolicitudesRecibidasSAT
             e.Row.Cells(15).BackColor = System.Drawing.Color.FromName("#C46B06")
             e.Row.Cells(16).BackColor = System.Drawing.Color.FromName("#C46B06")
             e.Row.Cells(17).BackColor = System.Drawing.Color.FromName("#C46B06")
+            e.Row.Cells(18).BackColor = System.Drawing.Color.FromName("#C46B06")
+            e.Row.Cells(19).BackColor = System.Drawing.Color.FromName("#C46B06")
+
             e.Row.Cells(1).ForeColor = System.Drawing.Color.FromName("white")
             e.Row.Cells(2).ForeColor = System.Drawing.Color.FromName("white")
             e.Row.Cells(3).ForeColor = System.Drawing.Color.FromName("white")
@@ -229,6 +232,8 @@ Partial Class SAT_SolicitudesRecibidasSAT
             e.Row.Cells(15).ForeColor = System.Drawing.Color.FromName("white")
             e.Row.Cells(16).ForeColor = System.Drawing.Color.FromName("white")
             e.Row.Cells(17).ForeColor = System.Drawing.Color.FromName("white")
+            e.Row.Cells(18).ForeColor = System.Drawing.Color.FromName("white")
+            e.Row.Cells(19).ForeColor = System.Drawing.Color.FromName("white")
         End If
     End Sub
     Protected Sub BtnConsultar_Click(sender As Object, e As EventArgs)