From b7db48ac899afdd25405bc0202331bbd9db2cd78 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Jun 2023 20:29:13 -0700 Subject: [PATCH 1/3] Columnas de impuestos en reporte de solicitudes recibidas sat --- SAT/SolicitudesRecibidasSAT.aspx | 55 +++++++++++++++++++++++++---- SAT/SolicitudesRecibidasSAT.aspx.vb | 54 ++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 7 deletions(-) diff --git a/SAT/SolicitudesRecibidasSAT.aspx b/SAT/SolicitudesRecibidasSAT.aspx index 8f9aaaf2b..27e0c501d 100644 --- a/SAT/SolicitudesRecibidasSAT.aspx +++ b/SAT/SolicitudesRecibidasSAT.aspx @@ -292,13 +292,13 @@
-
+
" style="display: inline-block; width: 150px;" /> " style="margin-top: -3px; margin-left: -13px;" class="btn btn-circle btn-sm label-info">
-
+
@@ -308,19 +308,60 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/SAT/SolicitudesRecibidasSAT.aspx.vb b/SAT/SolicitudesRecibidasSAT.aspx.vb index 8c8e6834b..ed74f3fba 100644 --- a/SAT/SolicitudesRecibidasSAT.aspx.vb +++ b/SAT/SolicitudesRecibidasSAT.aspx.vb @@ -83,7 +83,46 @@ Partial Class SAT_SolicitudesRecibidasSAT If e.Row.DataKey("Fecha") = "" Then e.Row.Attributes.Add("class", "Totales") End If + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(2).Visible = False + End If + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = False + End If End If + + If e.Row.RowType = DataControlRowType.Header Then + 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" Then + e.Row.Cells(2).Visible = False + End If + 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" Then + e.Row.Cells(7).Visible = False + End If + 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") + End If + End Sub Protected Sub GvDatos_RowDataBound(ByVal sender As Object, ByVal e As GridViewRowEventArgs) If e.Row.RowType = DataControlRowType.DataRow Then @@ -139,6 +178,14 @@ Partial Class SAT_SolicitudesRecibidasSAT LnkCFDIData.PostBackUrl = "#" End If End If + + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = False + End If + + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(14).Visible = False + End If End If If e.Row.RowType = DataControlRowType.Header Then @@ -148,6 +195,9 @@ Partial Class SAT_SolicitudesRecibidasSAT 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("#3598dc") + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = false + End If e.Row.Cells(7).BackColor = System.Drawing.Color.FromName("#3598dc") e.Row.Cells(8).BackColor = System.Drawing.Color.FromName("#3598dc") e.Row.Cells(9).BackColor = System.Drawing.Color.FromName("#3598dc") @@ -155,6 +205,9 @@ Partial Class SAT_SolicitudesRecibidasSAT e.Row.Cells(11).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(12).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(13).BackColor = System.Drawing.Color.FromName("#C46B06") + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(14).Visible = False + End If e.Row.Cells(14).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(15).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(16).BackColor = System.Drawing.Color.FromName("#C46B06") @@ -206,6 +259,7 @@ Partial Class SAT_SolicitudesRecibidasSAT GvResumen.DataSource = ObjCompras.DtResultados TipoDescarga = If(ObjCompras.DtResultados.Rows.Count > 0, 1, 0) LnkDownloadExcel.Visible = True + ElseIf DdlReporte.SelectedValue.ToEntero() = 2 Then GvDatos.DataSource = ObjCompras.DtResultados TipoDescarga = If(ObjCompras.DtResultados.Rows.Count > 0, 2, 0) From 329661a456a35b73c7b092be2d5bb82f12b6b9af Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Jun 2023 20:29:50 -0700 Subject: [PATCH 2/3] Errores en ventas --- Ventas/Ventas.aspx.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index dfed40166..575f4b57f 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -15450,9 +15450,10 @@ Partial Class Ventas ' Dim DtTest = ObjConta.DtResultados 'End If End If + Else + ErrorPrepoliza = True End If - Return ErrorPrepoliza Catch ex As Exception GuardaLog("GuardaPreP." & ex.ToString()) @@ -15675,7 +15676,7 @@ Partial Class Ventas If DebeGenerarMovimiento Then Dim CveAlmacenSalida As Integer = ddlAlmacen.SelectedValue.ToEntero() - Dim CveAlmacenExA As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa, CveTipoAlmacen:=10).FiltroPrimeroValor("CveAlmacen", $"CveSubProyecto={DdlSubProyecto.SelectedValue}").ToEntero() + Dim CveAlmacenExA As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa, CveTipoAlmacen:=10).FiltroPrimeroValor("CveAlmacen", $"CveSubProyecto={DdlSubProyectoDatos.SelectedValue}").ToEntero() Dim CveRemision As Integer = factura.CveVenta Dim CveMoneda As Integer = DdlMoneda.SelectedValue.ToEntero() From 391fd759f0952743ad0ebd01a226423d2c909b86 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 22 Jun 2023 20:30:22 -0700 Subject: [PATCH 3/3] Envio de correo en remisiones --- Ventas/Clientes.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb index 0b80dafe3..4b979fb0a 100644 --- a/Ventas/Clientes.aspx.vb +++ b/Ventas/Clientes.aspx.vb @@ -2332,7 +2332,7 @@ Partial Class Clientes ' Else ' Alert("No se pudo adjuntar el correo electrónico.", TipoMensaje.MsgError) ' End If - ElseIf HdnTipoDocto.Value = "Cot" Then + ElseIf HdnTipoDocto.Value.Contiene("Cot", "Rem") Then If File.Exists($"{Ruta}PDF\{HdnTipoDocto.Value}\{HdnFolioVenta.Value}.pdf") Then Dim PDF As String = $"{Ruta}PDF\{HdnTipoDocto.Value}\{HdnFolioVenta.Value}.pdf"