diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb
index e7a7280d6..4e1c5e4f6 100644
--- a/App_Code/ClsClientes.vb
+++ b/App_Code/ClsClientes.vb
@@ -391,8 +391,8 @@ Public Class ClsClientes
_CveUsoCFDI = Data(0)("CveUsoCFDI").ToString.ToEntero
- _CveFormaPago33 = Data(0)("CveFormaPago33").ToString.ToEntero
- _CveMetodoPago33 = Data(0)("CveMetodoPago33").ToString.ToEntero
+ _CveFormaPago33 = Data(0)("CveFormaPago").ToString.ToEntero
+ _CveMetodoPago33 = Data(0)("CveMetodoPago").ToString.ToEntero
_CveRegimenFiscal = Data(0)("CveRegimenFiscal").ToString.ToEntero
@@ -576,6 +576,8 @@ Public Class ClsClientes
Return Retorno
End Function
+
+
Public Function AddCliente(Nombre As String, NombreComercial As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, Estado As String, Pais As String, RFC As String, CP As String, Telefono As String,
Contacto As String, Mail As String, MailCotizacion As String, Notificar As String, Pagina As String, Giro As String, CvePrecioLista As Integer, EnviarFactura As Boolean, RetIVA As Double, RetISR As Double,
RetieneIVAFletes As Boolean, CveUsuario As Integer, CveEmpresa As Integer, NombreCorto As String, CveVendedor As Integer, PlazoCobranza As Integer, PlazoCobranzaRemision As Integer, RecepcionPagos As String, TipoPago As String,
@@ -587,7 +589,7 @@ Public Class ClsClientes
Optional CveClienteClasificacion As Integer = -1, Optional CveUsuarioResponsable As Integer = -1,
Optional CveCondicionEntrega As Integer = -1, Optional ImprimeNombreSucursal As Boolean = True, Optional CveZonaHoraria As Integer = -1, Optional CobranzaContacto As String = "-1", Optional CobranzaTelefono As String = "-1", Optional CobranzaExt As String = "-1", Optional CobranzaCorreo As String = "-1",
Optional Horario As String = "-1", Optional PortalFacturacion As String = "-1", Optional Documentacion As String = "-1", Optional DiasEspecifico As String = "-1", Optional UsuarioPortal As String = "-1", Optional ContraseñaPortal As String = "-1", Optional DiasRevision As String = "-1",
- Optional ObservacionRevsion As String = "-1", Optional ReferenciaFiscal As String = "-1", Optional Celular As String = "-1", Optional ExtOtros As String = "-1", Optional CveUsoCFDI As Integer = -1, Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1, Optional DesglosaIEPS As Boolean = True,
+ Optional ObservacionRevsion As String = "-1", Optional ReferenciaFiscal As String = "-1", Optional Celular As String = "-1", Optional ExtOtros As String = "-1", Optional CveUsoCFDI As Integer = -1, Optional CveFormaPago As Integer = -1, Optional CveMetodoPago As Integer = -1, Optional DesglosaIEPS As Boolean = True,
Optional AplicaComercioExterior As Boolean = False, Optional CveTipoOperacion As Integer = -1, Optional CvePedimento As Integer = -1, Optional CveIncoterm As Integer = -1, Optional CvePais As Integer = -1, Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1, Optional CveColonia As Integer = -1,
Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False,
Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0,
@@ -694,8 +696,8 @@ Public Class ClsClientes
.Add("@ExtOtros", SqlDbType.VarChar).Value = ExtOtros
.Add("@CveUsoCFDI", SqlDbType.Int).Value = CveUsoCFDI
- .Add("@CveFormaPago33", SqlDbType.Int).Value = CveFormaPago33
- .Add("@CveMetodoPago33", SqlDbType.Int).Value = CveMetodoPago33
+ .Add("@CveFormaPago", SqlDbType.Int).Value = CveFormaPago
+ .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago
.Add("@CveClienteCorporativo", SqlDbType.Int).Value = CveClienteCorporativo
@@ -785,7 +787,7 @@ Public Class ClsClientes
Optional CveClienteClasificacion As Integer = -1, Optional CveUsuarioResponsable As Integer = -1, Optional CveCondicionEntrega As Integer = -1, Optional ImprimeNombreSucursal As Boolean = True, Optional CveZonaHoraria As Integer = -1,
Optional CobranzaContacto As String = "-1", Optional CobranzaTelefono As String = "-1", Optional CobranzaExt As String = "-1", Optional CobranzaCorreo As String = "-1", Optional Horario As String = "-1", Optional PortalFacturacion As String = "-1",
Optional Documentacion As String = "-1", Optional DiasEspecifico As String = "-1", Optional UsuarioPortal As String = "-1", Optional ContraseñaPortal As String = "-1", Optional DiasRevision As String = "-1",
- Optional ObservacionRevsion As String = "-1", Optional ReferenciaFiscal As String = "-1", Optional Celular As String = "-1", Optional ExtOtros As String = "-1", Optional CveUsoCFDI As Integer = -1, Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1, Optional DesglosaIEPS As Boolean = True,
+ Optional ObservacionRevsion As String = "-1", Optional ReferenciaFiscal As String = "-1", Optional Celular As String = "-1", Optional ExtOtros As String = "-1", Optional CveUsoCFDI As Integer = -1, Optional CveFormaPago As Integer = -1, Optional CveMetodoPago As Integer = -1, Optional DesglosaIEPS As Boolean = True,
Optional AplicaComercioExterior As Boolean = False, Optional CveTipoOperacion As Integer = -1, Optional CvePedimento As Integer = -1, Optional CveIncoterm As Integer = -1, Optional CvePais As Integer = -1, Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1, Optional CveColonia As Integer = -1,
Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "-1", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1",
Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False,
@@ -906,8 +908,8 @@ Public Class ClsClientes
.Add("@CveUsoCFDI", SqlDbType.Int).Value = CveUsoCFDI
- .Add("@CveFormaPago33", SqlDbType.Int).Value = CveFormaPago33
- .Add("@CveMetodoPago33", SqlDbType.Int).Value = CveMetodoPago33
+ .Add("@CveFormaPago", SqlDbType.Int).Value = CveFormaPago
+ .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago
.Add("@CveClienteCorporativo", SqlDbType.Int).Value = CveClienteCorporativo
diff --git a/App_Code/ClsOIEventos.vb b/App_Code/ClsOIEventos.vb
index f86784260..c812a6f51 100644
--- a/App_Code/ClsOIEventos.vb
+++ b/App_Code/ClsOIEventos.vb
@@ -1554,7 +1554,7 @@ Public Class ClsOIEventos
CveOS As Integer, CveOC As Integer, CvePersonal As Integer, CveProveedor As Integer, CveCompra As Integer, CveVenta As Integer, CveUsuario As Integer, CveUsuarioIng As Integer, CveUsuarioConsulta As Integer,
CveEmpresa As Integer, Optional FechaInicio As Nullable(Of DateTime) = Nothing, Optional FechaFin As Nullable(Of DateTime) = Nothing, Optional FechaRealTermino As Nullable(Of DateTime) = Nothing,
Optional CveContrato As Integer = -1, Optional CveMovimientoAlmacen As Integer = -1, Optional CveEmpresaCRM As Integer = -1, Optional CveContactoCRM As Integer = -1, Optional CveAcercamientoCRM As Integer = -1,
- Optional CveTipoProcesoCRM As Integer = -1, Optional CveEtapaProcesoCRM As Integer = -1, Optional CveSubProyecto As Integer = -1) As Boolean
+ Optional CveTipoProcesoCRM As Integer = -1, Optional CveEtapaProcesoCRM As Integer = -1, Optional CveSubProyecto As Integer = -1, Optional EsCoordinador As Boolean = False) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OI_EventosGet")
@@ -1605,7 +1605,10 @@ Public Class ClsOIEventos
.Add("@CveEtapaProcesoCRM", SqlDbType.Int).Value = CveEtapaProcesoCRM
.Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
-
+ .Add("@EsCoordinador", SqlDbType.Bit).Value = EsCoordinador
+
+
+
End With
Try
@@ -2203,6 +2206,43 @@ Public Class ClsOIEventos
Return Retorno
End Function
+
+
+ Public Function GetCircularCorreos(EnvioTipo As Integer, CveEmpresa As Integer, CveRol As Integer, CveSubProyectoUsuario As Integer, CveProveedorClasificacion As Integer, CveSubProyectoPersonal As Integer, CveClienteClasificacion As Integer) As Boolean
+ Dim Retorno As Boolean = False
+
+ DataAdapter("PA_OI_CircularCorreosGet")
+
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@EnvioTipo", SqlDbType.Int).Value = EnvioTipo
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+
+ .Add("@CveRol", SqlDbType.Int).Value = CveRol
+ .Add("@CveSubProyectoUsuario", SqlDbType.Int).Value = CveSubProyectoUsuario
+ .Add("@CveProveedorClasificacion", SqlDbType.Int).Value = CveProveedorClasificacion
+ .Add("@CveSubProyectoPersonal", SqlDbType.Int).Value = CveSubProyectoPersonal
+ .Add("@CveClienteClasificacion", SqlDbType.Int).Value = CveClienteClasificacion
+
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ 'Catch Ex1 As SqlException
+ ' If Ex1.Message.Contains("Número: 2627;") Then
+ ' Alert("Ya existe un Evento con el mismo nombre: " & Asunto & ".", TipoMensaje.MsgAdvertencia)
+ ' Else
+ ' Me.OnError("Ocurrió un error al guardar los cambios en el Evento", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ ' End If
+ Catch ex As Exception
+ OnError("Ocurrió un error al obtener los correos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+
+ Return Retorno
+ End Function
+
+
#End Region
@@ -3205,4 +3245,4 @@ Public Class ClsOIEventos
End Sub
#End Region
-End Class
\ No newline at end of file
+End Class
diff --git a/Ashx/CargaEventos.ashx b/Ashx/CargaEventos.ashx
index 44ad73a30..5be0ee8b2 100644
--- a/Ashx/CargaEventos.ashx
+++ b/Ashx/CargaEventos.ashx
@@ -39,7 +39,7 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
FI = context.Request("start").ToDate
FF = context.Request("end").ToDate
- If Not GetEventos(CveUsuario, CveEmpresa, FI, FF, CveOS:=-2, CveUsuarioPara:=CveUsuarioPara, CveSubProyecto:=CveSubProyecto) Then
+ If Not GetEventos(CveUsuario, CveEmpresa, FI, FF, CveOS:=-2, CveUsuarioPara:=CveUsuarioPara, CveSubProyecto:=CveSubProyecto, context:=context) Then
'Convierte el objeto de Eventos en JSON
'Dim oSerializer As System.Web.Script.Serialization.JavaScriptSerializer = New System.Web.Script.Serialization.JavaScriptSerializer
Dim sJSON As String = Newtonsoft.Json.JsonConvert.SerializeObject(events)
@@ -90,7 +90,7 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
End Property
- Private Function GetEventos(CveUsuario As Integer, CveEmpresa As Integer, pFI As Date, pFF As Date, Optional CveOS As Integer = -1, Optional CveUsuarioPara As Integer = -1, Optional CveSubProyecto As Integer = -1) As Boolean
+ Private Function GetEventos(CveUsuario As Integer, CveEmpresa As Integer, pFI As Date, pFF As Date, Optional CveOS As Integer = -1, Optional CveUsuarioPara As Integer = -1, Optional CveSubProyecto As Integer = -1, Optional context As HttpContext = Nothing) As Boolean
Dim ObjEventos As New ClsOIEventos
Dim ErrorEventos = False
Dim CveEmpresaCRM As Integer = 0
@@ -137,7 +137,20 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
End If
- If ObjEventos.GetEventos(-1, -1, -1, "-1", "-1", -1, CveUsuario, CveUsuarioPara, -1, -1, -1, "-1", -1, -1, -1, -1, CveOS, -1, -1, -1, -1, -1, CveUsuario, CveUsuario, CveUsuario, CveEmpresa, pFI, pFF, CveSubProyecto:=CveSubProyecto) Then
+
+ Dim EsCoordinador As Boolean = False
+
+ If context IsNot Nothing AndAlso CveOS = -2 Then
+ Dim usuario As Usuario = UsuarioActual(context)
+ If usuario.TienePermisoProceso(348) Then
+ EsCoordinador = True
+ End If
+ End If
+
+
+
+
+ If ObjEventos.GetEventos(-1, -1, -1, "-1", "-1", -1, CveUsuario, CveUsuarioPara, -1, -1, -1, "-1", -1, -1, -1, -1, CveOS, -1, -1, -1, -1, -1, CveUsuario, CveUsuario, CveUsuario, CveEmpresa, pFI, pFF, CveSubProyecto:=CveSubProyecto, EsCoordinador:=EsCoordinador) Then
If ObjEventos.DtResultados.Rows.Count > 0 Then
events = New List(Of CalendarEvent)
@@ -372,5 +385,11 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
Return ErrorEventos
End Function
+ ReadOnly Property UsuarioActual(ByVal context As HttpContext) As Usuario
+ Get
+ UsuarioActual = DirectCast(context.Session("UsuarioSIG"), Usuario)
+ End Get
+ End Property
+
End Class
\ No newline at end of file
diff --git a/Contabilidad/RegPrePolizaS.aspx b/Contabilidad/RegPrePolizaS.aspx
index d509d224e..36eeebc3f 100644
--- a/Contabilidad/RegPrePolizaS.aspx
+++ b/Contabilidad/RegPrePolizaS.aspx
@@ -81,12 +81,12 @@