Merge branch 'master' of http://192.168.10.111:8383/SIG
This commit is contained in:
@@ -386,7 +386,7 @@ Partial Class PopUpVerFactura
|
|||||||
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
|
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
|
||||||
Dim rutardlc As String = "Formatos\RepAgroInventarioDiario.rdlc"
|
Dim rutardlc As String = "Formatos\RepAgroInventarioDiario.rdlc"
|
||||||
If EnviarCorrreo Then
|
If EnviarCorrreo Then
|
||||||
Dim para As String = "caudillo.90d@gmail.com"
|
Dim para As String = ""
|
||||||
Dim dtCorreos As DataTable = New DataTable()
|
Dim dtCorreos As DataTable = New DataTable()
|
||||||
|
|
||||||
Using objnom As New ClsCGame
|
Using objnom As New ClsCGame
|
||||||
@@ -394,8 +394,10 @@ Partial Class PopUpVerFactura
|
|||||||
dtCorreos = objnom.DtResultados
|
dtCorreos = objnom.DtResultados
|
||||||
End If
|
End If
|
||||||
End Using
|
End Using
|
||||||
|
Dim coma As String = ""
|
||||||
For Each row As DataRow In dtCorreos.Rows
|
For Each row As DataRow In dtCorreos.Rows
|
||||||
para = String.Format("{0},{1}", para, row("Correo"))
|
para = String.Format("{0}{2}{1}", para, row("Correo"), coma)
|
||||||
|
coma = ","
|
||||||
Next
|
Next
|
||||||
|
|
||||||
Dim archivoBinario As Byte() = StreamPDF(rutardlc, lrds, params, "Inventario", formato)
|
Dim archivoBinario As Byte() = StreamPDF(rutardlc, lrds, params, "Inventario", formato)
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ Partial Class RH_CatAsistenciasInasistencias
|
|||||||
Protected Sub LbAgregar_Click(sender As Object, e As System.EventArgs) Handles BtnAgregarTiposDModal.Click 'esta funcion es la que agrega un nuevo motivo de baja se activa con el boton "Agregar" de la ventana modal"
|
Protected Sub LbAgregar_Click(sender As Object, e As System.EventArgs) Handles BtnAgregarTiposDModal.Click 'esta funcion es la que agrega un nuevo motivo de baja se activa con el boton "Agregar" de la ventana modal"
|
||||||
Dim ObjAsistenciasInasistencias As New ClsRH
|
Dim ObjAsistenciasInasistencias As New ClsRH
|
||||||
Dim chkAplicaFalta As Boolean = AplicaFalta.Checked
|
Dim chkAplicaFalta As Boolean = AplicaFalta.Checked
|
||||||
Dim chkAplicaNoAplica As Boolean = Not AplicaNoAplica.Checked
|
Dim chkAplicaNoAplica As Boolean = AplicaNoAplica.Checked
|
||||||
Dim chkAplicaVacacion As Boolean = AplicaVacacion.Checked
|
Dim chkAplicaVacacion As Boolean = AplicaVacacion.Checked
|
||||||
Dim chkAplicaIncapacidad As Boolean = AplicaIncapacidad.Checked
|
Dim chkAplicaIncapacidad As Boolean = AplicaIncapacidad.Checked
|
||||||
Dim chkAplicaRetardo As Boolean = AplicaRetardo.Checked
|
Dim chkAplicaRetardo As Boolean = AplicaRetardo.Checked
|
||||||
@@ -154,7 +154,7 @@ Partial Class RH_CatAsistenciasInasistencias
|
|||||||
Dim Tipo As String = TipoTxt.Text.Trim
|
Dim Tipo As String = TipoTxt.Text.Trim
|
||||||
Dim TipoCorto As String = TxtTipoCorto.Text.Trim
|
Dim TipoCorto As String = TxtTipoCorto.Text.Trim
|
||||||
Dim Estatus As Boolean = ChkEstatus.Checked
|
Dim Estatus As Boolean = ChkEstatus.Checked
|
||||||
Dim ckAplicaFalta As Boolean = Not AplicaFalta.Checked
|
Dim ckAplicaFalta As Boolean = AplicaFalta.Checked
|
||||||
Dim AplicaAsistencia As Boolean = AplicaNoAplica.Checked
|
Dim AplicaAsistencia As Boolean = AplicaNoAplica.Checked
|
||||||
Dim CveAsistenciasInasistencias As Integer = CveTipoAsisAEditar 'aquí obtenemos el valor de la propiedad que utilizamos en el metodo "GvDatos_RowEditing"
|
Dim CveAsistenciasInasistencias As Integer = CveTipoAsisAEditar 'aquí obtenemos el valor de la propiedad que utilizamos en el metodo "GvDatos_RowEditing"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user