From c89c231f6d20001c5a92662d8e018ec74a9952bf Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Tue, 10 May 2022 17:40:55 -0700
Subject: [PATCH]

---
 Compras/PopUpVerFactura.aspx.vb | 6 +++---
 Nomina/Nomina.aspx              | 3 +--
 Nomina/Nomina.aspx.cs           | 2 +-
 RH/CalculoSBC.aspx.cs           | 4 +++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index e0bb52ba3..4f3f81a2c 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -273,7 +273,7 @@ Partial Class PopUpVerFactura
                 Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
                 Rem1Placa = row("Rem1Placa").ToString()
                 NoFactura = row("NoFactura").ToString()
-                Remolque1 = String.Format("{0} ", row("NumeroTrailer"), row("Rem1Anio"))
+                Remolque1 = String.Format("{0} ", row("NumeroRemolque"), row("Rem1Anio"))
                 Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
 
                 NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())
@@ -419,7 +419,7 @@ Partial Class PopUpVerFactura
                 Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
                 Rem1Placa = row("Rem1Placa").ToString()
                 NoFactura = row("NoFactura").ToString()
-                Remolque1 = String.Format("{0} ", row("NumeroTrailer"))
+                Remolque1 = String.Format("{0} ", row("NumeroRemolque"))
                 Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
 
                 NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())
@@ -574,7 +574,7 @@ Partial Class PopUpVerFactura
                 Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
                 Rem1Placa = row("Rem1Placa").ToString()
                 NoFactura = row("NoFactura").ToString()
-                Remolque1 = String.Format("{0} ", row("NumeroTrailer"))
+                Remolque1 = String.Format("{0} ", row("NumeroRemolque"))
                 Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
 
                 NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())
diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx
index 33f855f1e..b1dcd7448 100644
--- a/Nomina/Nomina.aspx
+++ b/Nomina/Nomina.aspx
@@ -285,8 +285,7 @@
         </ContentTemplate>
         <Triggers>
             <asp:PostBackTrigger ControlID="LnkListaRaya" />
-            <asp:PostBackTrigger ControlID="LnkFormatoTabular" />
-            <asp:PostBackTrigger ControlID="LnkLayoutContable" />            
+            <asp:PostBackTrigger ControlID="LnkFormatoTabular" />            
         </Triggers>
     </asp:UpdatePanel>
 
diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs
index 2ede3383d..86f0d6d03 100644
--- a/Nomina/Nomina.aspx.cs
+++ b/Nomina/Nomina.aspx.cs
@@ -475,7 +475,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
                     LnkModalPlantillaNomina.Visible = true;
                     LnkTimbrarTodos.Visible = (Estatus > 2);
 
-                    LnkLayoutContable.Visible = (Estatus > 2);
+                    LnkLayoutContable.Visible = (Estatus >= 2);
                     LnkProvisionNomina.Visible = CvePrePolizaProvision > 0;
                     LnkProvisionNomina.NavigateUrl = $"../Contabilidad/RegPrePoliza.aspx?CvePrePoliza={CvePrePolizaProvision}";
                     LnkProvisionNominaAsimilados.Visible = CvePrePolizaProvisionAsimilados > 0;
diff --git a/RH/CalculoSBC.aspx.cs b/RH/CalculoSBC.aspx.cs
index 656215346..1947d8448 100644
--- a/RH/CalculoSBC.aspx.cs
+++ b/RH/CalculoSBC.aspx.cs
@@ -22,7 +22,9 @@ public partial class RH_CalculoSBC : ClsPaginas
     {
         if (!IsPostBack)
         {
-
+            TxtFechaPago.Text = String.Format("{0:01/MM/yyyy}", DateTime.Now);
+            //string rutarchivos = string.Format("{0}modificacionsalarios\\", UsuarioActual.Empresa.RutaArchivos);
+            //Alert(rutarchivos);
             //ADSNetLibrary.SIGAPI.Services.Agropecuaria.IAgropecuariaService servicioAgro = new ADSNetLibrary.SIGAPI.Services.Agropecuaria.AgropecuariaService(System.Configuration.ConfigurationManager.ConnectionStrings["Conexion"].ConnectionString);
             //ADSNetLibrary.SIGAPI.Models.Agropecuaria.Request.ActividadGET acmo = new ADSNetLibrary.SIGAPI.Models.Agropecuaria.Request.ActividadGET();
             //acmo.cveEmpresa = UsuarioActual.CveEmpresa; acmo.cveActividad = -1;