diff --git a/OC/OC.aspx.vb b/OC/OC.aspx.vb index b7da299e9..26fe6e0c7 100644 --- a/OC/OC.aspx.vb +++ b/OC/OC.aspx.vb @@ -6582,7 +6582,7 @@ Partial Class OC_OC Dim Proyecto As String = Row("Proyecto").ToString.Trim.ToUpper Dim Observaciones As String = Row("Observaciones").ToString Dim PrecioUnitario As String = Row("PU").ToString - Dim Descuento As Decimal = Row("Descuento").ToString.ToDecimal * Cantidad 'RMF, cambio a multiplicar por cantidad 2018.04.21 + Dim Descuento As Decimal = (Row("Descuento").ToString.ToDecimal * Cantidad).RoundSQL 'RMF, cambio a multiplicar por cantidad 2018.04.21 Dim CvePS As Integer = 0 Dim CveProyecto As Integer = 0 Dim CveSubProyecto As Integer = 0 @@ -6696,7 +6696,7 @@ Partial Class OC_OC Private Function GetPS(Opt As String, Valor As String) As String Dim StrReturn As String = String.Empty Dim CvePS As Integer = 0 - CvePS = GlobalDTPS(UsuarioActual.CveEmpresa, Estatus:=1).FiltroPrimeroValor("CvePS", Opt & " = '" & Valor & "'").ToString.ToEntero + CvePS = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa, Estatus:=1).FiltroPrimeroValor("CvePS", Opt & " = '" & Valor & "'").ToString.ToEntero If CvePS > 0 Then StrReturn = "True|" & CvePS.ToString Else @@ -7266,7 +7266,7 @@ Partial Class OC_OC Private Sub CalculaGenerales() Dim Subtotal As Decimal = DtDetalle.SUMD("Total", "Total > 0") + DtDetalle.SUMD("Descuento") - Dim Descuento As Decimal = DtDetalle.SUMD("Descuento") + Dim Descuento As Decimal = DtDetalle.SUMD("Descuento").RoundSQL Dim SubTotalIEPSIVA As Decimal = DtDetalle.SUMD("IEPSPSIVA") Dim IVA As Decimal = DtDetalle.SUMD("IVA") + SubTotalIEPSIVA Dim SubTotalIEPS As Decimal = DtDetalle.SUMD("IEPSPS")