From b85e002c3ee8e4b6c3ff19bd1dc12d9a82322440 Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 23 Sep 2020 12:19:54 -0700 Subject: [PATCH 1/9] -- consideraciones de serie,seccion,lote, caducidad --- Inventarios/ResguardoMaterial.aspx.vb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Inventarios/ResguardoMaterial.aspx.vb b/Inventarios/ResguardoMaterial.aspx.vb index 460a99f76..320899cee 100644 --- a/Inventarios/ResguardoMaterial.aspx.vb +++ b/Inventarios/ResguardoMaterial.aspx.vb @@ -346,6 +346,11 @@ Partial Class Inventarios_ResguardoMaterial ThSerie.Visible = True TrSerie.Visible = True TxtnSerie.Visible = True + Else + ThSerie.Visible = False + TrSerie.Visible = False + TxtnSerie.Visible = False + TxtnSerie.Text = "" End If 'activa seccion @@ -368,13 +373,19 @@ Partial Class Inventarios_ResguardoMaterial If CBool(drp("AplicaLote")) Then ThLote.Visible = True TrLote.Visible = True - 'TxtLote.Visible = True + Else + ThLote.Visible = False + TrLote.Visible = False + TxtLote.Text = "" End If 'activa caducidad If CBool(drp("AplicaCaducidad")) Then ThCaducidad.Visible = True TrCaducidad.Visible = True - 'TxtCaducidad.Visible = True + Else + ThCaducidad.Visible = False + TrCaducidad.Visible = False + TxtCaducidad.Text = "" End If Else From 9c03c14097bedf8978e6a564b3bc0610f0bcc66c Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Wed, 23 Sep 2020 19:25:14 -0700 Subject: [PATCH 2/9] BITACORA PARA MODIFICACIONES A PREPOLIZAS Y PREPOLIZAS DETALLE --- App_Code/ClsGenerales.vb | 3 ++- App_Code/ClsMovimientos.vb | 26 +++++++++++----------- Contabilidad/RegPrePoliza.aspx | 36 +++++++++++++++++++++++++++++++ Contabilidad/RegPrePoliza.aspx.vb | 11 ++++++++++ Ventas/Ventas.aspx.vb | 10 +++++++++ 5 files changed, 72 insertions(+), 14 deletions(-) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 69f64de00..2b82c5a1b 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -2410,7 +2410,7 @@ Public Class ClsGenerales Public Function GetHistorialBitacora(CveAcarreo As Integer, CveOrdenCompra As Integer, CveActivoFijo As Integer, CveOS As Integer, CvePS As Integer, CveCompra As Integer, CveIE As Integer, CveEmpresa As Integer, Optional CveUsuario As Integer = -1, Optional CvePersonal As Integer = -1, - Optional IdPoliza As Integer = -1) As Boolean + Optional IdPoliza As Integer = -1, Optional CvePrePoliza As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_HistorialBitacoraGet") @@ -2422,6 +2422,7 @@ Public Class ClsGenerales .Add("@CvePS", SqlDbType.Int).Value = CvePS .Add("@CveCompra", SqlDbType.Int).Value = CveCompra .Add("@CveIE", SqlDbType.Int).Value = CveIE + .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal diff --git a/App_Code/ClsMovimientos.vb b/App_Code/ClsMovimientos.vb index 845ac3d6b..836be534b 100644 --- a/App_Code/ClsMovimientos.vb +++ b/App_Code/ClsMovimientos.vb @@ -319,7 +319,7 @@ Public Class ClsMovimientos End Function Public Function GetCxCDetalle(FechaI As String, FechaF As String, CveCliente As Integer, CveSubProyecto As Integer, CveVendedor As Integer, CveUsuario As Integer, Anio As Integer, Mes As Integer, - AnioMes As String, Fecha As String, CveClienteSucursal As Integer, Opcion As String, CveEstatus As Integer, IVA As String, Agrupador As Integer, CveEmpresa As Integer, + AnioMes As String, Fecha As String, CveClienteSucursal As Integer, Opcion As String, CveEstatus As Integer, IVA As String, Agrupador As Integer, CveEmpresa As Integer, CveResponsable As Integer, TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional TipoDocto As String = "-1", Optional FechaVI As String = "-1", Optional FechaVF As String = "1", Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveCobranzaEstatus As Integer = -1, Optional CveClienteClasificacion As Integer = -1, Optional LimiteCredito As Decimal = -1, @@ -361,10 +361,10 @@ Public Class ClsMovimientos .Add("@CveCobranzaEstatus", SqlDbType.Int).Value = CveCobranzaEstatus .Add("@CveClienteClasificacion", SqlDbType.Int).Value = CveClienteClasificacion .Add("@LimiteCredito", SqlDbType.Float).Value = LimiteCredito - .Add("@TipoCliente", SqlDbType.Int).Value = TipoCliente - .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda - .Add("@EstatusCliente", SqlDbType.Int).Value = EstatusCliente - + .Add("@TipoCliente", SqlDbType.Int).Value = TipoCliente + .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda + .Add("@EstatusCliente", SqlDbType.Int).Value = EstatusCliente + End With Try @@ -545,7 +545,7 @@ Public Class ClsMovimientos - Try + Try SqlAdapter.SelectCommand.CommandTimeout = 0 SqlAdapter.Fill(Data) @@ -863,8 +863,8 @@ Public Class ClsMovimientos DataAdapter("PA_Banc_ReporteChequesFYEGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@FechaI", SqlDbType.DateTime).Value = FechaI + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@FechaI", SqlDbType.DateTime).Value = FechaI .Add("@FechaF", SqlDbType.DateTime).Value = FechaF End With @@ -1190,9 +1190,9 @@ Public Class ClsMovimientos Public Function GetCxPDetalle(FechaI As String, FechaF As String, CveProveedor As Integer, CveProveedorClasificacion As Integer, CveProveedorSucursal As Integer, CveUsuario As Integer, CveUsuarioResponsable As Integer, Anio As Integer, Mes As Integer, AnioMes As String, CveMoneda As Integer, CveSubProyecto As Integer, - CveEstatusFactura As Integer, Fecha As String, Agrupador As Integer, Opcion As String, CveEmpresa As Integer, CveSucursal As Integer, - TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional FechaVI As String = "-1", Optional FechaVF As String = "1", - Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveTipoProveedor As Integer = -1, + CveEstatusFactura As Integer, Fecha As String, Agrupador As Integer, Opcion As String, CveEmpresa As Integer, CveSucursal As Integer, + TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional FechaVI As String = "-1", Optional FechaVF As String = "1", + Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveTipoProveedor As Integer = -1, Optional Comprobaciones As Integer = -1, Optional AplicaNC As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1292,8 +1292,8 @@ Public Class ClsMovimientos .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@CveCajaChica", SqlDbType.Int).Value = CveCajaChica - .Add("@NumeroReembolso", SqlDbType.VarChar).Value = NumeroReembolso - .Add("@FechaI", SqlDbType.DateTime).Value = FechaI + .Add("@NumeroReembolso", SqlDbType.VarChar).Value = NumeroReembolso + .Add("@FechaI", SqlDbType.DateTime).Value = FechaI .Add("@FechaF", SqlDbType.DateTime).Value = FechaF End With diff --git a/Contabilidad/RegPrePoliza.aspx b/Contabilidad/RegPrePoliza.aspx index 691ac28d4..734a5ec1a 100644 --- a/Contabilidad/RegPrePoliza.aspx +++ b/Contabilidad/RegPrePoliza.aspx @@ -497,6 +497,42 @@ + + +
+
+
+
+
+ + Historial de Modificación +
+
+
+
+
+
+
+ + + + Fecha + + + + + + + + + + +
+
+
+
+ +