From 5a2c039883f8afd0f0b581a65d085e89751eaef8 Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Wed, 12 Aug 2020 13:11:12 -0700
Subject: [PATCH]

---
 Global.asax                   | 16 +++++++++++++++-
 LogIn.aspx.vb                 |  2 +-
 RH/Personal.aspx              |  4 ++--
 RH/RepUniformesResguardo.aspx |  2 +-
 vwd.webinfo                   |  2 ++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Global.asax b/Global.asax
index 53d481a72..ed1954d2f 100644
--- a/Global.asax
+++ b/Global.asax
@@ -19,7 +19,7 @@
         End Get
     End Property
     Private Sub GuardaLogAsax(str As String)
-        'GuardaLog(str)
+        GuardaLog(str)
     End Sub
     Sub Application_Start(sender As Object, e As EventArgs)
         Stimulsoft.Base.StiLicense.Key = "6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHmhQEs54hwXWiqhb7jE6yoykR4jHwP3Mz0nuxn0JR9fNMeDKv" + "sS5s+rCYr7Ex4DRTHaUJIUDqrvGmvWyMjzUl9RAEz/XG8RenfJvoEilBZ9Wqq8Uu/n92YhChB4PbAh9FeH3abSU3PF" + "LuVa6GydYWQvZGpHhFs98Idp754TAgWZatzcF3Ksp6q4laYxnyUY0cA0hYejanRBjIT1Nu59xmlOKE7EGIb9wKlLn/" + "XnW8k8PUNuReOk7ATeHO07JSMLikmvIytkWET2bXDmBI43tAX3fLUE+KlOe7FR/hvfQ6oqqtVRlSZ22QBanel09+XE" + "X8aVC8b+WuRv1nInJeQHBD9zF8b67n4ouKRgv2/vSxopOhCZXdaqdyO4ct+FmSC8cAAcMIGeiKnc5ww8Cq44ClTqJl" + "V2qsCjoS4bb8Nzd2Gy+q/TG/D3dAEKSpPGUx2EEksora/kIkNooq6+bgyH7hqCG2bHKaSQwr2g0keNrYIUcTIwROn1" + "cnQDetzsBqX4lvu64VZWq5+cQD+dyPJwOS6M"
@@ -276,19 +276,33 @@
         '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         'SAT
         Using ObjGrales As New ClsGenerales
+            GuardaLogAsax(String.Format("Globalasax 18.01:{0}", DateTime.Now))
             If ObjGrales.GetSATProductosServicios Then Application("GlobalDTPSATPS") = ObjGrales.DtResultados.AsEnumerable() Else Application("GlobalDTPSATPS") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.02:{0}", DateTime.Now))
             If ObjGrales.GetSATUnidadMedida Then Application("GlobalDTPSATUM") = ObjGrales.DtResultados.AsEnumerable() Else Application("GlobalDTPSATUM") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.03:{0}", DateTime.Now))
             If ObjGrales.GetSATUsosCFDI Then Application("GlobalDTSATUsosCFDI") = ObjGrales.DtResultados Else Application("GlobalDTSATUsosCFDI") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.04:{0}", DateTime.Now))
             If ObjGrales.GetSATFraccionArancelaria Then Application("GlobalDTFraccionArancelaria") = ObjGrales.DtResultados.AsEnumerable() Else Application("GlobalDTFraccionArancelaria") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.05:{0}", DateTime.Now))
             If ObjGrales.GetSATIncoterm Then Application("GlobalDTIncoterm") = ObjGrales.DtResultados Else Application("GlobalDTIncoterm") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.06:{0}", DateTime.Now))
             If ObjGrales.GetSATTipoOperacion Then Application("GlobalDTTipoOperacion") = ObjGrales.DtResultados Else Application("GlobalDTTipoOperacion") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.07:{0}", DateTime.Now))
             If ObjGrales.GetSATMotivoTraslado Then Application("GlobalDTSATMotivoTraslado") = ObjGrales.DtResultados Else Application("GlobalDTSATMotivoTraslado") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.08:{0}", DateTime.Now))
             If ObjGrales.GetSATUnidadesAduana Then Application("GlobalDTUnidadAduana") = ObjGrales.DtResultados Else Application("GlobalDTUnidadAduana") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.09:{0}", DateTime.Now))
             If ObjGrales.GetSATClavePedimento Then Application("GlobalDTClavePedimento") = ObjGrales.DtResultados Else Application("GlobalDTClavePedimento") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.10:{0}", DateTime.Now))
             If ObjGrales.GetSATPais Then Application("GlobalDTPais") = ObjGrales.DtResultados Else Application("GlobalDTPais") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.11:{0}", DateTime.Now))
             If ObjGrales.GetSATEstado("-1") Then Application("GlobalDTEstado") = ObjGrales.DtResultados Else Application("GlobalDTEstado") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.12:{0}", DateTime.Now))
             If ObjGrales.GetSATMunicipio("-1") Then Application("GlobalDTMunicipio") = ObjGrales.DtResultados Else Application("GlobalDTMunicipio") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.13:{0}", DateTime.Now))
             If ObjGrales.GetSATColonia("-1") Then Application("GlobalDTColonia") = ObjGrales.DtResultados Else Application("GlobalDTColonia") = Nothing
