diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index 45b574d7b..0b9ca4444 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -10,6 +10,51 @@ Imports Microsoft.Reporting.WebForms Namespace Modelos + + Public Class NConcepto +#Region "Percepciones" + Public Property NoConceptoP As String + Public Property ConceptoP As String + Public Property LabelValorP As String + Public Property CveConceptoP As Integer + Public Property ImporteP As Double + Public Property ImporteGravadoP As Double + Public Property ValorP As Double + Public Property EstatusP As Integer + Public Property isSavedP As Integer + Public Property isEditedP As Integer + Public Property isOnlyBisibleP As Integer + Public Property CveSistemaP As Integer +#End Region +#Region "Deducciones" + Public Property NoConceptoD As String + Public Property ConceptoD As String + Public Property LabelValorD As String + Public Property CveConceptoD As Integer + Public Property ImporteD As Double + Public Property ImporteGravadoD As Double + Public Property ValorD As Double + Public Property EstatusD As Integer + Public Property isSavedD As Integer + Public Property isEditedD As Integer + Public Property isOnlyBisibleD As Integer + Public Property CveSistemaD As Integer +#End Region +#Region "Obligaciones" + Public Property NoConceptoO As String + Public Property ConceptoO As String + Public Property LabelValorO As String + Public Property CveConceptoO As Integer + Public Property ImporteO As Double + Public Property ImporteGravadoO As Double + Public Property ValorO As Double + Public Property EstatusO As Integer + Public Property isEditedO As Integer + Public Property isOnlyBisibleO As Integer + Public Property CveSistemaO As Integer +#End Region + End Class + Public Class PlantillasPolizas Public Property CvePlantillaPoliza As Integer diff --git a/Nomina/Finiquito.aspx b/Nomina/Finiquito.aspx index 845e0eb40..a04dd6a9f 100644 --- a/Nomina/Finiquito.aspx +++ b/Nomina/Finiquito.aspx @@ -67,6 +67,53 @@ font-weight: bold; font-size: 15px; } + + .isOnlyVisible { + color: #666; + /*text-decoration: line-through;*/ + } + + .isOnlyBisibleP td:nth-child(1) { + /*text-decoration: line-through;*/ + } + + .isOnlyBisibleD td:nth-last-child(3) { + /*text-decoration: line-through;*/ + } + + .isEditedP td:nth-child(-n+3) { + text-decoration: underline; + } + + .isEditedD td:nth-last-child(-n+3) { + text-decoration: underline; + } + + .isOnlyBisibleP td:nth-child(-n+3) { + color: #999; + } + + .isOnlyBisibleD td:nth-last-child(-n+3) { + color: #999; + } + + .isOnlyBisibleP td:nth-child(-n+3) a { + color: #999; + } + + .isOnlyBisibleD td:nth-last-child(-n+3) a { + color: #999; + } + + .isOnlyBisibleO td:nth-last-child(-n+3) a { + color: #999; + } + + .GvConceptos td { + font-size: 11px; + padding-top: 2px; + padding-bottom: 2px; + } @@ -83,6 +130,9 @@
  • done_allAutorizar
  • +
  • + Desautorizar nómina +
  • Timbrar
  • @@ -332,7 +382,7 @@ + DataKeyNames="ConceptoP,CveConceptoP,ImporteP,ValorP,EstatusP,ConceptoD,CveConceptoD,ImporteD,isOnlyBisibleP,isOnlyBisibleD,EstatusD,ValorD,isEditedD,isEditedP,isSavedP,isSavedD"> @@ -407,7 +457,7 @@
    + DataKeyNames="ConceptoP,CveConceptoP,ImporteP,ValorP,EstatusP,ConceptoD,CveConceptoD,ImporteD,isOnlyBisibleP,isOnlyBisibleD,EstatusD,ValorD,isEditedD,isEditedP,isSavedP,isSavedD"> @@ -479,20 +529,46 @@
    -
    - - - + +
    +
    +
    Calcular automatico
    -
    - - - +
    +
    +
    + + + +
    +
    +
    + +
    -
    - - - +
    +
    +
    + + + +
    +
    +
    + +
    +
    +
    +
    +
    + + + +
    +
    +
    + +