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

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

Browse Source
This commit is contained in:
Antonio Gonzalez
2020-02-29 13:51:47 -07:00
parent 73d110410e f40454eb9a
commit 8f1fdcd7d6
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OC/OC.aspx.vb
View File

@@ -3682,7 +3682,9 @@ Partial Class OC
Alert("Ocurrió un error al cargar la información del producto para actualizar. Por favor vuelva a intentar.", TipoMensaje.MsgAdvertencia)
Exit Sub
End If
Dim IvaPS = DrPS("IVA").ToString.ToDouble
Dim IvaPS = DrPS("IVA").ToString.ToDecimal
IEPSPS = DrPS("IEPSPorcentaje").ToString.ToDouble
IEPSPSIVA = If(DrPS("IEPSGrabaIVA").ToString = "True", DrPS("IEPSPorcentaje").ToString.ToDecimal, 0)
If CvePS <> CvePSAnterior Or Not CveOrdenCompra > 0 Then
RetISR = DrPS("RetISR").ToString.ToDouble
@@ -3690,8 +3692,8 @@ Partial Class OC
'If IvaPS = -1 Then 'IVA DE LA SUCURSAL
' IvaPS = GlobalDTSubProyectos(-1, gvr.FCDropDownList("DdlSubProyectoEdit").SelectedValue.ToEntero).FiltroPrimeroValor("IVA").ToDouble
'End If
IEPSPS = DrPS("IEPSPorcentaje").ToString.ToDouble
IEPSPSIVA = If(DrPS("IEPSGrabaIVA").ToString = "True", DrPS("IEPSPorcentaje").ToString.ToDouble, 0)
' IEPSPSIVA = If(DrPS("IEPSGrabaIVA").ToString = "True", DrPS("IEPSPorcentaje").ToString.ToDouble, 0)
End If

10
Ventas/RepIngresosDetalle.aspx
View File

@@ -144,6 +144,11 @@
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Tipo">
<ItemTemplate>
<asp:Literal runat="server" Text='<%# Eval("TipoDocto")%>'> </asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="SerieFolio">
<ItemTemplate>
<asp:hyperlink runat="server" Text='<%# Eval("SerieFolio")%>' NavigateUrl='<%# Eval("CveVenta","/Ventas/Ventas.aspx?CveVenta={0}") %>'> </asp:hyperlink>
</ItemTemplate>
@@ -183,6 +188,11 @@
<asp:Label runat="server" Text='<%# Eval("Total", "${0:N2}")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign ="Right">
<ItemTemplate>
<asp:Literal runat="server" Text='<%#If(Eval("EsAmortizacion").ToString = "True", "Si", "No")%>'> </asp:Literal>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</ContentTemplate>