From 7960202b8fca139e3cf4a48ddd2dbd28fc1c0210 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Mon, 26 Jun 2023 20:46:09 -0700 Subject: [PATCH 1/8] --Columnas de iva retenido por porcentaje --- App_Code/DtDatos.xsd | 32 +++++++++++--------- Contabilidad/RepIVA.aspx | 4 ++- Contabilidad/RepIVA.aspx.cs | 2 +- Empresas/119/Formatos/RepIVAAcreditable.rpt | Bin 131072 -> 131072 bytes 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/App_Code/DtDatos.xsd b/App_Code/DtDatos.xsd index a9dc6f67a..5afd2bf58 100644 --- a/App_Code/DtDatos.xsd +++ b/App_Code/DtDatos.xsd @@ -12,7 +12,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -298,10 +298,12 @@ + + - + @@ -311,7 +313,7 @@ - + diff --git a/Contabilidad/RepIVA.aspx b/Contabilidad/RepIVA.aspx index 7940e288e..037361476 100644 --- a/Contabilidad/RepIVA.aspx +++ b/Contabilidad/RepIVA.aspx @@ -215,7 +215,9 @@ - + <%----%> + + diff --git a/Contabilidad/RepIVA.aspx.cs b/Contabilidad/RepIVA.aspx.cs index 87d51dbeb..2a24113f9 100644 --- a/Contabilidad/RepIVA.aspx.cs +++ b/Contabilidad/RepIVA.aspx.cs @@ -111,7 +111,7 @@ public partial class Contabilidad_RepIVA : ClsPaginas LblMsgAcreditable.Text = "La información presenta importes en negativo, estos no se incluirán en el archivo generado para DIOT"; } - GvA.Columns[11].Visible = DtIVAAcreditable.SUM("valorActosImp1516") > 0; // sino tiene valor la columna de importación de oculta + GvA.Columns[12].Visible = DtIVAAcreditable.SUM("valorActosImp1516") > 0; // sino tiene valor la columna de importación de oculta if (ObjCont.GetRepIVAAcumulado(txtFechaI.Text.ToDate(), txtFechaF.Text.ToDate(), Conciliado, 3, DdlCuenta.SelectedValue.ToEntero(), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)) { diff --git a/Empresas/119/Formatos/RepIVAAcreditable.rpt b/Empresas/119/Formatos/RepIVAAcreditable.rpt index 5b9781196acddd94d35591c3b5ae040c94137799..518015e2dee723e2d133c9b8294fe1be564ff151 100644 GIT binary patch delta 13023 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 N4tx#z?>P(lzW~e;(MA9O delta 13209 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 PKji^bsKogJ6ykpX-PlGE From 447c6b0351a0361fd1bf218c8fbb07366e4d8bc0 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Mon, 26 Jun 2023 20:47:11 -0700 Subject: [PATCH 2/8] Impresion de salida de usados --- Compras/PopUpVerFactura.aspx.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 931cf3ea0..1031acafe 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -3718,7 +3718,7 @@ Partial Class PopUpVerFactura End If - Case 3, 16, 37, 40 ' S A L I D A S + Case 3, 16, 37, 40, 45 ' S A L I D A S 'Dim Archivo As New System.IO.FileInfo(String.Format("Empresas/{0}/Formatos/Salidas.rdlc", 72)) 'Dim Imagen As New System.IO.FileInfo(String.Format("Empresas/{0}/Logo.png", 72)) Dim Archivo As New System.IO.FileInfo(String.Format("{0}Formatos/Salidas.rdlc", UsuarioActual.Empresa.Ruta)) @@ -3729,6 +3729,8 @@ Partial Class PopUpVerFactura concepto = "SALIDA DE ALMACÉN" ElseIf CveConcepto = 37 Then concepto = "SALIDA VIRTUAL" + ElseIf CveConcepto = 45 Then + concepto = "SALIDA DE USADOS" Else concepto = "SALIDA DE ALMACÉN POR RECONSTRUCCIÓN" End If From 33d41836ddbcafdd7c20d2c0951ff1bdab1ab2ce Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 27 Jun 2023 15:30:49 -0700 Subject: [PATCH 3/8] =?UTF-8?q?-=20cambio=20no=20usar=20prepolizasdetalle,?= =?UTF-8?q?=20para=20obtenr=20facturas=20pagadas=20o=20movtos=20de=20banco?= =?UTF-8?q?s,=20afecta=20a=20la=20obtenci=C3=B3n=20de=20prepolizas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsBancos.vb | 41 ++++++++++---- App_Code/ClsContabilidad.vb | 6 +-- App_Code/Modelos.vb | 2 +- App_Code/modExtensiones.vb | 4 +- Bancos/IE.aspx | 46 ++++++++++++++-- Bancos/IE.aspx.vb | 94 +++++++++++++++++++-------------- Compras/PopUpVerFactura.aspx.vb | 29 +++++----- 7 files changed, 148 insertions(+), 74 deletions(-) diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb index 93ebfc00b..7afa67d63 100644 --- a/App_Code/ClsBancos.vb +++ b/App_Code/ClsBancos.vb @@ -848,21 +848,41 @@ Public Class ClsBancos Return Retorno End Function - Public Function GetPrePolizasDetalle(CvePrePoliza As Integer, CveEmpresa As Integer, Optional CveIE As Integer = -1, Optional CveOC As Integer = -1) As Boolean - Dim Retorno As Boolean = False - DataAdapter("PA_Conta_PrePolizasDetalleGet") - With SqlAdapter.SelectCommand.Parameters - .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveIE", SqlDbType.Int).Value = CveIE - .Add("@CveOC", SqlDbType.Int).Value = CveOC - End With + 'Public Function GetPrePolizasDetalle(CvePrePoliza As Integer, CveEmpresa As Integer, Optional CveIE As Integer = -1, Optional CveOC As Integer = -1) As Boolean + ' Dim Retorno As Boolean = False + ' DataAdapter("PA_Conta_PrePolizasDetalleGet") + ' With SqlAdapter.SelectCommand.Parameters + ' .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza + ' .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + ' .Add("@CveIE", SqlDbType.Int).Value = CveIE + ' .Add("@CveOC", SqlDbType.Int).Value = CveOC + ' End With + ' Try + ' SqlAdapter.Fill(Data) + ' Retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al obtener Movimientos Prepolizas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + + ' Return Retorno + 'End Function + + Public Function GetBancosIEFacturasPagadas(CveIE As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_Banc_IEFacturasPagadasGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveIE", SqlDbType.Int).Value = CveIE + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With Try SqlAdapter.Fill(Data) + Retorno = True Catch ex As Exception - OnError("Ocurrió un error al obtener Movimientos Prepolizas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + OnError("Ocurrió un error al obtener los movimientos del documento.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno @@ -944,6 +964,7 @@ Public Class ClsBancos Return Retorno End Function + Public Function GetFoliosCancelados(CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Banc_FoliosCanceladosGet") diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index cb0596ad0..e3f903e99 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -1195,14 +1195,14 @@ Public Class ClsContabilidad Return Concepto End Function - Public Function GetPrePolizasDetalle(CvePrePoliza As Integer, CveEmpresa As Integer, Optional CveIE As Integer = -1, Optional CveVenta As Integer = -1) As Boolean + Public Function GetPrePolizasDetalle(CvePrePoliza As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Conta_PrePolizasDetalleGet") With SqlAdapter.SelectCommand.Parameters .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza - .Add("@CveIE", SqlDbType.Int).Value = CveIE + .Add("@CveIE", SqlDbType.Int).Value = -1 .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveVenta", SqlDbType.Int).Value = CveVenta + '.Add("@CveVenta", SqlDbType.Int).Value = CveVenta End With Try diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index df54b086e..64289248f 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -2442,7 +2442,7 @@ Namespace Modelos Dim DtPrePolizasAFCancelar As DataTable = Nothing If ValorMultiplicador = -1 AndAlso ObjFactura.DtDetalle IsNot Nothing AndAlso ObjFactura.DtDetalle.COUNT("CveActivoFijo", "CveActivoFijo > 0") > 0 Then - If ObjConta.GetPrePolizasDetalle(-1, UsuarioActual.CveEmpresa, CveVenta:=ObjFactura.CveVenta) Then + If ObjConta.GetPrePolizasDetalle(-1, UsuarioActual.CveEmpresa) Then DtPrePolizasAFCancelar = ObjConta.DtResultados.FiltraParametros("CveConceptoContable IN (271,49,4)") End If End If diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index fb6ddaac8..ab43d4a54 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -2025,8 +2025,8 @@ Namespace Extensiones RefCrediproveedor = ObjIE.DepositoRefCrediProveedor 'Dim UsuarioResponsable As String = "" - Dim PreP As New ClsContabilidad - If PreP.GetPrePolizasDetalle(-1, tCveEmpresa, CveIE:=pCveIE) Then + Dim PreP As New ClsBancos + If PreP.GetBancosIEMovimientos(pCveIE, tCveEmpresa) Then If PreP.DtResultados.Rows.Count > 0 Then CveProveedor = PreP.DtResultados.Rows(0)("CveProveedor").ToString.ToEntero CvePersonal = PreP.DtResultados.Rows(0)("CvePersonal").ToString.ToEntero diff --git a/Bancos/IE.aspx b/Bancos/IE.aspx index c967b9b73..1271eb8cd 100644 --- a/Bancos/IE.aspx +++ b/Bancos/IE.aspx @@ -653,8 +653,8 @@
-
- + @@ -671,7 +671,7 @@ - + @@ -1604,6 +1604,46 @@
+ + + diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb index 7a69d4a3e..aff25f863 100644 --- a/Bancos/IE.aspx.vb +++ b/Bancos/IE.aspx.vb @@ -966,13 +966,14 @@ Partial Class Bancos_IE End If 'Detectamos a quien se le hizo el cobro (Cliente, proveedor, Funcionario/Empleado, etc.) - If ObjIE2.GetPrePolizasDetalle(-1, UsuarioActual.CveEmpresa, CveIE:=CveIE) Then + If ObjIE2.GetBancosIEMovimientos(CveIE, UsuarioActual.CveEmpresa) Then If ObjIE2.DtResultados.Rows.Count > 0 Then + Dim dtMovtos As DataTable = ObjIE2.DtResultados - Dim CveConceptoContable As Integer = ObjIE2.DtResultados.FiltroPrimeroValor("CveConceptoContable", "CveConceptoContable <> 30 and CveConceptoContable <> 61").ToEntero - CveCliente = ObjIE2.DtResultados.Rows(0)("CveCliente").ToString.ToEntero - CvePersonal = ObjIE2.DtResultados.Rows(0)("CvePersonal").ToString.ToEntero - CveProveedor = ObjIE2.DtResultados.Rows(0)("CveProveedor").ToString.ToEntero + Dim CveConceptoContable As Integer = dtMovtos.FiltroPrimeroValor("CveConceptoContable", "CveConceptoContable <> 30 and CveConceptoContable <> 61").ToEntero + CveCliente = dtMovtos.Rows(0)("CveCliente").ToString.ToEntero + CvePersonal = dtMovtos.Rows(0)("CvePersonal").ToString.ToEntero + CveProveedor = dtMovtos.Rows(0)("CveProveedor").ToString.ToEntero Select Case CveConceptoContable Case 66 @@ -986,10 +987,28 @@ Partial Class Bancos_IE PnlRecibidoPor.Visible = True End Select + 'codigo reubicado, para no consultar 2 veces + GvM.DataSource = dtMovtos.FiltraParametros("CveConceptoContable <> 30") + + If UsuarioActual.TienePermisoProceso(277) AndAlso Not TabCancelacion.Visible Then + GvM.Columns(8).Visible = True + End If + + If dtMovtos.FiltraParametros("TCPago > 1").Rows.Count.ToEntero() > 0 Then + GvM.Columns(7).Visible = True + End If + + If dtMovtos.FiltraParametros("CveMonedaIE <> CveMoneda").Rows.Count.ToEntero > 0 Then + GvM.Columns(5).Visible = True + GvM.Columns(6).Visible = True + End If + + GvM.DataBind() End If End If End If + If CveCliente > 0 Then DdlCliente.SelectedText = ObjIE.PagueseA DdlCliente.SelectedValue = CveCliente.ToString @@ -1224,27 +1243,27 @@ Partial Class Bancos_IE 'End If + ' codigo se reubicó a linea 969 + ''DETALLES - MOVIMIENTOS + 'If ObjIE.GetBancosIEMovimientos(CveIE, UsuarioActual.CveEmpresa) Then + ' GvM.DataSource = ObjIE.DtResultados.FiltraParametros("CveConceptoContable <> 30") - 'DETALLES - MOVIMIENTOS - If ObjIE.GetBancosIEMovimientos(CveIE, UsuarioActual.CveEmpresa) Then - GvM.DataSource = ObjIE.DtResultados + ' If UsuarioActual.TienePermisoProceso(277) AndAlso Not TabCancelacion.Visible Then + ' GvM.Columns(8).Visible = True + ' End If - If UsuarioActual.TienePermisoProceso(277) AndAlso Not TabCancelacion.Visible Then - GvM.Columns(8).Visible = True - End If + ' If ObjIE.DtResultados.FiltraParametros("TCPago > 1").Rows.Count.ToEntero() > 0 Then + ' GvM.Columns(7).Visible = True + ' End If - If ObjIE.DtResultados.FiltraParametros("TCPago > 1").Rows.Count.ToEntero() > 0 Then - GvM.Columns(7).Visible = True - End If + ' If ObjIE.DtResultados.FiltraParametros("CveMonedaIE <> CveMoneda").Rows.Count.ToEntero > 0 Then + ' GvM.Columns(5).Visible = True + ' GvM.Columns(6).Visible = True + ' End If - If ObjIE.DtResultados.FiltraParametros("CveMonedaIE <> CveMoneda").Rows.Count.ToEntero > 0 Then - GvM.Columns(5).Visible = True - GvM.Columns(6).Visible = True - End If + ' GvM.DataBind() - GvM.DataBind() - - End If + 'End If 'Movimientos Relacionados Padre If ObjIE.GetBancosIEMovimientosPadre(CveIE, UsuarioActual.CveEmpresa) Then @@ -6328,29 +6347,26 @@ Partial Class Bancos_IE End Sub - 'Private Sub LnkAjustarMovimiento_Click(sender As Object, e As EventArgs) Handles LnkAjustarMovimiento.Click - ' RegistraScript("$('#ModalAjustarMovimiento').modal('show');") - 'End Sub + Private Sub LnkAjustarMovimiento_Click(sender As Object, e As EventArgs) Handles LnkAjustarMovimiento.Click + RegistraScript("$('#ModalAjustarMovimiento').modal('show');") + End Sub - 'Private Sub BtnAjustarMovimiento_Click(sender As Object, e As EventArgs) Handles BtnAjustarMovimiento.Click + Private Sub BtnAjustarMovimiento_Click(sender As Object, e As EventArgs) Handles BtnAjustarMovimiento.Click - ' Dim ObjBanco As New ClsBancos - ' ObjBanco.IniciaTransacSQL() - - ' If ObjBanco.UpdateAjustarMovimiento(CveIE, TxtAjustarMovimiento.Text.ToDecimal, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then - ' ObjBanco.Commit() - ' RegistraScript("$('#ModalAjustarMovimiento').modal('hide');", "ALTR") - ' Alert("El ajuste se realizo correctamente.", TipoMensaje.MsgInformacion, $" document.location.href = ""./IE.aspx?CveIE={CveIE}"";") - ' Else - ' ObjBanco.RollBack() - ' End If - - ' ObjBanco.Dispose() - - 'End Sub + Dim ObjBanco As New ClsBancos + ObjBanco.IniciaTransacSQL() + If ObjBanco.UpdateAjustarMovimiento(CveIE, TxtAjustarMovimiento.Text.ToDecimal, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then + ObjBanco.Commit() + RegistraScript("$('#ModalAjustarMovimiento').modal('hide');", "ALTR") + Alert("El ajuste se realizo correctamente.", TipoMensaje.MsgInformacion, $" document.location.href = ""./IE.aspx?CveIE={CveIE}"";") + Else + ObjBanco.RollBack() + End If + ObjBanco.Dispose() + End Sub Protected Sub LnkCancelaMovimiento_Click(sender As Object, e As EventArgs) diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 931cf3ea0..02ef04665 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -5953,17 +5953,17 @@ Partial Class PopUpVerFactura DtMovimientosPoliza.Rows.Add(Dr) End If ElseIf UsuarioActual.CveEmpresa.Contiene(119, 141) Then - Dim PreP As New ClsContabilidad - If PreP.GetPrePolizasDetalle(-1, UsuarioActual.CveEmpresa, CveIE:=CveIE) Then + + If ObjIE.GetBancosIEMovimientos(CveIE, UsuarioActual.CveEmpresa) Then DtMovimientosPoliza = New DataTable DtMovimientosPoliza.Columns.Add("CODIGO", GetType(String)) DtMovimientosPoliza.Columns.Add("Cuenta", GetType(String)) DtMovimientosPoliza.Columns.Add("Cargo", GetType(Double)) DtMovimientosPoliza.Columns.Add("Abono", GetType(Double)) - If PreP.DtResultados.Rows.Count > 0 Then + If ObjIE.DtResultados.Rows.Count > 0 Then - For Each drt As DataRow In PreP.DtResultados.Rows + For Each drt As DataRow In ObjIE.DtResultados.Rows Dim Dr = DtMovimientosPoliza.NewRow Dr("CODIGO") = drt("CuentaCodigo") Dr("Cuenta") = drt("CuentaNombre") @@ -5974,7 +5974,7 @@ Partial Class PopUpVerFactura Next End If End If - PreP.Dispose() + End If @@ -6030,13 +6030,12 @@ Partial Class PopUpVerFactura NotificarA = ObjIE.NotificarA tIdPoliza = ObjIE.IDPoliza - Dim PreP As New ClsContabilidad - If PreP.GetPrePolizasDetalle(-1, UsuarioActual.CveEmpresa, CveIE:=CveIE) Then - If PreP.DtResultados.Rows.Count > 0 Then - CveProveedor = PreP.DtResultados.Rows(0)("CveProveedor").ToString.ToEntero - CvePersonal = PreP.DtResultados.Rows(0)("CvePersonal").ToString.ToEntero + If ObjIE.GetBancosIEMovimientos(CveIE, UsuarioActual.CveEmpresa) Then + If ObjIE.DtResultados.Rows.Count > 0 Then + CveProveedor = ObjIE.DtResultados.Rows(0)("CveProveedor").ToString.ToEntero + CvePersonal = ObjIE.DtResultados.Rows(0)("CvePersonal").ToString.ToEntero - IVA = PreP.DtResultados.SUM("Importe", "CveConceptoContable = 19") ' concepto de IVA + IVA = ObjIE.DtResultados.SUM("Importe", "CveConceptoContable = 19") ' concepto de IVA If CveProveedor > 0 Then Dim Prov As New ClsCompProveedores @@ -6067,7 +6066,6 @@ Partial Class PopUpVerFactura End If End If End If - PreP.Dispose() params.Add(New ReportParameter("Fecha", FechaExpedicion.ToString("dd-MM-yyyy"))) @@ -6238,10 +6236,9 @@ Partial Class PopUpVerFactura Dim reportDataSetsList As New List(Of ReportDataSource) Dim dtMovs As New DataTable - Dim Mov As New ClsContabilidad - If Mov.GetPrePolizasDetalle(-1, UsuarioActual.CveEmpresa, CveIE:=CveIE) Then + If ObjIE.GetBancosIEFacturasPagadas(CveIE, UsuarioActual.CveEmpresa) Then - dtMovs = Mov.DtResultados.FiltraParametros("CveConceptoContable IN (17,2,308,309,312)") + dtMovs = ObjIE.DtResultados.FiltraParametros("CveConceptoContable IN (17,2,308,309,312,292 )") If Not UsuarioActual.CveEmpresa.Contiene(13, 83) Then 'CONVIERTO A PESOS CUANDO SE PAGA CON PESOS FACTURAS DE DOLARES @@ -6254,7 +6251,7 @@ Partial Class PopUpVerFactura End If End If - Mov.Dispose() + Dim rds = New ReportDataSource("DataSet1", dtMovs) reportDataSetsList.Add(rds) From 07bf7cd98279bd0da8ce65c71796746755557eaa Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Tue, 27 Jun 2023 16:21:30 -0700 Subject: [PATCH 4/8] Cambios en comparativo de compras y ventas --- SAT/SolicitudesIngresoSat.aspx | 63 +++++- SAT/SolicitudesIngresoSat.aspx.cs | 284 ++++++++++++++++------------ SAT/SolicitudesRecibidasSAT.aspx | 6 + SAT/SolicitudesRecibidasSAT.aspx.vb | 5 + 4 files changed, 234 insertions(+), 124 deletions(-) diff --git a/SAT/SolicitudesIngresoSat.aspx b/SAT/SolicitudesIngresoSat.aspx index 5d15dc07c..c0fb10133 100644 --- a/SAT/SolicitudesIngresoSat.aspx +++ b/SAT/SolicitudesIngresoSat.aspx @@ -319,7 +319,7 @@
-
+
@@ -329,12 +329,52 @@ - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + @@ -368,11 +408,7 @@ DataKeyNames="UUID,CountRegistros,VTotal,CBTTotal,CountRegistrosSIG,CountRegistrosSAT,DifImporte,Abreviatura,CBTMoneda,CFDIData,CveSolicitudDetalle,CveVenta,VSerieFolio,Sistema"> - - - - - + @@ -495,6 +531,17 @@ + + + + + + + + + + + diff --git a/SAT/SolicitudesIngresoSat.aspx.cs b/SAT/SolicitudesIngresoSat.aspx.cs index 03036deb7..1485e8e0a 100644 --- a/SAT/SolicitudesIngresoSat.aspx.cs +++ b/SAT/SolicitudesIngresoSat.aspx.cs @@ -56,7 +56,7 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas #endregion - protected void Page_Load(object sender, EventArgs e) + protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { @@ -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")}"); } @@ -100,7 +101,7 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas DVResumen1.Visible = true; DVResumen2.Visible = true; DvDatos1.Visible = false; - DvDatos2.Visible = false; + DvDatos2.Visible = false; } else { @@ -108,25 +109,25 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas DVResumen2.Visible = false; DvDatos1.Visible = true; DvDatos2.Visible = true; - } - + } + using (ClsNominas ObjNom = new ClsNominas()) { - if (ObjNom.SATSolicitudTimbreIngresosRep(UsuarioActual.CveEmpresa, TxtRpdFechaInicio.Text.ToDate(), TxtRpdFechaFin.Text.ToDate(), DdlReporte.SelectedValue.ToEntero(),DdlVista.SelectedValue.ToEntero())) + if (ObjNom.SATSolicitudTimbreIngresosRep(UsuarioActual.CveEmpresa, TxtRpdFechaInicio.Text.ToDate(), TxtRpdFechaFin.Text.ToDate(), DdlReporte.SelectedValue.ToEntero(), DdlVista.SelectedValue.ToEntero())) { if (DdlReporte.SelectedValue.ToEntero() == 1 || DdlReporte.SelectedValue.ToEntero() == 3) { GvResumen.DataSource = ObjNom.DtResultados; - TipoDescarga = ObjNom.DtResultados.Rows.Count > 0 ? 1:0; + TipoDescarga = ObjNom.DtResultados.Rows.Count > 0 ? 1 : 0; LnkDownloadExcel.Visible = true; } - else if (DdlReporte.SelectedValue.ToEntero() == 2) - { + else if (DdlReporte.SelectedValue.ToEntero() == 2) + { GvDatos.DataSource = ObjNom.DtResultados; TipoDescarga = ObjNom.DtResultados.Rows.Count > 0 ? 2 : 0; LnkDownloadExcel.Visible = true; - } - } + } + } } GvResumen.DataBind(); @@ -141,19 +142,19 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas using (ClsNominas nom = new ClsNominas()) { - if (nom.SolicitudesGet(-1, UsuarioActual.CveEmpresa, CveTipoSolicitud: 3, Estatus: 0,Top:50)) + if (nom.SolicitudesGet(-1, UsuarioActual.CveEmpresa, CveTipoSolicitud: 3, Estatus: 0, Top: 50)) { GVSolicitudesPendientes.DataSource = nom.DtResultados; if (nom.DtResultados.Rows.Count > 0) { LnkverificarSolicitudes.Visible = true; } - GVSolicitudesPendientes.DataBind(); + GVSolicitudesPendientes.DataBind(); } - if (nom.SolicitudesGet(-1, UsuarioActual.CveEmpresa, CveTipoSolicitud: 3, Estatus:1,Top:50)) + 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(); } } @@ -162,8 +163,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas protected void LnkShowSolicitudes_Click(object sender, EventArgs e) { TabPanel.ActiveTabIndex = 0; - cargasolicitudes(); - + cargasolicitudes(); + RegistraScript("$('#ModalViewSolicitudes').modal();"); } @@ -184,10 +185,10 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas using (ClsNominas nom = new ClsNominas()) { - int CveTipoSolicitud = ChkMetaDatos.Checked ? 203 :3; - CveSolicitudAgregada = nom.SolicitudesAdd2(idSolicitudCFDI, idSolicitudMetadata, estatus, observaciones, fechaInicio, fechaFin, cveUsuarioIng, cveEmpresa, CveTipoSolicitud: CveTipoSolicitud); - - if(CveSolicitudAgregada > 0) + int CveTipoSolicitud = ChkMetaDatos.Checked ? 203 : 3; + CveSolicitudAgregada = nom.SolicitudesAdd2(idSolicitudCFDI, idSolicitudMetadata, estatus, observaciones, fechaInicio, fechaFin, cveUsuarioIng, cveEmpresa, CveTipoSolicitud: CveTipoSolicitud); + + if (CveSolicitudAgregada > 0) { Folio = nom.FolioSolicitud; } @@ -198,8 +199,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas var api = new GeneralesAPII(); JToken ObjApiSolicitud = (JToken)api.GeneraSolicitud(UsuarioActual.CveEmpresa, 3, CveSolicitudAgregada); List resultSolicitud = new List(); - List resultVerificacion = new List(); - + List resultVerificacion = new List(); + var TipoMensaje = ModExtensiones.TipoMensaje.MsgInformacion; var ResultadoSolicitudOK = false; @@ -218,10 +219,11 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas { sbResultado.Append($"Solicitud registrada. {resultSolicitud[1]}
Folio: {Folio}"); } - else{ + else + { - if(ObjApiSolicitud != null && resultSolicitud.Count == 4) + if (ObjApiSolicitud != null && resultSolicitud.Count == 4) { sbResultado.Append($"Solicitud registrada, pendiente de verificar en SAT
Folio: {Folio}
({resultSolicitud[1]})
"); } @@ -249,22 +251,22 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas txtFechaFAdd.Text = ""; ChkMetaDatos.Checked = false; RegistraScript("$('#ModalAgregarSolicitud').modal('hide');"); - cargasolicitudes(); - + cargasolicitudes(); + } } protected void LnkverificarSolicitudes_Click(object sender, EventArgs e) - { - + { + try - { - - + { + + StringBuilder sbResultado = new StringBuilder(); - foreach(GridViewRow GvRow in GVSolicitudesPendientes.Rows) + foreach (GridViewRow GvRow in GVSolicitudesPendientes.Rows) { int CveSolicitudActual = GvRow.DataKey("CveSolicitud").ToEntero(); @@ -278,12 +280,12 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas var ResultadoVerificaionOK = false; var SeVerifico = false; var TipoMensaje = ModExtensiones.TipoMensaje.MsgInformacion; - var ResultadoSolicitudOK = false; - - - var api = new GeneralesAPII(); - - + var ResultadoSolicitudOK = false; + + + var api = new GeneralesAPII(); + + if (idSolicitud.Length == 0) { JToken ObjApiSolicitud = (JToken)api.GeneraSolicitud(UsuarioActual.CveEmpresa, CveTipoSolicitud, CveSolicitudActual); @@ -307,13 +309,13 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas resultSolicitud.Add(""); ResultadoSolicitudOK = true; - } - - - + } + + + if (ResultadoSolicitudOK) - { - + { + JToken ObjApiVerificacion = (JToken)api.VerificaSolicitudesNominas(UsuarioActual.CveEmpresa, CveTipoSolicitud, CveSolicitudActual); @@ -330,21 +332,21 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas } else - { - - if(resultSolicitud.Count == 4) + { + + if (resultSolicitud.Count == 4) { sbResultado.Append($"({resultSolicitud[1]})
Folio:{Folio}
"); } else { sbResultado.Append($"Solicitud pendiente de verificar en SAT
Folio:{Folio}
"); - } - - TipoMensaje = ModExtensiones.TipoMensaje.MsgAdvertencia; - } - - + } + + TipoMensaje = ModExtensiones.TipoMensaje.MsgAdvertencia; + } + + if (SeVerifico && resultVerificacion.Count == 4) { if (ResultadoVerificaionOK) @@ -358,28 +360,28 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas } } else - { + { sbResultado.Append($"Se presento un error al verificar la solicitud
Folio: {Folio}."); TipoMensaje = ModExtensiones.TipoMensaje.MsgAdvertencia; } Alert(sbResultado.ToString(), TipoMensaje); - } - - - - - + } + + + + + cargasolicitudes(); } - catch(Exception ex) + catch (Exception ex) { Alert(ex.StackTrace); - } - - - + } + + + } protected void LnkAgregarSolictud_Click(object sender, EventArgs e) @@ -394,33 +396,79 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas protected void GvResumen_RowDataBound(object sender, GridViewRowEventArgs e) { - if(e.Row.RowType == DataControlRowType.DataRow) - { - if(e.Row.DataKey("Fecha") == "") - { - // e.Row.Cells[0].Text = "Total"; - e.Row.Attributes.Add("class", "Totales"); - - } + if (e.Row.RowType == DataControlRowType.DataRow) + { + if (e.Row.DataKey("Fecha") == "") + 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"); } } protected void GvDatos_RowDataBound(object sender, GridViewRowEventArgs e) { - if(e.Row.RowType == DataControlRowType.DataRow) - { - - - if (e.Row.DataKey("UUID") == "Totales") - { - e.Row.Font.Bold = true; + if (e.Row.RowType == DataControlRowType.DataRow) + { + + + if (e.Row.DataKey("UUID") == "Totales") + { + e.Row.Font.Bold = true; e.Row.Cells[1].Text = e.Row.DataKey("CountRegistrosSIG"); - e.Row.Cells[2].Text = e.Row.DataKey("CountRegistrosSAT"); + e.Row.Cells[2].Text = e.Row.DataKey("CountRegistrosSAT"); e.Row.Attributes.Add("class", "Totales"); } - if(e.Row.DataKey("UUID").ToUpper() != "TOTALES") + if (e.Row.DataKey("UUID").ToUpper() != "TOTALES") { StringBuilder SBMsgToolTip = new StringBuilder(); @@ -446,26 +494,27 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas SBMsgToolTip.AppendLine("Comprobante no se encuentra en descargas de SAT.
"); } } - else { + else + { if (e.Row.DataKey("DifImporte").ToDecimal() != 0) { - SBMsgToolTip.AppendLine($" Diferencia importes {e.Row.DataKey("DifImporte").ToDecimal().ToString("###,###,###.00")}"); + SBMsgToolTip.AppendLine($" Diferencia importes {e.Row.DataKey("DifImporte").ToDecimal().ToString("###,###,###.00")}"); } if (e.Row.DataKey("Abreviatura").ToUpper() != e.Row.DataKey("CBTMoneda").ToUpper()) - { + { SBMsgToolTip.AppendLine($"Diferencia en monedas."); } - } - + } + if (SBMsgToolTip.ToString().Length > 0) { e.Row.Attributes.Add("title", SBMsgToolTip.ToString()); } LinkButton LnkCFDIData = e.Row.FCLinkButton("LnkCFDIData"); - if((e.Row.DataKey("CFDIData").ToUpper() == "SI")) - { + if ((e.Row.DataKey("CFDIData").ToUpper() == "SI")) + { ScriptManager.GetCurrent(this).RegisterPostBackControl(LnkCFDIData); LnkCFDIData.CssClass = "Texto"; } @@ -483,8 +532,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas } if (e.Row.RowType == DataControlRowType.Header) - { - + { + e.Row.Cells[1].BackColor = System.Drawing.Color.FromName("#3598dc"); //Azul e.Row.Cells[2].BackColor = System.Drawing.Color.FromName("#C46B06"); //Rojo @@ -513,9 +562,9 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas e.Row.Cells[14].BackColor = System.Drawing.Color.FromName("#C46B06"); //Rojo e.Row.Cells[15].BackColor = System.Drawing.Color.FromName("#C46B06"); //Rojo e.Row.Cells[16].BackColor = System.Drawing.Color.FromName("#C46B06"); //Rojo - e.Row.Cells[17].BackColor = System.Drawing.Color.FromName("#C46B06"); //Rojo - - + e.Row.Cells[17].BackColor = System.Drawing.Color.FromName("#C46B06"); //Rojo + + e.Row.Cells[1].ForeColor = System.Drawing.Color.FromName("white"); e.Row.Cells[2].ForeColor = System.Drawing.Color.FromName("white"); @@ -531,7 +580,7 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas e.Row.Cells[12].ForeColor = System.Drawing.Color.FromName("white"); e.Row.Cells[13].ForeColor = System.Drawing.Color.FromName("white"); e.Row.Cells[14].ForeColor = System.Drawing.Color.FromName("white"); - e.Row.Cells[15].ForeColor = System.Drawing.Color.FromName("white"); + 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"); @@ -541,9 +590,9 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas protected void LnkDescargaXML_Click(object sender, EventArgs e) { - GridViewRow GvRow = (GridViewRow)((LinkButton)sender).NamingContainer; - - var UrlDescarga = $"{UsuarioActual.Empresa.Ruta}NomXMLSAT\\Descargas\\{GvRow.DataKey("ArchivoXML")}"; + GridViewRow GvRow = (GridViewRow)((LinkButton)sender).NamingContainer; + + var UrlDescarga = $"{UsuarioActual.Empresa.Ruta}NomXMLSAT\\Descargas\\{GvRow.DataKey("ArchivoXML")}"; var Archivo = new System.IO.FileInfo(UrlDescarga); @@ -556,8 +605,8 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas Response.Flush(); Response.TransmitFile(Archivo.FullName); Response.End(); - } - + } + } protected void GVSolicitudesNominas_RowDataBound(object sender, GridViewRowEventArgs e) @@ -567,9 +616,10 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas { if (e.Row.DataKey("ArchivoXML").Length > 0) { - var UrlDescarga = $"{UsuarioActual.Empresa.Ruta}NomXMLSAT\\Descargas\\{e.Row.DataKey("ArchivoXML")}"; - - if (System.IO.File.Exists(UrlDescarga)){ + var UrlDescarga = $"{UsuarioActual.Empresa.Ruta}NomXMLSAT\\Descargas\\{e.Row.DataKey("ArchivoXML")}"; + + if (System.IO.File.Exists(UrlDescarga)) + { LinkButton LnkDescargaXML = e.Row.FCLinkButton("LnkDescargaXML"); ScriptManager.GetCurrent(this).RegisterPostBackControl(LnkDescargaXML); LnkDescargaXML.Visible = true; @@ -601,9 +651,9 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas IEnumerable files = DirInfo.EnumerateFiles(); foreach (var f in files) - { - - if(f.Extension.ToUpper() == ".XML") + { + + if (f.Extension.ToUpper() == ".XML") { string UUID = ""; System.Xml.XmlDocument XMLDoc = new System.Xml.XmlDocument(); @@ -654,18 +704,20 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas node = XMLDoc.SelectSingleNode(string.Format("//{0}:Emisor", Prefijo), namespaces); System.Xml.XmlNode nodeComp = XMLDoc.SelectSingleNode(string.Format("//{0}:Complemento", Prefijo), namespaces); - if (node != null ) + if (node != null) { System.Xml.XmlNode nodeTFD = nodeComp.SelectSingleNode(string.Format("//{0}:TimbreFiscalDigital", "tfd"), namespaces); UUID = ValorXML(nodeTFD, "UUID", ""); - } - + } + 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); } @@ -698,14 +750,14 @@ public partial class SAT_SolicitudesIngresoSat : ClsPaginas GridViewRow GvRow = (GridViewRow)((LinkButton)sender).NamingContainer; var CveSolicitudDetalle = GvRow.DataKey("CveSolicitudDetalle").ToEntero(); var UrlDirectorio = $"{UsuarioActual.Empresa.Ruta}DescargasSATXML\\Ingresos\\{CveSolicitudDetalle}"; - CargaComprobanteXML(UrlDirectorio, CveSolicitudDetalle); - + CargaComprobanteXML(UrlDirectorio, CveSolicitudDetalle); + } protected void LnkCFDIData_Click(object sender, EventArgs e) { - GridViewRow GvRow = (GridViewRow)((LinkButton)sender).NamingContainer; - + GridViewRow GvRow = (GridViewRow)((LinkButton)sender).NamingContainer; + var CveSolicitudDetalle = GvRow.DataKey("CveSolicitudDetalle"); var UrlDescargaXML = $"{UsuarioActual.Empresa.Ruta}DescargasSATXML\\Ingresos\\{CveSolicitudDetalle}\\{GvRow.DataKey("UUID")}.XML"; diff --git a/SAT/SolicitudesRecibidasSAT.aspx b/SAT/SolicitudesRecibidasSAT.aspx index 9d443aa3f..f171acc85 100644 --- a/SAT/SolicitudesRecibidasSAT.aspx +++ b/SAT/SolicitudesRecibidasSAT.aspx @@ -499,6 +499,12 @@ + + + + + + diff --git a/SAT/SolicitudesRecibidasSAT.aspx.vb b/SAT/SolicitudesRecibidasSAT.aspx.vb index ed74f3fba..6bc7df485 100644 --- a/SAT/SolicitudesRecibidasSAT.aspx.vb +++ b/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) From ef118343cef5c307991f6e86a44c337f77e37105 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Tue, 27 Jun 2023 16:22:11 -0700 Subject: [PATCH 5/8] Cambios en visualizacion de columnas --- Contabilidad/RepIVA.aspx | 63 +++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/Contabilidad/RepIVA.aspx b/Contabilidad/RepIVA.aspx index 037361476..83aa1d70b 100644 --- a/Contabilidad/RepIVA.aspx +++ b/Contabilidad/RepIVA.aspx @@ -137,7 +137,7 @@ - + @@ -146,9 +146,9 @@ - + - + @@ -208,16 +208,57 @@ - + - - - + <%-- --%> + + + SubTotal
16% + + + + + + <%-- --%> + + + SubTotal
8% + + + + + + <%-- --%> + + + SubTotal
0% + + + + + <%----%> - - + <%----%> + + + IVA ND
16% + + + + + + + + IVA ND
8% + + + + + + <%-- --%> + @@ -234,7 +275,7 @@ - + @@ -255,7 +296,7 @@
-
+

IVA por Porcentaje

From 2ec46c090065c3001a9a81b9d7a82028f7fc1517 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Wed, 28 Jun 2023 02:28:22 -0700 Subject: [PATCH 6/8] inventarios unidades agregar marca color --- App_Code/ClsInventarios.vb | 13 ++++++++++--- Inventarios/CatUnidades.aspx | 21 ++++++++++++++++++++- Inventarios/CatUnidades.aspx.vb | 13 ++++++++++--- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index 8da82fc41..823f6d5c7 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -3,6 +3,7 @@ Option Strict On Imports System.Data Imports System.Data.SqlClient Imports Extensiones +Imports Microsoft.Web.XmlTransform Public Class ClsInventarios Implements IDisposable @@ -148,7 +149,7 @@ Public Class ClsInventarios Public ReadOnly Property DataSetResultados() As DataSet Get - DataSetResultados = DataSet + DataSetResultados = Dataset End Get End Property @@ -5630,7 +5631,8 @@ Public Class ClsInventarios Public Function AddCamiones(Placa As String, Especificacion As String, CveEmpresa As Integer, CveConfigAutoTransporte As Integer, Anio As Integer, CveTipoPermisoSCT As Integer, NumPermisoSCT As String, NombreAseguradora As String, NumPolizaSeguro As String, CveUsuario As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = 1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", - Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1) As Boolean + Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1, + Optional Marca As String = "", Optional Color As String = "") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesAdd") @@ -5658,6 +5660,8 @@ Public Class ClsInventarios .Add("@NumeroTrailer", SqlDbType.VarChar).Value = NumeroTrailer .Add("@Estatus", SqlDbType.Bit).Value = Estatus .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor + .Add("@Marca", SqlDbType.VarChar).Value = Marca + .Add("@Color", SqlDbType.VarChar).Value = Color End With Try SqlAdapter.Fill(Data) @@ -5691,7 +5695,8 @@ Public Class ClsInventarios Public Function UpdateCamiones(CveCamion As Integer, Placa As String, Especificacion As String, CveConfigAutoTransporte As Integer, Anio As Integer, CveTipoPermisoSCT As Integer, NumPermisoSCT As String, NombreAseguradora As String, NumPolizaSeguro As String, CveUsuario As Integer, CveEmpresa As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = -1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", - Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1) As Boolean + Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1, + Optional Marca As String = "", Optional Color As String = "") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesUpdate") With SqlAdapter.SelectCommand.Parameters @@ -5719,6 +5724,8 @@ Public Class ClsInventarios .Add("@NumeroTrailer", SqlDbType.VarChar).Value = NumeroTrailer .Add("@Estatus", SqlDbType.Bit).Value = Estatus .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor + .Add("@Marca", SqlDbType.VarChar).Value = Marca + .Add("@Color", SqlDbType.VarChar).Value = Color End With Try SqlAdapter.Fill(Data) diff --git a/Inventarios/CatUnidades.aspx b/Inventarios/CatUnidades.aspx index 6da00699e..aec32d5ad 100644 --- a/Inventarios/CatUnidades.aspx +++ b/Inventarios/CatUnidades.aspx @@ -32,7 +32,7 @@ @@ -42,6 +42,8 @@ + + @@ -248,7 +250,24 @@
+ +
+
+
+ + + +
+
+
+
+ + + +
+
+
diff --git a/Inventarios/CatUnidades.aspx.vb b/Inventarios/CatUnidades.aspx.vb index f2c2a8f17..ecb00f46f 100644 --- a/Inventarios/CatUnidades.aspx.vb +++ b/Inventarios/CatUnidades.aspx.vb @@ -1,4 +1,6 @@ Imports Extensiones +Imports Stimulsoft.Report.StiOptions.Export + Partial Class Inventarios_CatUnidades Inherits ClsPaginas @@ -109,6 +111,8 @@ Partial Class Inventarios_CatUnidades TxtNumeroTrailer.Text = "" TxtSCAC.Text = "" TxtCAAT.Text = "" + TxtMarca.Text = "" + TxtColor.Text = "" ChkEstatus.Checked = False RdTipoUnidad.SelectedValue = "1" @@ -153,6 +157,8 @@ Partial Class Inventarios_CatUnidades TxtLineaTransportacion.Text = GvRow.DataKey("LineaTransportacion") TxtSCAC.Text = GvRow.DataKey("SCAC") TxtCAAT.Text = GvRow.DataKey("CAAT") + TxtMarca.Text = GvRow.DataKey("Marca") + TxtColor.Text = GvRow.DataKey("Color") ChkEstatus.Checked = If(Boolean.Parse(GvRow.DataKey("Estatus")), True, False) 'ChkesRemolque.Checked = (GvRow.DataKey("CveTipoCamion") = "2") @@ -207,14 +213,14 @@ Partial Class Inventarios_CatUnidades If CveCamion <= 0 Then If ObjInventarios.AddCamiones(TxtPlacaNuevo.Text, TxtEspecificacionNuevo.Text, UsuarioActual.CveEmpresa, DdlConfigAuto.SelectedValue.ToEntero, TxtAnio.Text.ToEntero(), DdlTipoPermisoSCT.SelectedValue.ToEntero(), TxtNumermisoSCT.Text, TxtNombreAseguradora.Text, TxtNumPolizaSeguro.Text, UsuarioActual.CveUsuario, - TxtNombreAseguradoraMedioAmbiente.Text, TxtNumPolizaSeguroMedioAmbiente.Text, TxtNombreAseguradoraCarga.Text, TxtNumPolizaSeguroCarga.Text, CveTipoCamion, TxtLongitudCaja.Text, TxtLineaTransportacion.Text, TxtSCAC.Text, TxtCAAT.Text, DdlTiposRemolque.SelectedValue.ToEntero(), TxtNumeroTrailer.Text, ChkEstatus.Checked, CveProveedor:=DdlProveedor.SelectedValue) Then + TxtNombreAseguradoraMedioAmbiente.Text, TxtNumPolizaSeguroMedioAmbiente.Text, TxtNombreAseguradoraCarga.Text, TxtNumPolizaSeguroCarga.Text, CveTipoCamion, TxtLongitudCaja.Text, TxtLineaTransportacion.Text, TxtSCAC.Text, TxtCAAT.Text, DdlTiposRemolque.SelectedValue.ToEntero(), TxtNumeroTrailer.Text, ChkEstatus.Checked, CveProveedor:=DdlProveedor.SelectedValue, Color:=TxtColor.Text, Marca:=TxtMarca.Text) Then Alert("Unidad agregada correctamente") Else ErrorPrceso = True End If Else If ObjInventarios.UpdateCamiones(CveCamion, TxtPlacaNuevo.Text, TxtEspecificacionNuevo.Text, DdlConfigAuto.SelectedValue.ToEntero, TxtAnio.Text.ToEntero(), DdlTipoPermisoSCT.SelectedValue.ToEntero(), TxtNumermisoSCT.Text, TxtNombreAseguradora.Text, TxtNumPolizaSeguro.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, - TxtNombreAseguradoraMedioAmbiente.Text, TxtNumPolizaSeguroMedioAmbiente.Text, TxtNombreAseguradoraCarga.Text, TxtNumPolizaSeguroCarga.Text, CveTipoCamion, TxtLongitudCaja.Text, TxtLineaTransportacion.Text, TxtSCAC.Text, TxtCAAT.Text, DdlTiposRemolque.SelectedValue.ToEntero(), TxtNumeroTrailer.Text, ChkEstatus.Checked, CveProveedor:=DdlProveedor.SelectedValue) Then + TxtNombreAseguradoraMedioAmbiente.Text, TxtNumPolizaSeguroMedioAmbiente.Text, TxtNombreAseguradoraCarga.Text, TxtNumPolizaSeguroCarga.Text, CveTipoCamion, TxtLongitudCaja.Text, TxtLineaTransportacion.Text, TxtSCAC.Text, TxtCAAT.Text, DdlTiposRemolque.SelectedValue.ToEntero(), TxtNumeroTrailer.Text, ChkEstatus.Checked, CveProveedor:=DdlProveedor.SelectedValue, Color:=TxtColor.Text, Marca:=TxtMarca.Text) Then Alert("Unidad actualizada correctamente") Else ErrorPrceso = True @@ -256,7 +262,7 @@ Partial Class Inventarios_CatUnidades DVTiposRemolque.Visible = False 'DVLongitudCaja.Visible = False - + DivMarcaColor.Visible = True DVTiposRemolque.Visible = False Else @@ -270,6 +276,7 @@ Partial Class Inventarios_CatUnidades 'DVLineaTransportacion.Visible = False 'DVSCACCAAT.Visible = False + DivMarcaColor.Visible = False DVTiposRemolque.Visible = True 'DVLongitudCaja.Visible = True From 87f727d4b8e1399b7703e60b4b30d4c0b21fa62a Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 28 Jun 2023 08:21:37 -0700 Subject: [PATCH 7/8] =?UTF-8?q?--=20que=20entre=20a=20la=20p=C3=A1gina=20p?= =?UTF-8?q?rovisionalmente=20sin=20importar=20el=20tipo=20conta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Contabilidad2/RepAnexoCatalogo.aspx.vb | 6 +++--- Contabilidad2/RepMovimientosAuxiliaresCatalogo.aspx.vb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Contabilidad2/RepAnexoCatalogo.aspx.vb b/Contabilidad2/RepAnexoCatalogo.aspx.vb index 8d064fb20..b22362481 100644 --- a/Contabilidad2/RepAnexoCatalogo.aspx.vb +++ b/Contabilidad2/RepAnexoCatalogo.aspx.vb @@ -82,9 +82,9 @@ Partial Class AC2_RepAnexoCatalogo Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not Page.IsPostBack Then - If UsuarioActual.Empresa.TipoContabilidad = 2 AndAlso UsuarioActual.CveEmpresa <> 119 Then - Response.Redirect($"/Contabilidad/RepAnexoCatalogo.aspx") - End If + 'If UsuarioActual.Empresa.TipoContabilidad = 2 AndAlso UsuarioActual.CveEmpresa <> 119 Then + ' Response.Redirect($"/Contabilidad/RepAnexoCatalogo.aspx") + 'End If Dim ErrorParametros = True DtDatos = Nothing diff --git a/Contabilidad2/RepMovimientosAuxiliaresCatalogo.aspx.vb b/Contabilidad2/RepMovimientosAuxiliaresCatalogo.aspx.vb index 8ad1afab7..f5a336676 100644 --- a/Contabilidad2/RepMovimientosAuxiliaresCatalogo.aspx.vb +++ b/Contabilidad2/RepMovimientosAuxiliaresCatalogo.aspx.vb @@ -97,9 +97,9 @@ Partial Class Conta_RepMovimientosAuxiliaresCatalogo Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not Page.IsPostBack Then - If UsuarioActual.Empresa.TipoContabilidad = 2 AndAlso UsuarioActual.CveEmpresa <> 119 Then - Response.Redirect($"/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx") - End If + 'If UsuarioActual.Empresa.TipoContabilidad = 2 AndAlso UsuarioActual.CveEmpresa <> 119 Then + ' Response.Redirect($"/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx") + 'End If Dim ErrorParametros = True From 6880840885ef6823fa11888c9097e9a0485ab8fa Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 29 Jun 2023 10:25:13 -0700 Subject: [PATCH 8/8] -- cambio en nombre. del archivo de descarga de universo de productos. -- cambio de texto Varras a Barras --- Inventarios/InventarioFisicoDetalle.aspx | 6 +++--- Inventarios/InventarioFisicoDetalle.aspx.vb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Inventarios/InventarioFisicoDetalle.aspx b/Inventarios/InventarioFisicoDetalle.aspx index b5d900cdb..53d938d26 100644 --- a/Inventarios/InventarioFisicoDetalle.aspx +++ b/Inventarios/InventarioFisicoDetalle.aspx @@ -208,7 +208,7 @@
- +
@@ -223,10 +223,10 @@
- +
- +
diff --git a/Inventarios/InventarioFisicoDetalle.aspx.vb b/Inventarios/InventarioFisicoDetalle.aspx.vb index 0848c497a..6bee3fa74 100644 --- a/Inventarios/InventarioFisicoDetalle.aspx.vb +++ b/Inventarios/InventarioFisicoDetalle.aspx.vb @@ -687,13 +687,13 @@ Partial Class Inventarios_InventarioFisicoDetalle worksheet.Columns(i).AutoFit(1, worksheet.Rows(0), worksheet.Rows(worksheet.Rows.Count - 1)) Next - NombreArchivo = "Productos" + NombreArchivo = "Productos-" + lbTitulo.Text workbook.Save(Response, $"{NombreArchivo}.xlsx", SaveOptions.XlsxDefault) End Sub #End Region - Protected Sub BtnBuscarCodVarras_Click(sender As Object, e As EventArgs) - Dim CodigoBarras As String = If(TxtConCodigoVarras.Text.Trim <> "", TxtConCodigoVarras.Text.Trim, "-1").Replace("'", "''") + Protected Sub BtnBuscarCodBarras_Click(sender As Object, e As EventArgs) + Dim CodigoBarras As String = If(TxtConCodigoBarras.Text.Trim <> "", TxtConCodigoBarras.Text.Trim, "-1").Replace("'", "''") LblContador.Text = "No se encontraron resultados" Using Inventarios As New ClsInventarios If Inventarios.GetInventarioFisicoContador(CveInventarioFisico, ddlUsuario.SelectedValue.ToString.ToEntero, CodigoBarras) Then