diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index d1ba33607..79dc0d4f2 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -9387,6 +9387,9 @@ Public Class ClsPaginas
PaginaDict.Add("/RH/CatRegistroPatronal.aspx".ToUpper(), 1324)
PaginaDict.Add("/SAT/SolicitudesNominaSat.aspx".ToUpper(), 545)
PaginaDict.Add("/SAT/SolicitudesIngresoSat.aspx".ToUpper(), 1329)
+
+ PaginaDict.Add("/RH/RepAsistencias.aspx".ToUpper(), 1336)
+
#End Region
#Region "Sistema"
'--------------------- Páginas que deben tener restricción ---------------------
diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb
index 466f25b58..ee95fedd3 100644
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -2616,8 +2616,9 @@ Public Class ClsRH
End Try
Return Retorno
- End Function
-
+ End Function
+
+
Public Function GetAsistencias(CvePersonal As Integer, CveClienteAsignado As Integer, CveProyecto As Integer, CveSubProyecto As Integer, CveTurno As Integer, CveEstatusPersonal As Integer, FechaI As Date, FechaF As Date, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
@@ -2641,6 +2642,33 @@ Public Class ClsRH
OnError("Ocurrió un error al consultar las Asistencias del Personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try
+ Return Retorno
+ End Function
+
+ Public Function RepGetAsistencias(Grupo As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, CveTurno As Integer, CveEstatusPersonal As Integer, FechaI As Date, FechaF As Date, CveEmpresa As Integer, CvePersonalPadre As Integer) As Boolean
+ Dim Retorno As Boolean = False
+
+ SqlDataAdapter("PA_RH_RepPersonalAsistenciasGet")
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@Grupo", SqlDbType.Int).Value = Grupo
+ .Add("@FechaI", SqlDbType.Date).Value = FechaI
+ .Add("@FechaF", SqlDbType.Date).Value = FechaF
+ .Add("@CveClienteAsignado", SqlDbType.Int).Value = CveClienteAsignado
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@CveTurno", SqlDbType.Int).Value = CveTurno
+ .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+ .Add("@CvePersonalPadre", SqlDbType.Int).Value = CvePersonalPadre
+ .Add("@CveEstatusPersonal", SqlDbType.Int).Value = CveEstatusPersonal
+
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As SqlException
+ OnError("Ocurrió un error al consultar las Asistencias del Personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+
Return Retorno
End Function
@@ -7283,7 +7311,7 @@ Public Class ClsRH
#End Region
-#Region "Checador"
+#Region "Checador"
Public Function GetChecadores(CveChecador As Integer, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_RH_ChecadorGet")
@@ -7356,6 +7384,45 @@ Public Class ClsRH
End Try
Return Retorno
End Function
+
+
+ Public Function AddRemoveChecadoresSubProyectos(CveChecador As Integer, CveSubProyecto As Integer, CveUsuario As Integer, Agreagar As Boolean) As Boolean
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_RH_ChecadorSubProyectosAddRemove")
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveChecador", SqlDbType.Int).Value = CveChecador
+ .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+ .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
+ .Add("@Agreagar", SqlDbType.Bit).Value = Agreagar
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al agregar el sub proyecto", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+ Return Retorno
+ End Function
+
+
+ Public Function GetChecadoresSubProyectos(CveChecador As Integer, CveEmpresa As Integer) As Boolean
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_RH_ChecadorSubProyectosGet")
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveChecador", SqlDbType.Int).Value = CveChecador
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al obteger los sub proyecto", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+ Return Retorno
+ End Function
+
+
+
#End Region
#Region " A C T I V I D A D E S"
diff --git a/Contabilidad2/RepBalanceGeneralHorizontal.aspx b/Contabilidad2/RepBalanceGeneralHorizontal.aspx
index 54d5f2b59..07b44d2d0 100644
--- a/Contabilidad2/RepBalanceGeneralHorizontal.aspx
+++ b/Contabilidad2/RepBalanceGeneralHorizontal.aspx
@@ -113,7 +113,7 @@
-
+
diff --git a/Empresas/132/Formatos/Factura.rdlc b/Empresas/132/Formatos/Factura.rdlc
index 08567045a..24e0bce1a 100644
--- a/Empresas/132/Formatos/Factura.rdlc
+++ b/Empresas/132/Formatos/Factura.rdlc
@@ -252,6 +252,74 @@
+
+
+ DsDesgloseImpuestos
+ /* Local Query */
+
+
+
+ SerieFolio
+ System.String
+
+
+ Fecha
+ System.String
+
+
+ Importe
+ System.String
+
+
+ FolioFiscal
+ System.String
+
+
+
+ DsDocumentosRelacionados
+ C:\Users\Jesus Murua\Documents\Visual Studio 2015\WebSites\WebSite2\App_Code\DsFirmas.xsd
+ DataTable1
+
+
+
+
+
+
+
+ DsDesgloseImpuestos
+ /* Local Query */
+
+
+
+ SerieFolio
+ System.String
+
+
+ Fecha
+ System.String
+
+
+ SubTotal
+ System.String
+
+
+ Importe
+ System.String
+
+
+ Moneda
+ System.String
+
+
+
+ DsNCVinculadas
+ C:\Users\Jesus Murua\Documents\Visual Studio 2015\WebSites\WebSite2\App_Code\DsFirmas.xsd
+ DataTable1
+
+
+
+
+
@@ -278,7 +346,7 @@
Textbox3
0.92083in
- 5.662in
+ 5.80966in
0.5cm
2.24597in
+
+
+
+ true
+ true
+
+
+
+
+ CFDI Relacionados
+
+
+
+
+
+
+ Textbox5
+ 0.14926cm
+ 0.07193cm
+ 0.54004cm
+ 20.37581cm
+
+
+ #2c2e42
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ Tipo Relación:
+
+
+
+
+
+
+ Textbox29
+ 0.83025cm
+ 4.47067cm
+ 0.41981cm
+ 5.31841cm
+ 1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =Parameters!TipoRelacionTexto.Value
+
+
+
+
+
+
+ Textbox29
+ 0.83025cm
+ 9.78908cm
+ 0.41981cm
+ 7.14985cm
+ 2
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+ 2.42456cm
+
+
+ 2.05585cm
+
+
+ 3.03631cm
+
+
+ 7.7847cm
+
+
+
+
+ 0.44125cm
+
+
+
+
+ true
+ true
+
+
+
+
+ Folio
+
+
+
+
+
+
+ Textbox10
+
+
+ #2c2e42
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Fecha
+
+
+
+
+
+
+ Textbox12
+
+
+ #2c2e42
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Importe
+
+
+
+
+
+
+ Textbox21
+
+
+ #2c2e42
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Folio Fiscal
+
+
+
+
+
+
+ Textbox11
+
+
+ #2c2e42
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.41479cm
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!SerieFolio.Value
+
+
+
+
+
+
+ SerieFolio
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Fecha.Value
+
+
+
+
+
+
+ Fecha
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Importe.Value
+
+
+
+
+
+
+ Importe1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!FolioFiscal.Value
+
+
+
+
+
+
+ FolioFiscal
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ After
+
+
+
+
+
+
+ DataSet4
+ 1.39643cm
+ 2.96893cm
+ 0.85604cm
+ 15.30142cm
+ 3
+
+
+
+
+
+ true
+ 18.68872cm
+ 0.05262cm
+ 2.25247cm
+ 20.44774cm
+ 36
+
+ =Microsoft.VisualBasic.Interaction.IIF(First(Fields!SerieFolio.Value, "DataSet4") <> "", False, True)
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ VERSION
+
+
+
+ =Parameters!CFDIVersion.Value
+
+
+
+
+
+
+ Textbox5
+ 20.97646cm
+ 16.09752cm
+ 0.65292cm
+ 4.4256cm
+ 37
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
- 22.64365cm
+ 25.88215cm
-