diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index e40a7740e..79507b7fc 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -540,6 +540,33 @@ Public Class ClsNominas Return Retorno End Function + + Public Function PA_Nom_NominasAutorizarUP(cvePersonal As Int32, cvePeriodo As Int32, salarioDiario As Decimal, sBC As Decimal, sDI As Decimal, horasDobles As Int16, horasTriples As Int16, total As Double, subTotal As Double, diasPagados As Double, diasFaltados As Int32, diasVacaciones As Int32, diasIncapacidad As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Nom_NominasAutorizarUP", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CvePersonal", SqlDbType.Int).Value = cvePersonal + .Add("@CvePeriodo", SqlDbType.Int).Value = cvePeriodo + .Add("@SalarioDiario", SqlDbType.SmallMoney).Value = salarioDiario + .Add("@SBC", SqlDbType.SmallMoney).Value = sBC + .Add("@SDI", SqlDbType.SmallMoney).Value = sDI + .Add("@HorasDobles", SqlDbType.SmallInt).Value = horasDobles + .Add("@HorasTriples", SqlDbType.SmallInt).Value = horasTriples + .Add("@Total", SqlDbType.Float).Value = total + .Add("@SubTotal", SqlDbType.Float).Value = subTotal + .Add("@DiasPagados", SqlDbType.Float).Value = diasPagados + .Add("@DiasFaltados", SqlDbType.Int).Value = diasFaltados + .Add("@DiasVacaciones", SqlDbType.Int).Value = diasVacaciones + .Add("@DiasIncapacidad", SqlDbType.Int).Value = diasIncapacidad + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al autorizar la nomina.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return retorno + End Function Public Function AddNom_Nominas(FolioNom As Integer, CveNominaTipo As Integer, CvePersonal As Integer, CvePeriodo As Integer, SubTotal As Double, Descuento As Double, RetISR As Double, Total As Double, CveMoneda As Integer, TipoCambio As Double, CveMetodoPago As Integer, Fecha As Date, MotivoDescuento As String, Observaciones As String, Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Double, Num2 As Double, Num3 As Double, diff --git a/App_Code/TimbradoB.vb b/App_Code/TimbradoB.vb new file mode 100644 index 000000000..6e044c5ed --- /dev/null +++ b/App_Code/TimbradoB.vb @@ -0,0 +1,36 @@ +Imports Microsoft.VisualBasic + +Public Class TimbradoB + + + + 'Public Function TimbrarFactura(UsuarioActual As Usuario, Ventas As Modelos.Factura, Optional CvePACEspecial As Integer = -1) As Boolean + + ' Dim Retorno As Boolean = False + ' Dim tCvePAC As Integer = UsuarioActual.Empresa.CvePAC + ' If CvePACEspecial <> -1 Then tCvePAC = CvePACEspecial + ' Dim objs As ADSTimbrado.TimbradoEmpresa + ' Dim result = ADSTimbrado.Timbrado.TimbrarFactura(Ventas, objs, ADSTimbrado.PacTimbrado.PADEv) + ' Retorno = result.isOK + ' If result.isOK Then + ' Else + + ' End If + + + ' Return Retorno + 'End Function +End Class + +'Public Class TimbradoEmpresa +' Inherits ADSTimbradoLibrary.TimbradoEmpresa + +' Public Overrides Function UpdateEstatusFactura(FolioFiscal As String, ObjCFDITimbre As ADSTimbradoLibrary.CFDITimbre, facturaCFDI As ADSTimbradoLibrary.Factura, CvePAC As Integer) As String +' Throw New NotImplementedException() +' End Function + +' Public Overrides Function Timbre() As String +' Throw New NotImplementedException() +' End Function +'End Class + diff --git a/Empresas/Grales/Formatos/RHGafete.rdlc b/Empresas/Grales/Formatos/RHGafete.rdlc index 4e950f982..7eda769b1 100644 --- a/Empresas/Grales/Formatos/RHGafete.rdlc +++ b/Empresas/Grales/Formatos/RHGafete.rdlc @@ -4,20 +4,6 @@ - - Embedded - Logo - FitProportional - 0.41929cm - 1.2827cm - 3.23567cm - 4.49779cm - - - - true true @@ -41,7 +27,6 @@ 0.381cm 0.6cm 1.74625cm - 1 @@ -60,7 +45,7 @@ 4.21416cm 2.78048cm 2.21979cm - 2 + 1 @@ -107,7 +92,7 @@ 0.28575cm 0cm 3.2225cm - 4 + 3 @@ -156,7 +141,7 @@ 0.28575cm 0cm 3.10079cm - 6 + 5 @@ -205,7 +190,7 @@ 3.61103cm 0cm 2.82292cm - 8 + 7 @@ -270,7 +255,7 @@ 6.97976cm 0.41303cm 1.04599cm - 10 + 9 @@ -303,7 +288,7 @@ 6.97976cm 0.41628cm 1.08479cm - 11 + 10 @@ -336,7 +321,7 @@ 6.97976cm 0.43596cm 3.37312cm - 12 + 11 @@ -369,7 +354,7 @@ 6.97976cm 0.39892cm 1.55985cm - 13 + 12 @@ -402,7 +387,7 @@ 6.97976cm 0.3901cm 2.36625cm - 14 + 13 @@ -435,7 +420,7 @@ 6.97976cm 0.40421cm 1.58424cm - 15 + 14 @@ -468,7 +453,7 @@ 6.95537cm 0.43118cm 3.37312cm - 16 + 15 @@ -501,7 +486,7 @@ 6.95537cm 0.37069cm 1.07037cm - 17 + 16 @@ -534,7 +519,7 @@ 6.97976cm 0.4601cm 2.10312cm - 18 + 17 @@ -567,7 +552,7 @@ 6.97976cm 0.42008cm 1.04599cm - 19 + 18 @@ -600,7 +585,7 @@ 6.95537cm 0.44125cm 1.96378cm - 20 + 19 @@ -616,7 +601,7 @@ 8.06455cm 0cm 5.59245cm - 21 + 20 @@ -837,7 +822,7 @@ 6.97976cm 0.89104cm 6.67724cm - 33 + 32 @@ -870,7 +855,7 @@ 8.04338cm 0.34247cm 5.61362cm - 34 + 33 @@ -902,7 +887,7 @@ 8.06455cm 0.33894cm 5.59245cm - 35 + 34 @@ -934,7 +919,7 @@ 10.38816cm 0.34776cm 3.26884cm - 36 + 35 @@ -966,7 +951,7 @@ 8.63838cm 0.2384cm 5.01862cm - 37 + 36 @@ -998,7 +983,7 @@ 9.34601cm 0.30719cm 4.31099cm - 38 + 37 @@ -1030,7 +1015,7 @@ 8.46874cm 0.27544cm 5.16176cm - 39 + 38 @@ -1062,7 +1047,7 @@ 10.39905cm 0.32535cm 3.25795cm - 40 + 39 @@ -1094,7 +1079,7 @@ 8.06455cm 0.32131cm 5.59245cm - 41 + 40 @@ -1126,7 +1111,7 @@ 9.15344cm 0.30543cm 4.50356cm - 42 + 41 @@ -1166,7 +1151,7 @@ 0.381cm 1.4631cm 6.05295cm - 43 + 42 @@ -1200,7 +1185,7 @@ 3.61103cm 0.41382cm 2.82292cm - 44 + 43 @@ -1232,7 +1217,7 @@ 8.0963cm 0.38481cm 5.5607cm - 45 + 44 @@ -1264,7 +1249,7 @@ 9.01439cm 0.33189cm 4.6426cm - 46 + 45 @@ -1280,7 +1265,7 @@ 2.02882cm 0cm 4.40513cm - 47 + 46 @@ -3025,7 +3025,7 @@ - $ + =IIf(not IsNothing(Fields!ConceptoD.Value) ORELSE Fields!ImporteD.Value >0,"$"," ") @@ -4194,7 +4194,7 @@ - Percepciones y deducciones que en el aparecen a la fecha COMPUPROVEEDORES SA DE CV no me adeuda + Percepciones y deducciones que en el aparecen a la fecha [@Empresa] no me adeuda