AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://oirigoyen@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
rakcsle
2021-07-20 14:45:01 -07:00
parent 8b1b610ee7 6db2acfecb
commit 13b418ebde
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Contratos/ContratoObra.aspx.vb
View File

@@ -3334,7 +3334,7 @@ Partial Class Contratos_ContratoObra
Dim StrReturn As String = String.Empty
Dim CvePS As Integer = 0
CvePS = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CvePS", Opt & " = '" & Valor & "'").ToString.ToEntero
CvePS = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CvePS", String.Format("{0}= '{1}'", Opt, Valor.Replace("'", ""))).ToString.ToEntero
If CvePS > 0 Then
StrReturn = "True|" & CvePS.ToString

20
Ventas/RepVentasUtilidad.aspx
View File

@@ -231,9 +231,9 @@
<div id="dvCa" style="width: 100%; top: 40px">
<table id="dTable" class="correcto table Widthall Titulos">
<tr>
<td id="dvInv" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 42%; font-size: 14px;"><b>Venta</b></td>
<td id="dvVen" runat="server" class="dataTables_scrollHead" style="text-align: center!important; font-size: 14px; border-right-color: white!important; border-left-color: white!important; width: 25%; border-style: solid;"><b>Costo</b></td>
<td id="dvUt" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 42%; font-size: 14px;"><b>Utilidad/Pérdida</b></td>
<td id="dvInv" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 37%; font-size: 14px;"><b>Venta</b></td>
<td id="dvVen" runat="server" class="dataTables_scrollHead" style="text-align: center!important; font-size: 14px; border-right-color: white!important; border-left-color: white!important; width: 22%; border-style: solid;"><b>Costo</b></td>
<td id="dvUt" runat="server" class="dataTables_scrollHead" style="text-align: center!important; width: 46%; font-size: 14px;"><b>Utilidad/Pérdida</b></td>
</tr>
</table>
</div>
@@ -262,6 +262,16 @@
</asp:TemplateField>
<asp:HyperLinkField Text="Ir" DataNavigateUrlFields="CveMovimiento" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="2.5%" DataNavigateUrlFormatString="/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}" />
<asp:TemplateField HeaderText="$ Neto" ItemStyle-Width="7.5%" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:HyperLink ID="HlNeto" runat="server" Text='<%# If(Eval("Neto").ToString() = "0", "-", Eval("Neto", "{0:#,##0.00}")) %>'></asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="% Neto" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:HyperLink ID="HlPorNeto" runat="server" Text='<%# If(Eval("PorNeto").ToString() = "0", "-", Eval("PorNeto", "{0:#,##0.00}%")) %>'></asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Utilidad" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
@@ -269,7 +279,7 @@
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="%" ItemStyle-Width="7.5%" ItemStyle-HorizontalAlign="Right">
<asp:TemplateField HeaderText="%" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:HyperLink ID="HlPorGanancia" runat="server" Text='<%# If(Eval("PorUtilidad").ToString() = "0", "-", Eval("PorUtilidad", "{0:#,##0.00}%")) %>'></asp:HyperLink>
</ItemTemplate>
@@ -281,7 +291,7 @@
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="%" ItemStyle-Width="7.5%" ItemStyle-HorizontalAlign="Right">
<asp:TemplateField HeaderText="%" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:HyperLink ID="HlPorPerdida" runat="server" Text='<%# If(Eval("PorPerdida").ToString() = "0", "-", Eval("PorPerdida", "{0:#,##0.00}%")) %>'></asp:HyperLink>
</ItemTemplate>

5
Ventas/Ventas.aspx.vb
View File

@@ -2452,9 +2452,12 @@ Partial Class Ventas
ObjInv.Dispose()
End If
'regenrea el tipo de cambio
CargaNuevaFactura(Nothing)
CambiaMoneda()
'NOTA DE CREDITO
If NuevaFactura = 2 Then