diff --git a/WebLab/Agendas/AgendaEdit.aspx b/WebLab/Agendas/AgendaEdit.aspx
index 87ba3874..602dd73e 100644
--- a/WebLab/Agendas/AgendaEdit.aspx
+++ b/WebLab/Agendas/AgendaEdit.aspx
@@ -52,7 +52,11 @@
 				<div class="panel-body">   
 
 				 <table >
-				 
+				 <tr>
+                   <td colspan="2">
+                       <asp:CustomValidator ID="customValidadorGeneral" runat="server" OnServerValidate="customValidadorGeneral_ServerValidate" ValidationGroup="0" ></asp:CustomValidator>
+                   </td>
+               </tr>
 					<tr>
 						<td  >Tipo de Servicio:<span style="font-weight:bold"><asp:RangeValidator 
                                 ID="rvTipoServicio" runat="server" 
diff --git a/WebLab/Agendas/AgendaEdit.aspx.cs b/WebLab/Agendas/AgendaEdit.aspx.cs
index e8f89d2e..72461e33 100644
--- a/WebLab/Agendas/AgendaEdit.aspx.cs
+++ b/WebLab/Agendas/AgendaEdit.aspx.cs
@@ -270,5 +270,35 @@ private void CargarItems()
             }
 
         }
+
+        protected void customValidadorGeneral_ServerValidate(object source, ServerValidateEventArgs args)
+        {
+            if (oUser != null)
+            {
+                TipoServicio tp = new TipoServicio();
+                tp = (TipoServicio)tp.Get(typeof(TipoServicio), "IdTipoServicio", cboTipoServicio.SelectedValue);
+                DateTime fDesde = Convert.ToDateTime(txtFechaDesde.Value);
+                DateTime fHasta = Convert.ToDateTime(txtFechaHasta.Value);
+
+                ISession m_session = NHibernateHttpModule.CurrentSession;
+                ICriteria crit = m_session.CreateCriteria(typeof(Agenda));
+                crit.Add(Expression.Eq("IdEfector", oCon.IdEfector));
+                crit.Add(Expression.Eq("IdTipoServicio", tp));
+                crit.Add(Expression.Eq("IdItem", ddlItem.SelectedValue));
+                crit.Add(Expression.Le("FechaDesde", fHasta));
+                crit.Add(Expression.Ge("FechaHasta", fDesde));
+                crit.Add(Expression.Eq("Baja", false));
+                if (Request["id"] != null) //Sacar el id de la agenda si es modificacion
+                    crit.Add(Expression.Not(Expression.Eq("IdAgenda", int.Parse(Request["id"]))));
+
+                IList items = crit.List();
+
+                if (items.Count > 0)
+                {
+                    args.IsValid = false;
+                    this.customValidadorGeneral.ErrorMessage = "Existe superposición de fechas con otra agenda";
+                }
+            }
+        }
     }
 }
diff --git a/WebLab/Agendas/AgendaEdit.aspx.designer.cs b/WebLab/Agendas/AgendaEdit.aspx.designer.cs
index 3d5027ef..18fd6d2c 100644
--- a/WebLab/Agendas/AgendaEdit.aspx.designer.cs
+++ b/WebLab/Agendas/AgendaEdit.aspx.designer.cs
@@ -7,11 +7,22 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebLab.Agendas {
-    
-    
-    public partial class AgendaEdit {
-        
+namespace WebLab.Agendas
+{
+
+
+    public partial class AgendaEdit
+    {
+
+        /// <summary>
+        /// customValidadorGeneral control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CustomValidator customValidadorGeneral;
+
         /// <summary>
         /// rvTipoServicio control.
         /// </summary>
@@ -20,7 +31,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RangeValidator rvTipoServicio;
-        
+
         /// <summary>
         /// cboTipoServicio control.
         /// </summary>
@@ -29,7 +40,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList cboTipoServicio;
-        
+
         /// <summary>
         /// ddlItem control.
         /// </summary>
@@ -38,7 +49,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlItem;
-        
+
         /// <summary>
         /// rvEfector control.
         /// </summary>
@@ -47,7 +58,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RangeValidator rvEfector;
-        
+
         /// <summary>
         /// ddlEfector control.
         /// </summary>
@@ -56,7 +67,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.DropDownList ddlEfector;
-        
+
         /// <summary>
         /// rfvFechaDesde control.
         /// </summary>
@@ -65,7 +76,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvFechaDesde;
-        
+
         /// <summary>
         /// txtFechaDesde control.
         /// </summary>
@@ -74,7 +85,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaDesde;
-        
+
         /// <summary>
         /// rfvFechaHasta control.
         /// </summary>
@@ -83,7 +94,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvFechaHasta;
-        
+
         /// <summary>
         /// txtFechaHasta control.
         /// </summary>
@@ -92,7 +103,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaHasta;
-        
+
         /// <summary>
         /// rfvLimite control.
         /// </summary>
@@ -101,7 +112,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvLimite;
-        
+
         /// <summary>
         /// txtLimite control.
         /// </summary>
@@ -110,7 +121,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtLimite;
-        
+
         /// <summary>
         /// cvDias control.
         /// </summary>
@@ -119,7 +130,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvDias;
-        
+
         /// <summary>
         /// rdbTipoDias control.
         /// </summary>
@@ -128,7 +139,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RadioButtonList rdbTipoDias;
-        
+
         /// <summary>
         /// cklDias control.
         /// </summary>
@@ -137,7 +148,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.CheckBoxList cklDias;
-        
+
         /// <summary>
         /// rfvHoraDesde control.
         /// </summary>
@@ -146,7 +157,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvHoraDesde;
-        
+
         /// <summary>
         /// txtHoraDesde control.
         /// </summary>
@@ -155,7 +166,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtHoraDesde;
-        
+
         /// <summary>
         /// rfvHoraHasta control.
         /// </summary>
@@ -164,7 +175,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvHoraHasta;
-        
+
         /// <summary>
         /// txtHoraHasta control.
         /// </summary>
@@ -173,7 +184,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtHoraHasta;
-        
+
         /// <summary>
         /// rdbHorarioTurno control.
         /// </summary>
@@ -182,7 +193,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RadioButtonList rdbHorarioTurno;
-        
+
         /// <summary>
         /// rfvFrecuencia control.
         /// </summary>
@@ -191,7 +202,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Anthem.RequiredFieldValidator rfvFrecuencia;
-        
+
         /// <summary>
         /// txtFrecuenciaTurno control.
         /// </summary>
@@ -200,7 +211,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtFrecuenciaTurno;
-        
+
         /// <summary>
         /// vs control.
         /// </summary>
@@ -209,7 +220,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ValidationSummary vs;
-        
+
         /// <summary>
         /// lnkRegresar control.
         /// </summary>
@@ -218,7 +229,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lnkRegresar;
-        
+
         /// <summary>
         /// btnGuardar control.
         /// </summary>
@@ -227,7 +238,7 @@ public partial class AgendaEdit {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnGuardar;
-        
+
         /// <summary>
         /// CompareValidator1 control.
         /// </summary>