AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2023-07-17 11:41:59 -07:00
parent 89fb1aba64 aa1d793cb1
commit 5258f1b4df
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RH/Personal.aspx.vb
View File

@@ -7847,7 +7847,7 @@ Partial Class RH_Personal
Dim DiasAgregados As Integer = 0 Dim DiasAgregados As Integer = 0
Dim FechaFin As Date = fechaInicio Dim FechaFin As Date = fechaInicio
Dim Contador As Integer = 0
For x = 2 To diasVacaciones For x = 2 To diasVacaciones
Dim day_of_week = CType(FechaFin.DayOfWeek, Integer) + 1 Dim day_of_week = CType(FechaFin.DayOfWeek, Integer) + 1
If day_of_week = diaDescanso Then If day_of_week = diaDescanso Then
@@ -7856,12 +7856,13 @@ Partial Class RH_Personal
Else Else
FechaFin = FechaFin.AddDays(1) FechaFin = FechaFin.AddDays(1)
day_of_week = CType(FechaFin.DayOfWeek, Integer) + 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 DiasAgregados = DiasAgregados + 1
End If End If
End If End If
Contador = Contador + 1
Next Next
TxtFechaFinVac.Text = FechaFin.ToString TxtFechaFinVac.Text = FechaFin.ToString

13
Ventas/Ventas.aspx.vb
View File

@@ -2825,7 +2825,7 @@ Partial Class Ventas
BtnCrearApartirDe.Visible = True BtnCrearApartirDe.Visible = True
If UsuarioActual.Empresa.Funcionalidad(531) = "1" Then BtnCrearApartirDe.Visible = False 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 DivFechaAnticipoCliente.Visible = True
TxtFechaAnticipoCliente.Text = Now.ToShortDateString TxtFechaAnticipoCliente.Text = Now.ToShortDateString
@@ -34786,6 +34786,17 @@ Partial Class Ventas
DdlUsoCFDI.Enabled = True DdlUsoCFDI.Enabled = True
End If 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 If LblSeTimbro.Text = "No" AndAlso DdlMoneda.SelectedValue.ToEntero() = 2 AndAlso ChkEmitirComercioExterior.Checked AndAlso DdlTipoComprobante.SelectedValue = "Ing" Then
TxtTipoCambio.Enabled = True TxtTipoCambio.Enabled = True
TxtTipoCambio.ReadOnly = False TxtTipoCambio.ReadOnly = False