diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 3af79410f..eeaf57f4e 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -3385,7 +3385,7 @@ Public Class ClsVentas Public Function GetReportePadreVentasUtilidad(CveVendedor As String, CveCliente As Integer, CveSubProyecto As String, FechaInicio As Date, FechaFin As Date, CveEmpresa As Integer, Gpo As Integer, CvePS As Integer, CveCategoria As Integer, CveClasificacion As Integer, CveMarca As Integer, EsGarantia As Integer, EsFilial As Integer) As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Vta_RepVentasUtilidadGetOIC") + DataAdapter("PA_Vta_RepVentasUtilidadGet") With SqlAdapter.SelectCommand.Parameters .Add("@FechaI", SqlDbType.Date).Value = FechaInicio diff --git a/Transportes/RepContratoDetalle.aspx b/Transportes/RepContratoDetalle.aspx index 192e6d424..41ed03331 100644 --- a/Transportes/RepContratoDetalle.aspx +++ b/Transportes/RepContratoDetalle.aspx @@ -248,7 +248,7 @@
- 0) + { + Info = Info.Remove(Info.Length - 1, 1); + SBJSScript.AppendFormat("graficahighcharts('{0}','{1}','{2}','{3}',[{4}],1,'{5}');", divcontainer.ClientID, Titulo, SubTitulo, YReferencia, Info, XReferencia); + } + } else { diff --git a/Ventas/RepVentas.aspx b/Ventas/RepVentas.aspx index bffd19571..a53fa9176 100644 --- a/Ventas/RepVentas.aspx +++ b/Ventas/RepVentas.aspx @@ -98,11 +98,9 @@
  • Ver Grafica
  • -
  • Descarga Carta Porte
  • - @@ -365,7 +363,7 @@ - + <%--0--%> @@ -413,8 +411,25 @@ <%--18--%> - - + + + <%-- + --%> + + <%--19--%> + + + + + + + <%--20--%> + + + + + + diff --git a/Ventas/RepVentas.aspx.vb b/Ventas/RepVentas.aspx.vb index 4d62c3e71..e4e9cfe1f 100644 --- a/Ventas/RepVentas.aspx.vb +++ b/Ventas/RepVentas.aspx.vb @@ -513,7 +513,18 @@ Partial Class Ventas_RepVentas End If End If End If + + + If UsuarioActual.Empresa.Funcionalidad(382) = "1" Then + e.Row.FCLabel("LblCreditoPorcentaje").Visible = True + e.Row.FCLabel("LblContadoPorcentaje").Visible = True + End If + + + + End If + End Sub #End Region diff --git a/Ventas/RepVentasPeriodo.aspx.vb b/Ventas/RepVentasPeriodo.aspx.vb index b85cdc859..9006ed481 100644 --- a/Ventas/RepVentasPeriodo.aspx.vb +++ b/Ventas/RepVentasPeriodo.aspx.vb @@ -396,14 +396,18 @@ Partial Class RepVentasPeriodo Dim moneda As String = DbRow("Moneda").ToString Dim total As String = DbRow("GPO").ToString If total <> "Total Peso Mexicano" Then - If moneda = "Peso Mexicano" Then + If moneda.ToUpper.Contains("PESO") Then Info = String.Format("{2}['{1}',{0}],", DbRow(ColValue), DbRow(ColTitle), Info) End If End If Next - Info = Info.Remove(Info.Length - 1, 1) - SBJSScript.AppendFormat("graficahighcharts('{0}','{1}','{2}','{3}',[{4}],1,'{5}');", divcontainer.ClientID, Titulo, SubTitulo, YReferencia, Info, XReferencia) + If Info.Length > 0 Then + Info = Info.Remove(Info.Length - 1, 1) + SBJSScript.AppendFormat("graficahighcharts('{0}','{1}','{2}','{3}',[{4}],1,'{5}');", divcontainer.ClientID, Titulo, SubTitulo, YReferencia, Info, XReferencia) + End If + + Else SBJSScript.AppendFormat("graficahighcharts('{0}','{1}','{2}','{3}',[{4}],1,'{5}');", divcontainer.ClientID, Titulo, SubTitulo, YReferencia, " ", XReferencia) End If diff --git a/Ventas/RepVentasUtilidadPadre.aspx b/Ventas/RepVentasUtilidadPadre.aspx index cad6b2f04..e6bb4b11e 100644 --- a/Ventas/RepVentasUtilidadPadre.aspx +++ b/Ventas/RepVentasUtilidadPadre.aspx @@ -238,14 +238,27 @@ + CssClass="table table-advance table-hover Widthall ScrollAD" data-sort="true" GridLines="None" Width="100%" OnRowDataBound="GvDatos_RowDataBound"> - + <%-- - + --%> + + + + + + + + + + + + + diff --git a/Ventas/RepVentasUtilidadPadre.aspx.vb b/Ventas/RepVentasUtilidadPadre.aspx.vb index eff0b437d..81df03936 100644 --- a/Ventas/RepVentasUtilidadPadre.aspx.vb +++ b/Ventas/RepVentasUtilidadPadre.aspx.vb @@ -32,10 +32,10 @@ Partial Class Ventas_RepVentasUtilidadPadre Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not IsPostBack Then - If UsuarioActual.Empresa.Funcionalidad(382) <> "1" Then - GvDatos.Columns(3).Visible = False - GvDatos.Columns(5).Visible = False - End If + 'If UsuarioActual.Empresa.Funcionalidad(382) <> "1" Then + ' GvDatos.Columns(3).Visible = False + ' GvDatos.Columns(5).Visible = False + 'End If CargaCombos() End If @@ -264,6 +264,10 @@ Partial Class Ventas_RepVentasUtilidadPadre End If + If UsuarioActual.Empresa.Funcionalidad(382) = "1" Then + e.Row.FCLabel("LblPorcentajeCredito").Visible = True + e.Row.FCLabel("LblPorcentajeContado").Visible = True + End If End If End Sub