+            GuardaLogAsax(String.Format("Globalasax 18.14:{0}", DateTime.Now))
         End Using
         GuardaLogAsax(String.Format("Globalasax 19:{0}", DateTime.Now))
 
diff --git a/LogIn.aspx.vb b/LogIn.aspx.vb
index 94f7e4907..01bba28d1 100644
--- a/LogIn.aspx.vb
+++ b/LogIn.aspx.vb
@@ -266,7 +266,7 @@ Partial Class LogIn
                     userm.Nombre = Usuario.Nombre
                     userm.Contraseña = Usuario.Contraseña
                     userm.CvePerfil = Usuario.CveRol
-                    userm.CveEmpresa = 119 'Usuario.CveEmpresa
+                    userm.CveEmpresa = 1 'Usuario.CveEmpresa
                     userm.CveUsuarioModifico = Usuario.CveEmpresa
                     userm.CveUsuarioRegistro = Usuario.CveEmpresa
                     RegistraScript(String.Format("opennewlocation('{0}','{1}')", ReturnUrl, GenerateJSONWebToken(userm)))
diff --git a/RH/Personal.aspx b/RH/Personal.aspx
index 16ff6e369..cfe26b005 100644
--- a/RH/Personal.aspx
+++ b/RH/Personal.aspx
@@ -766,7 +766,7 @@
                                                 <div class="portlet-title">
                                                     <div class="caption font-green">
                                                         <i class="icon-user-following font-green"></i>
-                                                        <span class="caption-subject bold uppercase">Uniforme:</span>
+                                                        <span class="caption-subject bold uppercase">Resguardos:</span>
                                                     </div>
                                                     <div class="actions">
                                                         <div class="btn-group">
@@ -1288,7 +1288,7 @@
                                                         <asp:DropDownList ID="DdlRegimenContratacion" runat="server" AppendDataBoundItems="true" DataTextField="RegimenContratacion" CssClass="form-control input-sm select2me" DataValueField="CveSATRegimenContratacion" ValidationGroup="GrpGuardar">
                                                             <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
                                                         </asp:DropDownList>
-                                                        <asp:Label runat="server" AssociatedControlID="DdlRegimenContratacion" Text="Régimen Contratación:"></asp:Label>
+                                                        <asp:Label runat="server" AssociatedControlID="DdlRegimenContratacion" Text="Mail recibo nómina:"></asp:Label>
                                                         <asp:RequiredFieldValidator ID="RFVRegimenContratacion" runat="server" ControlToValidate="DdlRegimenContratacion" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Régimen Contratación''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
                                                         <i></i>
                                                     </div>
diff --git a/RH/RepUniformesResguardo.aspx b/RH/RepUniformesResguardo.aspx
index f972b443e..4052978cc 100644
--- a/RH/RepUniformesResguardo.aspx
+++ b/RH/RepUniformesResguardo.aspx
@@ -5,7 +5,7 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server">
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="E" Runat="Server">
-    Reporte de Uniformes
+    Resguardos del personal
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="HB" Runat="Server">     
     
diff --git a/vwd.webinfo b/vwd.webinfo
index 55467f44f..4edae1c8c 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -84,6 +84,8 @@
     
   
     
+  
+