Merge branch 'master' of http://oirigoyen@192.168.10.111:8383/SIG.git

Nomina/Nomina.aspx.cs

@@ -2055,7 +2055,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
                     && (dtempleadosConceptos.COUNT("CveConcepto", string.Format("CveConcepto={0} AND CvePersonal ={1} AND Estatus =2", CveConcepto, SRCvePersonal)) == 0)
                     )
                 {
-                    if(!row["CveSistema"].ToString().ToEntero().Contiene(new int[] { 20,21,112,202, 203 }))
+                    if(!row["CveSistema"].ToString().ToEntero().Contiene(new int[] { 20,21,112,202, 203,204,205,206,207,50,51 }))
                     {
                         BorradoLogico = 1;
                     }

Site.master.vb

@@ -365,7 +365,7 @@ Partial Class Site
                         For Each drN As DataRow In Nietos
                             LinkNieto = drN("LIGA").ToString()
                             If (drH("IsAngular").ToString() = "1") Then
-                                LinkNieto = String.Format("{1}:4200{0}", drN("LIGA"), strdomain)
+                                LinkNieto = String.Format("{1}:84{0}", drN("LIGA"), strdomain)
                             End If
                             If CveModulo = drN("CveModulo").ToString().ToEntero Then
                                 CveModuloPadreSeleccionado = CveModuloPadre : CveModuloHijoSeleccionado = CveModuloHijo

vwd.webinfo

@@ -276,6 +276,8 @@
     
   
     
+  
+