Puntos GDiaz:
--visualizar el costo del producto y su % de utilidad, último costo. ,considernado el permiso para visualizar importe de costo.
This commit is contained in:
@@ -1080,8 +1080,6 @@
|
||||
<asp:UpdatePanel ID="UpPS" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div style="overflow-x: auto; width: 100%;">
|
||||
|
||||
<%--<asp:Panel ID="PnlTitulosPS" runat="server" DefaultButton="LbAgregar">--%>
|
||||
<table border="0" style="min-width: 980px;" id="tbps" class="table table-striped Widthall">
|
||||
<%--width="100%"--%>
|
||||
<tr class="Titulos TextTab">
|
||||
@@ -1112,6 +1110,10 @@
|
||||
<asp:Label runat="server" ID="LblProyectoHeader" Text="" />
|
||||
<asp:Label runat="server" ID="LblSubProyecto" Text="" /></th>
|
||||
<th>P.U. <asp:LinkButton ID="ImgDescPU" runat="server" Text="<i class='fa fa-comment-o'></i>" Style="cursor: pointer;" AlternateText="Agregar Descuento" Visible="false" /></th>
|
||||
<th runat="server" visible="false" id="thCosto2">
|
||||
Costo <br />
|
||||
Utilidad
|
||||
</th>
|
||||
<th id="thEncDesc1" runat="server" visible="true">Desc
|
||||
</th>
|
||||
<th id="thPredial1" runat="server" visible="false">Predial
|
||||
@@ -1133,7 +1135,7 @@
|
||||
<th></th>
|
||||
<th runat="server" visible="false" id="nomostrar2"></th>
|
||||
<th runat="server" visible="false" id="thProntoPago2"></th>
|
||||
<th runat="server" visible="false" id="thCosto2"></th>
|
||||
|
||||
</tr>
|
||||
<tr class="TextTab" runat="server" id="TrEdit">
|
||||
<th>
|
||||
@@ -1239,6 +1241,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<th runat="server" visible="false" id="thCosto">
|
||||
<asp:Literal ID="LtlHeaderCosto" runat="server" Text=""></asp:Literal>
|
||||
</th>
|
||||
<th id="thEncDesc2" runat="server" visible="true"></th>
|
||||
<th id="thPredial2" runat="server" visible="false">
|
||||
<asp:TextBox ID="TxtCuentaPredial" runat="server" Width="75px" CssClass="form-control input-sm" type="number"></asp:TextBox>
|
||||
@@ -1260,12 +1265,8 @@
|
||||
<th runat="server" id="thOrden"></th>
|
||||
<th runat="server" visible="false" id="nomostrar"></th>
|
||||
<th runat="server" visible="false" id="thProntoPago"></th>
|
||||
<th runat="server" visible="false" id="thCosto">
|
||||
<asp:Literal ID="LtlHeaderCosto" runat="server" Text=""></asp:Literal>
|
||||
</th>
|
||||
</tr>
|
||||
</table>
|
||||
<%--</asp:Panel>--%>
|
||||
|
||||
<asp:GridView ID="GvPS" GridLines="None" runat="server" data-tableheader="#tbps" ShowHeader="true" AutoGenerateColumns="False"
|
||||
DataKeyNames="Consec,CvePS,Total, IEPS, CveClasificacion,Clasificacion,CveUM,UM,CveProyecto,CveSubProyecto,TipoDocto,PS,Obs,Cantidad,PU,Descuento,IVA,ImporteIVA,CantidadInventario,CantidadFacturadaRem,CveVentaDetalle,CvePromocionDetalle"
|
||||
@@ -1428,6 +1429,13 @@
|
||||
</EditItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--10--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right" Visible="false" ItemStyle-Width="20px" >
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="LblCosto" runat="server"></asp:Label><br />
|
||||
<asp:Label ID="LblCostoPorcentaje" runat="server"></asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--11--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right" HeaderText="">
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlDesc" runat="server" Text='<%# Eval("Descuento", "{0:N2}") %>'></asp:Literal>
|
||||
@@ -1441,7 +1449,7 @@
|
||||
<ajax:ValidatorCalloutExtender ID="VCEDescuentoEdit" runat="server" HighlightCssClass="vco" TargetControlID="CVDescuentoEdit" Width="300px"></ajax:ValidatorCalloutExtender>
|
||||
</EditItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--11--%>
|
||||
<%--12--%>
|
||||
<asp:TemplateField HeaderText="" Visible="False">
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlPredial" runat="server" Text='<%# Eval("CuentaPredial") %>'></asp:Literal>
|
||||
@@ -1450,7 +1458,7 @@
|
||||
<asp:TextBox ID="TxtPredial" runat="server" CausesValidation="true" MaxLength="50" Text='<%# Eval("CuentaPredial") %>' type="number" Width="60px"></asp:TextBox>
|
||||
</EditItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--12--%>
|
||||
<%--13--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="LblIVA" runat="server" Text='<%# Eval("ImporteIVA", "{0:#,##0.00##}") %>'></asp:Label><br />
|
||||
@@ -1458,7 +1466,7 @@
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--<asp:BoundField DataField="ImporteIVA" HeaderText="" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ReadOnly="true" />--%>
|
||||
<%--13--%>
|
||||
<%--14--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="LblIEPS" runat="server" Text='<%# Eval("ImporteIEPS", "{0:#,##0.00##}") %>'></asp:Label><br />
|
||||
@@ -1466,17 +1474,17 @@
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--<asp:BoundField DataField="ImporteIEPS" HeaderText="" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ReadOnly="true" Visible="false" />--%>
|
||||
<%--14--%>
|
||||
<asp:BoundField DataField="ImporteRetIVA" HeaderText="Ret IVA" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ReadOnly="true" Visible="false" />
|
||||
<%--15--%>
|
||||
<asp:BoundField DataField="ImporteRetISR" HeaderText="Ret ISR" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ReadOnly="true" Visible="false" />
|
||||
<asp:BoundField DataField="ImporteRetIVA" HeaderText="Ret IVA" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ReadOnly="true" Visible="false" />
|
||||
<%--16--%>
|
||||
<asp:BoundField DataField="ImporteRetISR" HeaderText="Ret ISR" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ReadOnly="true" Visible="false" />
|
||||
<%--17--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right">
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlTotal" runat="server" Text='<%# If(UsuarioActual.Empresa.Funcionalidad(109) = "1", Eval("TotalConImpuestos", "{0:#,##0.00##}"), Eval("TotalImporte", "{0:#,##0.00##}")) %>'></asp:Literal>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--17--%>
|
||||
<%--18--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Editar">
|
||||
<EditItemTemplate>
|
||||
<div style="width: 85px;">
|
||||
@@ -1490,14 +1498,14 @@
|
||||
CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--18--%>
|
||||
<%--19--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center" HeaderText="Eliminar">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete"
|
||||
CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--19--%>
|
||||
<%--20--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Center">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="LnkExistencias" runat="server" Visible="false" AlternateText="Ver Existencias" CausesValidation="False" CommandName="Existencias" CommandArgument='<%# GvPS.Rows.Count.ToString() %>'
|
||||
@@ -1508,7 +1516,7 @@
|
||||
CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-clone'></i>" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--20--%>
|
||||
<%--21--%>
|
||||
<asp:TemplateField>
|
||||
<HeaderTemplate>
|
||||
<asp:LinkButton ID="LnkOrdenarGvPS" runat="server" CssClass="Texto" Text="<i class='fa fa-retweet'></i>" OnClick="OrdenarGvPS" />
|
||||
@@ -1517,21 +1525,14 @@
|
||||
<asp:TextBox ID="TxtOrden" runat="server" MaxLength="3" Type="number" Width="30px" Text='<%# Eval("Orden") %>' />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--21--%>
|
||||
<%--22--%>
|
||||
<asp:TemplateField HeaderText="Presupuesto de Ingreso" Visible="false">
|
||||
<ItemTemplate>
|
||||
<asp:DropDownList runat="server" ID="DdlFR" AppendDataBoundItems="true" AutoPostBack="true" DataTextField="FuenteRecaudacionCodigoRubroIngreso" DataValueField="CvePresupuestoIngreso" Style="max-width: 100px;" OnSelectedIndexChanged="DdlFR_SelectedIndexChanged"></asp:DropDownList>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--22--%>
|
||||
<asp:BoundField DataField="TieneProntoPago" HeaderText="Pronto Pago" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" ReadOnly="true" Visible="false" />
|
||||
<%--23--%>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Right" Visible="false" ItemStyle-Width="20px" HeaderText="Costo">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="LblCosto" runat="server"></asp:Label><br />
|
||||
<asp:Label ID="LblCostoPorcentaje" runat="server"></asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="TieneProntoPago" HeaderText="Pronto Pago" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" ReadOnly="true" Visible="false" />
|
||||
</Columns>
|
||||
<RowStyle CssClass="Texto" />
|
||||
<AlternatingRowStyle CssClass="TextoAlterno" />
|
||||
|
||||
@@ -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} <br/> {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
|
||||
|
||||
Reference in New Issue
Block a user