From 99977215f084bdf4a605e0f9c11e5dae84b9d0e2 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Tue, 10 Mar 2020 20:17:03 -0700 Subject: [PATCH] Tipo de cambio en reporte de ingresos --- App_Code/ClsVentas.vb | 4 ++- Ventas/RepIngresos.aspx | 48 +++++++++++++++++++++++++--- Ventas/RepIngresos.aspx.vb | 64 +++++++++++++++++++++++++++++++------- 3 files changed, 99 insertions(+), 17 deletions(-) diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 8d8369a89..0b43caa60 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -3963,7 +3963,7 @@ Public Class ClsVentas #End Region - Public Function RepIngresos(CveEmpresa As Integer, FechaInicio As Date, FechaFin As Date, TipoDocto As String, Cves_Subprotectos As String) As Boolean + Public Function RepIngresos(CveEmpresa As Integer, FechaInicio As Date, FechaFin As Date, TipoDocto As String, Cves_Subprotectos As String, Optional TipoCambio As Integer = 1, Optional TCEspecifico As Decimal = -1) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Ventas_RepIngresos", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters @@ -3972,6 +3972,8 @@ Public Class ClsVentas .Add("@TipoDoc", SqlDbType.VarChar).Value = TipoDocto .Add("@Cves_Subprotectos", SqlDbType.VarChar).Value = Cves_Subprotectos .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@TipoCambio", SqlDbType.Int).Value = TipoCambio + .Add("@TCEspecifico", SqlDbType.Float).Value = TCEspecifico End With Try SqlAdapter.Fill(Data) diff --git a/Ventas/RepIngresos.aspx b/Ventas/RepIngresos.aspx index 3a763c711..460a9e479 100644 --- a/Ventas/RepIngresos.aspx +++ b/Ventas/RepIngresos.aspx @@ -68,6 +68,9 @@
  • Excel
    • +
  • + Ver Dlls en pesos +
    • @@ -122,11 +125,11 @@ -
    +
    - + @@ -134,14 +137,13 @@ - <%-- + <%-- --%> -
    @@ -162,7 +164,7 @@ + DataKeyNames="Importe,Descuento,Amortizacion,IVA,IEPS,ImpuestoLocal,Total" OnRowDataBound="GVRepIngresos_RowDataBound"> @@ -208,6 +210,42 @@ + + + + + diff --git a/Ventas/RepIngresos.aspx.vb b/Ventas/RepIngresos.aspx.vb index 021cd086b..9bb39a6f6 100644 --- a/Ventas/RepIngresos.aspx.vb +++ b/Ventas/RepIngresos.aspx.vb @@ -70,10 +70,31 @@ Partial Class Ventas_RepIngresos ViewState("DtDatos") = value End Set End Property + + Private Property TipoCambio As Integer + Get + Return ViewState("TipoCambio").ToString.ToEntero + End Get + + Set(value As Integer) + ViewState("TipoCambio") = value + End Set + End Property + Private Property TCEspecifico As Decimal + Get + Return ViewState("TCEspecifico").ToString.ToDecimal + End Get + + Set(value As Decimal) + ViewState("TCEspecifico") = value + End Set + End Property #End Region Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not IsPostBack Then + TCEspecifico = -1 + TipoCambio = 1 CveSubProyecto = -1 TxtFechaInicio.Text = String.Format("01/01/{0}", Now.Year) DdlSubProyecto.DataSource = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, -1, 1) @@ -82,17 +103,21 @@ Partial Class Ventas_RepIngresos End If End Sub - Protected Sub CargaRepIngresos(Optional tipoReporte As Integer = -1) - Dim ObjRepI As New ClsVentas() - + Protected Sub CargaRepIngresos(Optional tipoReporte As Integer = -1) Dim Cves_Subprotectos As String = If(DdlSubProyecto.GetSelectedValuesM = "", "-1", DdlSubProyecto.GetSelectedValuesM) - Dim TiposDoc As String = If(DdlTipoDocto.GetSelectedValuesM = "", "-1", DdlTipoDocto.GetSelectedValuesM) - - - - ObjRepI.RepIngresos(UsuarioActual.CveEmpresa, If(RsFechaI = "-1", MinFecha, RsFechaI.ToDate), If(RsFechaF = "-1", MaxFecha, RsFechaF.ToDate), TiposDoc, Cves_Subprotectos) - GVRepIngresos.DataSource = ObjRepI.DtResultados - DtDatos = ObjRepI.DtResultados + Dim TiposDoc As String = If(DdlTipoDocto.GetSelectedValuesM = "", "-1", DdlTipoDocto.GetSelectedValuesM) + + If RblTipoCambio.SelectedValue.ToEntero = 3 And TxtEspecifico.Text <> "" Then + TCEspecifico = TxtEspecifico.Text.ToDecimal + Else + TCEspecifico = -1 + End If + + Dim ObjRepI As New ClsVentas() + If ObjRepI.RepIngresos(UsuarioActual.CveEmpresa, If(RsFechaI = "-1", MinFecha, RsFechaI.ToDate), If(RsFechaF = "-1", MaxFecha, RsFechaF.ToDate), TiposDoc, Cves_Subprotectos, TipoCambio:=TipoCambio, TCEspecifico:=TCEspecifico) Then + GVRepIngresos.DataSource = ObjRepI.DtResultados + DtDatos = ObjRepI.DtResultados + End If ObjRepI.Dispose() GVRepIngresos.DataBind() upDatosRepI.Update() @@ -147,9 +172,26 @@ Partial Class Ventas_RepIngresos #End Region Protected Sub GVRepIngresos_RowDataBound(sender As Object, e As GridViewRowEventArgs) If e.Row.RowType = DataControlRowType.DataRow Then - If e.Row.DBCampo("ConceptoContable").Contiene("INGRESOS", "ANTICIPOS") Then + If e.Row.DBCampo("TipoAmortizacion") = "" Then e.Row.CssClass = "Totales" + ElseIf e.Row.DBCampo("TipoAmortizacion") <> "" AndAlso e.Row.DBCampo("CveConceptoContable") = "-1" Then + e.Row.CssClass = "SubTotales" End If End If End Sub + Private Sub RblTipoCambio_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RblTipoCambio.SelectedIndexChanged + TipoCambio = RblTipoCambio.SelectedValue.ToEntero + If TipoCambio = 3 Then + LiEspecifico.Visible = True + TCEspecifico = GlobalTipoCambio(Now).ToDecimal + TxtEspecifico.Text = TCEspecifico.ToString + Else + LiEspecifico.Visible = False + End If + UpBodyTipoCambio.Update() + End Sub + Private Sub BtnTipoCambio_Click(sender As Object, e As EventArgs) Handles BtnTipoCambio.Click + RegistraScript(String.Format("$('#{0}').modal('hide');", "DivTipoCambio")) + LnkFiltrar_Click(LnkFiltrar, EventArgs.Empty) + End Sub End Class