diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 248134785..ae1e97b84 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -1377,7 +1377,7 @@ Public Class ClsNominas Public Function AddConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveUsuario As Integer, CveEmpresa As Integer, EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer, AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer, CveSATConcepto As Integer, - ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer) As Integer + ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer, CveConceptoContablePasivo As Integer) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Nom_ConceptosAdd") @@ -1411,6 +1411,7 @@ Public Class ClsNominas .Add("CveConceptoContableB", SqlDbType.Int).Value = cveConceptoContableB .Add("IdCtaContableB", SqlDbType.Int).Value = IdCtaContableB .Add("CveCuentaB", SqlDbType.Int).Value = CveCuentaB + .Add("CveConceptoContablePasivo", SqlDbType.Int).Value = CveConceptoContablePasivo End With @@ -1437,7 +1438,7 @@ Public Class ClsNominas Public Function UpdateConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveConcepto As Integer, EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer, AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer, CveSATConcepto As Integer, CveEmpresa As Integer, - ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer) As Boolean + ctaImporteNegativoProv As Integer, contabiliza As Integer, CargoOAbono As Integer, cveConceptoContableB As Integer, IdCtaContableB As Integer, CveCuentaB As Integer, CveConceptoContablePasivo As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Nom_ConceptosUpdate") @@ -1470,6 +1471,7 @@ Public Class ClsNominas .Add("CveConceptoContableB", SqlDbType.Int).Value = cveConceptoContableB .Add("IdCtaContableB", SqlDbType.Int).Value = IdCtaContableB .Add("CveCuentaB", SqlDbType.Int).Value = CveCuentaB + .Add("CveConceptoContablePasivo", SqlDbType.Int).Value = CveConceptoContablePasivo End With Try diff --git a/Bancos/ConciliacionesBancarias.aspx.vb b/Bancos/ConciliacionesBancarias.aspx.vb index 09b8a8a2f..2cdc55b14 100644 --- a/Bancos/ConciliacionesBancarias.aspx.vb +++ b/Bancos/ConciliacionesBancarias.aspx.vb @@ -638,14 +638,14 @@ Partial Class Bancos_ConciliacionesBancariasaspx End If End If If CveCuenta > 0 Then - If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuenta, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1") Then + If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuenta, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1", -1) Then If ObjConta.DtResultados.Rows.Count > 1 Then SaldoFinalContabilidad = ObjConta.DtResultados.Rows(1)("SaldoActual").ToString.ToDouble End If End If End If If CveCuentaComplementaria > 0 Then - If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuentaComplementaria, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1") Then + If ObjConta.GetMovimientosAuxiliaresCatalogo(CveCuentaComplementaria, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, CveMoneda, -1, -1, UsuarioActual.CveEmpresa, "1", -1) Then If ObjConta.DtResultados.Rows.Count > 1 Then SaldoFinalContabilidadComplementaria = ObjConta.DtResultados.Rows(1)("SaldoActual").ToString.ToDouble End If diff --git a/Contabilidad2/RepAnexoCatalogo.aspx b/Contabilidad2/RepAnexoCatalogo.aspx index 0b8a4c964..0fad8f8d2 100644 --- a/Contabilidad2/RepAnexoCatalogo.aspx +++ b/Contabilidad2/RepAnexoCatalogo.aspx @@ -127,6 +127,7 @@ + diff --git a/Nomina/ConceptoNomina.aspx b/Nomina/ConceptoNomina.aspx index d2db06b9e..7a68835f7 100644 --- a/Nomina/ConceptoNomina.aspx +++ b/Nomina/ConceptoNomina.aspx @@ -223,7 +223,7 @@