diff --git a/GPS/PalletEtiquetaCaja.rdlc b/GPS/PalletEtiquetaCaja.rdlc index 539ad27fc..113da5366 100644 --- a/GPS/PalletEtiquetaCaja.rdlc +++ b/GPS/PalletEtiquetaCaja.rdlc @@ -898,7 +898,6 @@ KM12 HERMOSILLO, SONORA 5 - true @@ -2457,41 +2456,20 @@ KM12 HERMOSILLO, SONORA - 1.44667cm + 1.18209cm - - true - true - - - - - =Parameters!noPallet.Value - - - - - - - Textbox821 + + Embedded + CodBarr + FitProportional - Bottom - 2pt - 2pt - 2pt - 2pt - + 5 @@ -2501,37 +2479,16 @@ KM12 HERMOSILLO, SONORA - - true - true - - - - - =Parameters!noPallet.Value - - - - - - - Textbox821 + + Embedded + CodBarr + FitProportional - Bottom - 2pt - 2pt - 2pt - 2pt - + 5 @@ -2542,7 +2499,7 @@ KM12 HERMOSILLO, SONORA - 0.62646cm + 0.49417cm @@ -3026,8 +2983,8 @@ Produce of MX. 0.07228cm 0.05625cm - 10.59604cm - 10.52137cm + 10.19917cm + 10.52136cm @@ -3229,6 +3186,13 @@ tz/88IQXNLT1jvK6x5rYowb8xgXvcqDTfe8tfhiRVs/61rv+9bCPvexnT/va2/72uM+97nfP+977/vfA +qAIhvmYQymZeniYlTmZkGmZjrmZmpmZl0mZkfmZoxmanmmaoNmZqemNosmZrHmaqlkQibmWNtiYr/mWwTiMaqEPiwAAd0gk9NiHEMCbJGiCrDeQyqCYPamXg7l7EZiT3hiYRCGZ4ficlxmY1kmI2EkF0PmTZZid0fmd3Hmd4tmdtHkK4Omd6Dme2lme5Lme5lmY8Pme6Xme9Smf9ymdNUGdrBmf+okQxWieSYmEzEmKFFiMReCGcsicfTiTBcGfzVmTVPAA5Imby8maFNqe0SCG/jl+HFqhH6qhIRqeG8qeJDqi3v9Zoh2qoiBqoimKorTJoiLqojEKo7ZJohhaoXJ5kjUxDzFwAwKRA3qpiMNYjJKIfsNwgUU4oLqpoREKfDDakWqpnggRpdRZn1I6n/vpnluqpQxxpTSapVgKpgJKpm9ppl06plz6pWuKEGjKpoIpn1UaphAKl62nD8vYlwhhgatIjLFYEHYpoHz6h8D4n0/aexc6pzN5o/uQqIAqmo66D2IImZE6qUv5hZbKqJlaqZCKqZ2qh5vqqZQqqpcKqp/KEKFqqqOqqhb6hZz6hQPJepjpjb0ZAE0aqDqKgpLYpBsYqYeqe5FplQKapd44l2AZrGJZmcKqrMmKrMdqrGTprNHMCq1wKa3VSq1Caa3Ziq1Uqa3dyq1KOZ1q6a3h+pNBuXpyupbr95ZU2Z68GIxu2Xp1+qu7F6uxmqIMEasWqa/6yK8+6K8ICYb/6pD7SrD9arADy4QJ64QL+4MNK7AB+5APK7GFCqsI65gCOqtJmaHBCARxGYx3EJU/CZEFiq/0ynu+WLEcmbKyKIqtuIqvWIu0CLO2KLMvO4s367KgiLM7q7Mty4o9C7Q/G7M0e67nWZRFe5MpqRbLiACOmKQQCYYRqRbFSI39F41S+3rpwXqyu6eES2qyWIiEcWiwUwiGZfuQZ+u1Y8uEafuEZnuFb5uFYUu2cIu2CjG1Trq2NWGRG6gIdgiBCqoQ 0FkLf3uGgTsQGeurXIt7CqgW89p/BuiAAii5BAi5D3h/l1uAmWu5k4u5nau5n8u5lZuAkeu5o9u4oOsACOimUyq6CDiSvOqNvOCBDUCoRtoX3YkMMCAQtQugnQEAw/q4izu8xFu8xnu8yJu8yru8zNu8zvu80Bu90ju91Fu91nu92Lu4AQEAOw== + + image/png + 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 +G/UY+X4AAAAASUVORK5CYII= + Cm ab0e0117-79b9-44e9-a7a3-e3d163f1ee55 diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx index f8759d18d..c92264be3 100644 --- a/Nomina/Nomina.aspx +++ b/Nomina/Nomina.aspx @@ -196,7 +196,7 @@ Timbrar todos
  • - Registrar provisión + Registrar provisión
  • Ver provisión diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs index bbad1203e..f56d87ecc 100644 --- a/Nomina/Nomina.aspx.cs +++ b/Nomina/Nomina.aspx.cs @@ -439,7 +439,8 @@ public partial class Nomina_Nomina2 : ClsPaginas int CvePrePolizaProrrateo = drow["CvePrePolizaProrrateo"].ToString().ToEntero(); //LnkConceptoEmpleado.Visible = (Estatus == 1); - LnkRegistrarProvision.Visible = (Estatus >= 2) && (CvePrePolizaProvision <= 0 || UsuarioActual.CveUsuario == 100); + LnkRegistrarProvision.Visible = (Estatus >= 2);//&& (CvePrePolizaProvision <= 0 || UsuarioActual.CveUsuario == 100); + LnkRegistrarProvision.Text = CvePrePolizaProvision <= 0 ? "Registrar provisión" : "Regenerar provisión"; LnkConceptoEmpleado.Visible = true;//(Estatus < 2); LnkCargaAsistenciaMasiva.Visible = (Estatus < 2); LnkModalPlantillaNomina.Visible = true; diff --git a/vwd.webinfo b/vwd.webinfo index 7266d7de6..e457e81ff 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -410,6 +410,8 @@ + +