From c0333953ce48aa9db8ba0941ae7ae9fd545e2b48 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Mon, 17 Jul 2023 09:07:56 -0700
Subject: [PATCH 1/2] habilitar opciones al editar

---
 Ventas/Ventas.aspx.vb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 7a7c8b88a..23138df2b 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -2825,7 +2825,7 @@ Partial Class Ventas
                     BtnCrearApartirDe.Visible = True
                     If UsuarioActual.Empresa.Funcionalidad(531) = "1" Then BtnCrearApartirDe.Visible = False
 
-                    If UsuarioActual.TienePermisoProceso(302) AndAlso DdlTipoComprobante.SelectedValue.Contiene("Ing", "Ant", "Egs") AndAlso LblSeTimbro.Text = "No" Then BtnEditar.Visible = True
+                    If UsuarioActual.TienePermisoProceso(302) AndAlso DdlTipoComprobante.SelectedValue.Contiene("Ing", "Ant", "Egs") Then BtnEditar.Visible = True
 
                     DivFechaAnticipoCliente.Visible = True
                     TxtFechaAnticipoCliente.Text = Now.ToShortDateString
@@ -34786,6 +34786,17 @@ Partial Class Ventas
             DdlUsoCFDI.Enabled = True
         End If
 
+        If Not UsuarioActual.TienePermisoProceso(289) Then
+            If LblSeTimbro.Text = "No" Then
+                DdlUsoCFDI.Enabled = False
+                DdlMetodoPago33.Enabled = False
+                DdlFormaPago33.Enabled = False
+            End If
+
+            TxtFechaPago.Enabled = True
+            imgCalendario.Enabled = True
+        End If
+
         If LblSeTimbro.Text = "No" AndAlso DdlMoneda.SelectedValue.ToEntero() = 2 AndAlso ChkEmitirComercioExterior.Checked AndAlso DdlTipoComprobante.SelectedValue = "Ing" Then
             TxtTipoCambio.Enabled = True
             TxtTipoCambio.ReadOnly = False

From aa1d793cb1fd2968dfe1ab1040503bc2cc579a23 Mon Sep 17 00:00:00 2001
From: Oscar Irigoyen <rakcsle@outlook.com>
Date: Mon, 17 Jul 2023 10:30:35 -0700
Subject: [PATCH 2/2] =?UTF-8?q?Personal=20solicitud=20vacaiones=20correcio?=
 =?UTF-8?q?n=20d=C3=ADas=20feriados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RH/Personal.aspx.vb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb
index 4f9b277b3..ab70b76b3 100644
--- a/RH/Personal.aspx.vb
+++ b/RH/Personal.aspx.vb
@@ -7847,7 +7847,7 @@ Partial Class RH_Personal
 
         Dim DiasAgregados As Integer = 0
         Dim FechaFin As Date = fechaInicio
-
+        Dim Contador As Integer = 0
         For x = 2 To diasVacaciones
             Dim day_of_week = CType(FechaFin.DayOfWeek, Integer) + 1
             If day_of_week = diaDescanso Then
@@ -7856,12 +7856,13 @@ Partial Class RH_Personal
             Else
                 FechaFin = FechaFin.AddDays(1)
                 day_of_week = CType(FechaFin.DayOfWeek, Integer) + 1
-                If day_of_week = diaDescanso Then
+                If (diasVacaciones = Contador + 2) AndAlso day_of_week = diaDescanso Then
+                    FechaFin = FechaFin.AddDays(1)
                     DiasAgregados = DiasAgregados + 1
                 End If
 
             End If
-
+            Contador = Contador + 1
         Next
 
         TxtFechaFinVac.Text = FechaFin.ToString