diff --git a/App_Code/ClsCompProveedores.vb b/App_Code/ClsCompProveedores.vb index 3ffbe0066..2b3e7301e 100644 --- a/App_Code/ClsCompProveedores.vb +++ b/App_Code/ClsCompProveedores.vb @@ -66,6 +66,7 @@ Public Class ClsCompProveedores Public Property DIOTNacionalidad As String Public Property CveRegimenFiscal As Integer = -1 Public Property PorcentajeProntoPago As Decimal = 0D + Public Property AplicaProntoPago As Boolean = False Public Property CveTipoFechaVencimiento As Integer = 1 Public ReadOnly Property DtResultados() As DataTable @@ -303,6 +304,7 @@ Public Class ClsCompProveedores Me.DIOTNacionalidad = Data.Rows(0)("DIOTNacionalidad").ToString Me.CveRegimenFiscal = Data.Rows(0)("CveRegimenFiscal").ToString.ToEntero Me.PorcentajeProntoPago = Data.Rows(0)("PorcentajeProntoPago").ToString.ToDecimal + Me.AplicaProntoPago = Data.Rows(0)("AplicaProntoPago").ToString.ToBool Me.CveTipoFechaVencimiento = Data.Rows(0)("CveTipoFechaVencimiento").ToString.ToEntero End If @@ -321,7 +323,7 @@ Public Class ClsCompProveedores CveProveedorClasificacion As Integer, CveUsuarioResponsable As Integer, NotificarA As String, CorreoCobranza As String, FolioDuplicado As Boolean, CveUsuario As Integer, CveEmpresa As Integer, Optional CveTipoProveedor As Integer = 1, Optional CveMonedaPreferente As Integer = 1, Optional UsaLimiteCredito As Boolean = False, Optional DIOTCveTipoTercero As Integer = -1, Optional DIOTCveTipoOperacion As Integer = -1, Optional DIOTNumeroIDFiscal As String = "", Optional AplicarEvaluacion As Boolean = False, Optional FechaEvaluacion As String = "-1", Optional CicloEvaluacion As Integer = -1, Optional DIOTCvePais As Integer = -1, Optional CveUsuarioEvaluador As Integer = -1, Optional CP As Integer = 0, Optional DIOTNacionalidad As String = "", - Optional CveConfianzaProveedor As Integer = -1, Optional CveRegimenFiscal As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0) As Boolean + Optional CveConfianzaProveedor As Integer = -1, Optional CveRegimenFiscal As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0, Optional AplicaProntoPago As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -372,6 +374,7 @@ Public Class ClsCompProveedores .Add("@CveConfianzaProveedor", SqlDbType.Int).Value = CveConfianzaProveedor .Add("@CveRegimenFiscal", SqlDbType.TinyInt).Value = CveRegimenFiscal .Add("@PorcentajeProntoPago", SqlDbType.Decimal).Value = PorcentajeProntoPago + .Add("@AplicaProntoPago", SqlDbType.Bit).Value = AplicaProntoPago .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue End With @@ -407,7 +410,7 @@ Public Class ClsCompProveedores CveProveedorClasificacion As Integer, CveUsuarioResponsable As Integer, Estatus As Boolean, NotificarA As String, CorreoCobranza As String, FolioDuplicado As Boolean, CveProveedor As Integer, Optional CveTipoProveedor As Integer = 1, Optional CveMonedaPreferente As Integer = 1, Optional UsaLimiteCredito As Boolean = False, Optional DIOTCveTipoTercero As Integer = -1, Optional DIOTCveTipoOperacion As Integer = -1, Optional DIOTNumeroIDFiscal As String = "", Optional CveUsuarioModifico As Integer = -1, Optional AplicarEvaluacion As Boolean = False, Optional FechaEvaluacion As String = "-1", Optional CicloEvaluacion As Integer = -1, Optional DIOTCvePais As Integer = -1, Optional CveUsuarioEvaluador As Integer = -1, Optional CP As Integer = 0, Optional DIOTNacionalidad As String = "", - Optional CveConfianzaProveedor As Integer = -1, Optional CveRegimenFiscal As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0) As Boolean + Optional CveConfianzaProveedor As Integer = -1, Optional CveRegimenFiscal As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0, Optional AplicaProntoPago As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Comp_ProveedorUpdate") @@ -457,26 +460,10 @@ Public Class ClsCompProveedores .Add("@FechaEvaluacion", SqlDbType.VarChar).Value = FechaEvaluacion .Add("@CveUsuarioEvaluador", SqlDbType.Int).Value = CveUsuarioEvaluador - .Add("@CveConfianzaProveedor", SqlDbType.Int).Value = CveConfianzaProveedor .Add("@CveRegimenFiscal", SqlDbType.TinyInt).Value = CveRegimenFiscal .Add("@PorcentajeProntoPago", SqlDbType.Decimal).Value = PorcentajeProntoPago - - ''Proveedores - '.Add("@IdCtaContProveedores", SqlDbType.Int).Value = IdCtaContProveedores - '.Add("@CtaContProveedores", SqlDbType.VarChar).Value = CtaContProveedores - '.Add("@IdCtaContExtranjera", SqlDbType.Int).Value = IdCtaContExtranjera - '.Add("@CtaContExtranjera", SqlDbType.VarChar).Value = CtaContExtranjera - '.Add("@IdCtaContComplementaria", SqlDbType.Int).Value = IdCtaContComplementaria - '.Add("@CtaContComplementaria", SqlDbType.VarChar).Value = CtaContComplementaria - - ''Anticipos - '.Add("@IdCtaContAnticipos", SqlDbType.Int).Value = IdCtaContAnticipos - '.Add("@CtaContAnticipos", SqlDbType.VarChar).Value = CtaContAnticipos - '.Add("@IdCtaContAnticiposExtranjera", SqlDbType.Int).Value = IdCtaContAnticiposExtranjera - '.Add("@CtaContAnticiposExtranjera", SqlDbType.VarChar).Value = CtaContAnticiposExtranjera - '.Add("@IdCtaContAnticiposComplementaria", SqlDbType.Int).Value = IdCtaContAnticiposComplementaria - '.Add("@CtaContAnticiposComplementaria", SqlDbType.VarChar).Value = CtaContAnticiposComplementaria + .Add("@AplicaProntoPago", SqlDbType.Bit).Value = AplicaProntoPago End With diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index 944f482ba..787cf4be5 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -5488,14 +5488,15 @@ Public Class ClsContabilidad End Function - Public Function GetGastosRepCC(FechaInicio As DateTime, FechaFin As DateTime, CveEmpresa As Integer) As Boolean + Public Function GetGastosRepCC(FechaInicio As DateTime, FechaFin As DateTime, CveProyecto As Integer, CveSubProyecto As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Conta_ReporteGastos") - With SqlAdapter.SelectCommand.Parameters .Add("@FechaInicio", SqlDbType.DateTime).Value = FechaInicio .Add("@FechaFin", SqlDbType.DateTime).Value = FechaFin + .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto + .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With diff --git a/App_Code/ClsMovimientos.vb b/App_Code/ClsMovimientos.vb index 373a3253f..cdc27bcdb 100644 --- a/App_Code/ClsMovimientos.vb +++ b/App_Code/ClsMovimientos.vb @@ -596,7 +596,7 @@ Public Class ClsMovimientos Public Function GetCxPEmpresa(CveProveedor As Integer, FechaVencimientoInicio As String, FechaVencimientoFin As String, CveSubProyecto As Integer, DiasVencidos As Integer, CveUsuarioRegistro As Integer, CveUsuarioProgramo As Integer, CveUsuarioResponsable As Integer, CveClasificacion As Integer, CveMoneda As Integer, CveTipoPagoProgramo As Integer, CveEstatusFactura As Integer, CveAplicaNC As Integer, CveEmpresa As Integer, Optional FechaVI As String = "-1", Optional FechaVF As String = "-1", Optional CodigoProgramacion As String = "-1", Optional CveTipoProveedor As Integer = 0, - Optional AgrupadoPorSubProyecto As Boolean = False, Optional VerEnPesos As Boolean = False) As Boolean + Optional AgrupadoPorSubProyecto As Boolean = False, Optional VerEnPesos As Boolean = False, Optional AplicaProntoPago As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Banc_Proveedores") With SqlAdapter.SelectCommand.Parameters @@ -620,6 +620,7 @@ Public Class ClsMovimientos .Add("@CveTipoProveedor", SqlDbType.TinyInt).Value = CveTipoProveedor .Add("@AgrupadoPorSubProyecto", SqlDbType.Bit).Value = AgrupadoPorSubProyecto .Add("@VerEnPesos", SqlDbType.Bit).Value = VerEnPesos + .Add("@AplicaProntoPago", SqlDbType.Int).Value = AplicaProntoPago End With Try @@ -662,8 +663,6 @@ Public Class ClsMovimientos End With - - Try SqlAdapter.SelectCommand.CommandTimeout = 0 @@ -709,7 +708,8 @@ Public Class ClsMovimientos Optional FechaVI As String = "-1", Optional FechaVF As String = "-1", Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveTipoProveedor As Integer = -1, Optional Comprobaciones As Integer = -1, - Optional TipoDocto As String = "-1", Optional TipoAgrupacion As Integer = -1, Optional CveProyecto As Integer = -1) As Boolean + Optional TipoDocto As String = "-1", Optional TipoAgrupacion As Integer = -1, + Optional CveProyecto As Integer = -1, Optional AplicaProntoPago As Integer = -1) As Boolean Dim Retorno As Boolean = False If FechaCorte = Nothing Then FechaCorte = ClsPaginas.NowADS() @@ -739,8 +739,8 @@ Public Class ClsMovimientos .Add("@Comprobaciones", SqlDbType.Int).Value = Comprobaciones .Add("@TipoDocto", SqlDbType.VarChar).Value = TipoDocto .Add("@TipoAgrupacion", SqlDbType.Int).Value = TipoAgrupacion - .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto - + .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto + .Add("@AplicaProntoPago", SqlDbType.Int).Value = AplicaProntoPago End With Try @@ -1338,7 +1338,8 @@ Public Class ClsMovimientos CveEstatusFactura As Integer, Fecha As String, Agrupador As Integer, Opcion As String, CveEmpresa As Integer, CveSucursal As Integer, TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional FechaVI As String = "-1", Optional FechaVF As String = "1", Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveTipoProveedor As Integer = -1, - Optional Comprobaciones As Integer = -1, Optional AplicaNC As Integer = -1, Optional TipoDocto As String = "-1", Optional CveProyecto As Integer = -1) As Boolean + Optional Comprobaciones As Integer = -1, Optional AplicaNC As Integer = -1, Optional TipoDocto As String = "-1", + Optional CveProyecto As Integer = -1, Optional AplicaProntoPago As Integer = -1) As Boolean Dim Retorno As Boolean = False If FechaCorte = Nothing Then FechaCorte = ClsPaginas.NowADS() @@ -1373,7 +1374,8 @@ Public Class ClsMovimientos .Add("@Comprobaciones", SqlDbType.Int).Value = Comprobaciones .Add("@AplicaNC", SqlDbType.Int).Value = AplicaNC .Add("@TipoDocto", SqlDbType.VarChar).Value = TipoDocto - .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto + .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto + .Add("@AplicaProntoPago", SqlDbType.Int).Value = AplicaProntoPago End With Try diff --git a/Contabilidad/RepGastosCC.aspx b/Contabilidad/RepGastosCC.aspx index 9f918e6a6..05c33dbc7 100644 --- a/Contabilidad/RepGastosCC.aspx +++ b/Contabilidad/RepGastosCC.aspx @@ -206,6 +206,16 @@ table.adssigscroll { + Proyecto: +
+ +
+ SubProyecto: +
+ + + +
diff --git a/Contabilidad/RepGastosCC.aspx.vb b/Contabilidad/RepGastosCC.aspx.vb index 90d6291b3..75d8893d6 100644 --- a/Contabilidad/RepGastosCC.aspx.vb +++ b/Contabilidad/RepGastosCC.aspx.vb @@ -21,20 +21,23 @@ Partial Class RepGastosCC #End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then - - txtFechaI.Text = NowADS().FirstDayOfMonth.ToShortDateString() txtFechaF.Text = NowADS().ToShortDateString OrdenaDatos() - + CargaCombos() End If End Sub + Private Sub CargaCombos() + CargarCentrosDeCosto(DdlProyecto, DdlSubProyecto, LblProyecto, LblSubProyecto, divProyecto:=DivProyecto, VisualizacionReporte:=1) + + End Sub + #Region " C A R G A - D A T O S " Public Sub CargaDatos() Dim Obj As New ClsContabilidad - If Obj.GetGastosRepCC(txtFechaI.Text.Trim.ToDate, txtFechaF.Text.Trim().ToDate, UsuarioActual.CveEmpresa) Then + If Obj.GetGastosRepCC(txtFechaI.Text.Trim.ToDate, txtFechaF.Text.Trim().ToDate, DdlProyecto.SelectedValue.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then Dim dt As DataTable = Obj.DtResultados If DdlOpcionCuenta.SelectedValue = "2" Then dt = dt.FiltraParametros("Total > 0")