diff --git a/App_Code/CalendarEvent.vb b/App_Code/CalendarEvent.vb index 5bda9b76c..9a8729a1a 100644 --- a/App_Code/CalendarEvent.vb +++ b/App_Code/CalendarEvent.vb @@ -27,4 +27,6 @@ Public Class CalendarEvent Public Property Prospecto As String Public Property CveTipoEvento As Integer Public Property Importe As Double + Public Property EmpresaCRM As String + End Class diff --git a/Ashx/CargaEventos.ashx b/Ashx/CargaEventos.ashx index 720b39b81..7edc077a0 100644 --- a/Ashx/CargaEventos.ashx +++ b/Ashx/CargaEventos.ashx @@ -50,6 +50,7 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState Private Function GetEventos(CveUsuario As Integer, CveEmpresa As Integer, pFI As Date, pFF As Date) As Boolean Dim ObjEventos As New ClsOIEventos Dim ErrorEventos = False + Dim CveEmpresaCRM As Integer = 0 If ObjEventos.GetEventos(-1, -1, -1, "-1", "-1", -1, CveUsuario, CveUsuario, -1, -1, -1, "-1", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, CveUsuario, CveUsuario, CveUsuario, CveEmpresa, pFI, pFF) Then If ObjEventos.DtResultados.Rows.Count > 0 Then @@ -76,6 +77,7 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState cevent.CveProspecto = dr("CveProspecto").ToString.ToEntero cevent.Prospecto = dr("Prospecto").ToString cevent.CveTipoEvento = dr("Prospecto").ToString.ToEntero + cevent.EmpresaCRM = dr("EmpresaCRM").ToString '11/05/2018 - Evento Gasto Recurrente cevent.CveTipoEvento = dr("CveTipoEvento").ToString.ToEntero diff --git a/Inicio.aspx b/Inicio.aspx index 297d22aa2..82d6e39c9 100644 --- a/Inicio.aspx +++ b/Inicio.aspx @@ -308,7 +308,11 @@