From f3e6d01590ed6210d3e21d342e68127d6f10f2bf Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 2 Jun 2020 08:13:28 -0700 Subject: [PATCH] -- cambio guias --- App_Code/ClsPaginas.vb | 3 ++- App_Code/ClsVentas.vb | 4 +++- App_Code/modExtensiones.vb | 7 +++++++ Inventarios/EntregaAlmacen.aspx | 12 +++++++----- Inventarios/EntregaAlmacen.aspx.vb | 1 + 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index fd1b013bf..7ae8d56ae 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -4262,13 +4262,14 @@ Public Class ClsPaginas PaginaDict.Add("/General/CatDiasInhabiles.aspx".ToUpper(), 429) PaginaDict.Add("/General/CatTipoCambio.aspx".ToUpper(), 642) PaginaDict.Add("/General/PopUpPaqueteriasGuias.aspx".ToUpper(), 659) + PaginaDict.Add("/General/PopUpPaqueteriasGuiasInternas.aspx".ToUpper(), 659) PaginaDict.Add("/General/CatPaqueterias.aspx".ToUpper(), 665) PaginaDict.Add("/General/CatDocumentacionTipo.aspx".ToUpper(), -1) PaginaDict.Add("/General/CatModelos.aspx".ToUpper(), 710) PaginaDict.Add("/General/CatRinTamanios.aspx".ToUpper(), 711) PaginaDict.Add("/General/CatMedidas.aspx".ToUpper(), 712) PaginaDict.Add("/General/CatSatListado69B.aspx".ToUpper, 1038) - PaginaDict.Add("/General/PopUpPaqueteriasGuiasInternas.aspx".ToUpper(), 727) + #End Region #Region "GPS" diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 109597599..130483e9c 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -339,7 +339,8 @@ Public Class ClsVentas Optional ObservacionesAlmacen As String = "", Optional CveSubProyecto As Integer = -1, Optional CveSubProyectoEjecucion As Integer = -1, Optional CveSubProyectoCobranza As Integer = -1, Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1, Optional CveUsoCFDI As Integer = -1, Optional OrdenCompra As String = "-1", Optional CveCuentaTerminal As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ImpuestoLocal As Double = 0, Optional CveTipoAmortizacionAnticipo As Integer = -1, Optional CveVentaRelacion As Integer = -1, Optional ImporteRelacion As Decimal = -1, Optional CveEmpresaCRM As Integer = -1, Optional EsInterno As Integer = -1, Optional CveAcercamientoCRM As Integer = -1, - Optional DiasCredito As Integer = 0, Optional EsDiasCreditoFijo As Boolean = False, Optional AnticipoEspecial As Boolean = False, Optional Kilometraje As Double = 0, Optional EsAmortizacion As Boolean = False, Optional CveTipoRetencion As Integer = 0) As Boolean + Optional DiasCredito As Integer = 0, Optional EsDiasCreditoFijo As Boolean = False, Optional AnticipoEspecial As Boolean = False, Optional Kilometraje As Double = 0, Optional EsAmortizacion As Boolean = False, Optional CveTipoRetencion As Integer = 0, + Optional CorreoNotificacion As String = "") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_VentasAdd") @@ -428,6 +429,7 @@ Public Class ClsVentas .Add("@Kilometraje", SqlDbType.Float).Value = Kilometraje .Add("@EsAmortizacion", SqlDbType.Bit).Value = EsAmortizacion .Add("@CveTipoRetencion", SqlDbType.TinyInt).Value = CveTipoRetencion + .Add("@CorreoNotificacion", SqlDbType.VarChar).Value = CorreoNotificacion .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue End With diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index 1b799cb7d..2032e20f1 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -544,6 +544,8 @@ Namespace Extensiones Alert("", String.Format("{0} code[FilesMove]", ex.Message), TipoMensaje.MsgAdvertencia) retorno = False End Try + directorioOld.Clear() + directorioNew.Clear() Return retorno End Function @@ -2044,6 +2046,8 @@ Namespace Extensiones HttpContext.Current.Response.Write(style.ToString) HttpContext.Current.Response.Write(sb.ToString()) HttpContext.Current.Response.End() + sb.Clear() + style.Clear() End If End Sub @@ -2076,6 +2080,8 @@ Namespace Extensiones HttpContext.Current.Response.Write(style.ToString) HttpContext.Current.Response.Write(sb.ToString()) HttpContext.Current.Response.End() + sb.Clear() + style.Clear() End Sub Public Sub ExportToExcel(datatable As DataTable, NombreArchivoXLSX As String) @@ -2284,6 +2290,7 @@ Namespace Extensiones HttpContext.Current.Response.Write(style.ToString) HttpContext.Current.Response.Write(pdfDoc) HttpContext.Current.Response.[End]() + style.Clear() End Using End Using End Sub diff --git a/Inventarios/EntregaAlmacen.aspx b/Inventarios/EntregaAlmacen.aspx index 70313db73..d42579ec8 100644 --- a/Inventarios/EntregaAlmacen.aspx +++ b/Inventarios/EntregaAlmacen.aspx @@ -238,11 +238,13 @@ -
- - - -
+ + + + + + + diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb index f5b2187dc..a94f1ef46 100644 --- a/Inventarios/EntregaAlmacen.aspx.vb +++ b/Inventarios/EntregaAlmacen.aspx.vb @@ -318,6 +318,7 @@ Partial Class Inventarios_EntregaAlmacen DdlSubProyectos.SelectedValueExist(UsuarioActual.CveSubProyecto.ToString) If UsuarioActual.TienePermisoProceso(152) Then DdlSubProyectos.Enabled = False + If UsuarioActual.Empresa.Funcionalidad(280) = "1" Then PnlEntrega.Visible = True CreaDtDetalle() CreaDtDetalleLote()