diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index b3ebebe4c..1d615c06a 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -1080,8 +1080,6 @@
- - <%----%> <%--width="100%"--%> @@ -1112,6 +1110,10 @@ + - + + -
P.U.  + Costo
+ Utilidad +
Desc Predial @@ -1133,7 +1135,7 @@
@@ -1239,6 +1241,9 @@ + + @@ -1260,12 +1265,8 @@ - -
- <%--
--%> <%--10--%> + + +
+ +
+
+ <%--11--%> @@ -1441,7 +1449,7 @@ - <%--11--%> + <%--12--%> @@ -1450,7 +1458,7 @@ - <%--12--%> + <%--13--%>
@@ -1458,7 +1466,7 @@
<%----%> - <%--13--%> + <%--14--%>
@@ -1466,17 +1474,17 @@
<%----%> - <%--14--%> - <%--15--%> - + <%--16--%> + + <%--17--%> - <%--17--%> + <%--18--%>
@@ -1490,14 +1498,14 @@ CssClass="btn btn-circle btn-sm green" Text="" /> - <%--18--%> + <%--19--%> - <%--19--%> + <%--20--%> - <%--20--%> + <%--21--%> @@ -1517,21 +1525,14 @@ - <%--21--%> + <%--22--%> - <%--22--%> - <%--23--%> - - -
- -
-
+ diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index c256dd38c..7034079f9 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -20,15 +20,15 @@ Partial Class Ventas #Region "Propiedades" Private Const NumeroDecimales As Integer = 2 - Dim ColumnaDescuento As Integer = 10 - Dim ColumnaPredial As Integer = 11 + Dim ColumnaDescuento As Integer = 11 + Dim ColumnaPredial As Integer = 12 Dim ColumnaSubProyecto As Integer = 8 - Dim ColumnaIVA As Integer = 12 - Dim ColumnaIEPS As Integer = 13 - Dim ColumnaRetIVA As Integer = 14 - Dim ColumnaRetISR As Integer = 15 - Dim ColumnaEditar As Integer = 17 - Dim ColumnaEliminar As Integer = 18 + Dim ColumnaIVA As Integer = 13 + Dim ColumnaIEPS As Integer = 14 + Dim ColumnaRetIVA As Integer = 15 + Dim ColumnaRetISR As Integer = 16 + Dim ColumnaEditar As Integer = 18 + Dim ColumnaEliminar As Integer = 19 'Factura de ventas Dim DTConceptos As DataTable @@ -2704,7 +2704,7 @@ Partial Class Ventas End If AC.Dispose() 'columna de Fuente de recaudacion - GvPS.Columns(21).Visible = True + GvPS.Columns(22).Visible = True nomostrar.Visible = True nomostrar2.Visible = True 'GvPS.Width = 1250 @@ -5850,8 +5850,8 @@ Partial Class Ventas End If 'Ocultamos los botones Clonar y Ordenar - GvPS.Columns(19).Visible = False GvPS.Columns(20).Visible = False + GvPS.Columns(21).Visible = False thOrden.Visible = False GvFirmas.DataSource = DTmpF @@ -18370,7 +18370,7 @@ Partial Class Ventas Dim Costo As Decimal = 0 If (CveVenta <= 0 OrElse EsCreaApartirDe) AndAlso DdlTipoComprobante.SelectedValue = "Cot" AndAlso PuedeVerCosto Then - GvPS.Columns(23).Visible = True + GvPS.Columns(10).Visible = True thCosto.Visible = True thCosto2.Visible = True @@ -18383,7 +18383,8 @@ Partial Class Ventas ObjInventarios.Dispose() If Costo > 0 Then - LtlHeaderCosto.Text = String.Format("{0:N2} %", ((TxtPrecio.Text.ToDecimal() - Costo) / TxtPrecio.Text.ToDecimal()) * 100D) + Dim PorUtilidad = String.Format("{0:N2} %", ((TxtPrecio.Text.ToDecimal() - Costo) / TxtPrecio.Text.ToDecimal()) * 100D) + LtlHeaderCosto.Text = String.Format("{0:N2}
{1}", Costo, PorUtilidad) End If End If End If @@ -20109,6 +20110,7 @@ Partial Class Ventas End If TxtObsPS.Text = "" + LtlHeaderCosto.Text = "" TxtPrecio.Text = "" LblTotalPS.Text = "0.00" HdnIVAPS.Value = "-1" @@ -20405,7 +20407,7 @@ Partial Class Ventas Row("TieneProntoPago") = "Si" 'SOLO DEBE MOSTRASE SI EL PAGO ES DE CONTADO If RBLPago.SelectedValue = "2" Then - GvPS.Columns(22).Visible = True + GvPS.Columns(23).Visible = True thProntoPago.Visible = True thProntoPago2.Visible = True End If @@ -21641,11 +21643,11 @@ Partial Class Ventas Dim PuedeVerCosto As Boolean = UsuarioActual.TienePermisoProceso(201) OrElse UsuarioActual.TienePermisoProceso(385) If (CveVenta <= 0 OrElse EsCreaApartirDe) AndAlso UsuarioActual.Empresa.Funcionalidad(382) = "1" AndAlso DdlTipoComprobante.SelectedValue = "Cot" AndAlso PuedeVerCosto Then - GvPS.Columns(23).Visible = True + GvPS.Columns(10).Visible = True thCosto.Visible = True thCosto2.Visible = True Else - GvPS.Columns(23).Visible = False + GvPS.Columns(10).Visible = False thCosto.Visible = False thCosto2.Visible = False End If @@ -24323,11 +24325,11 @@ Partial Class Ventas If UsuarioActual.Empresa.Funcionalidad(531) = "1" Then If RBLPago.SelectedValue = "2" Then - GvPS.Columns(22).Visible = True + GvPS.Columns(23).Visible = True thProntoPago.Visible = True thProntoPago2.Visible = True Else - GvPS.Columns(22).Visible = False + GvPS.Columns(23).Visible = False thProntoPago.Visible = False thProntoPago2.Visible = False End If @@ -27389,9 +27391,9 @@ Partial Class Ventas 'Ocultamos los botones Editar, Clonar y Ordenar - GvPS.Columns(17).Visible = False - GvPS.Columns(19).Visible = False + GvPS.Columns(18).Visible = False GvPS.Columns(20).Visible = False + GvPS.Columns(21).Visible = False thOrden.Visible = False DdlVendedor.SelectedValue = DbRowVenta("CveVendedor").ToString() @@ -31915,10 +31917,10 @@ Partial Class Ventas 'REINICIALIZA GENERALES PS LbAgregar.Visible = False - GvPS.Columns(17).Visible = False GvPS.Columns(18).Visible = False GvPS.Columns(19).Visible = False GvPS.Columns(20).Visible = False + GvPS.Columns(21).Visible = False thOrden.Visible = False DivRemisionesFacturadas.Visible = False @@ -32607,7 +32609,7 @@ Partial Class Ventas End If If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then - GvPS.Columns(19).Visible = True + GvPS.Columns(20).Visible = True End If UpPS.Update() @@ -34384,8 +34386,8 @@ Partial Class Ventas DdlLineaAdicional_SelectedIndexChanged(DdlLineaAdicional, EventArgs.Empty) 'HABILITA EDITAR Y ELIMINAR DEL GV - GvPS.Columns(17).Visible = True GvPS.Columns(18).Visible = True + GvPS.Columns(19).Visible = True SetPermisos() @@ -34825,6 +34827,7 @@ Partial Class Ventas 'LIMPIAR LAS VARIABLES TxtCantidad.Text = "" TxtPrecio.Text = "" + LtlHeaderCosto.Text = "" HdnPS.Value = "-1" DdlPS.SelectedValue = "-1" DdlPS.SelectedText = "-" @@ -34856,6 +34859,7 @@ Partial Class Ventas HdnCvePSComparar.Value = "-1" TxtCantidad.Text = "" TxtPrecio.Text = "" + LtlHeaderCosto.Text = "" HdnPS.Value = "-1" DdlPS.SelectedValue = "-1" DdlPS.SelectedText = "-" @@ -36055,7 +36059,7 @@ Partial Class Ventas End If AC.Dispose() 'columna de Fuente de recaudacion - GvPS.Columns(21).Visible = True + GvPS.Columns(22).Visible = True nomostrar.Visible = True nomostrar2.Visible = True 'GvPS.Width = 1250