-

App_Code/ClsVentas.vb

@@ -441,22 +441,22 @@ Public Class ClsVentas
     End Function
 
     Public Function AddVenta(TipoDocto As String, FolioFact As Integer, CveCliente As Integer, CveClienteSucursal As Integer, SubTotal As Decimal, Descuento As Decimal, Amortizacion As Decimal, IVA As Decimal, RetIVA As Decimal, RetISR As Decimal, Total As Decimal,
-                             CveMoneda As Integer, TipoCambio As Double, CveMetodoPago As Integer, CondicionesPago As Integer, FormaPago As Integer, FechaVencimiento As DateTime, Fecha As DateTime, MotivoDescuento As String, Observaciones As String, FechaEjecucion As DateTime,
-                             CveVendedor As Integer, Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Double, Num2 As Double, Num3 As Double,
+                             CveMoneda As Integer, TipoCambio As Decimal, CveMetodoPago As Integer, CondicionesPago As Integer, FormaPago As Integer, FechaVencimiento As DateTime, Fecha As DateTime, MotivoDescuento As String, Observaciones As String, FechaEjecucion As DateTime,
+                             CveVendedor As Integer, Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Decimal, Num2 As Decimal, Num3 As Decimal,
                              Fech1 As Date, Fech2 As Date, Fech3 As Date, CveCorte As Integer, NumeroPersonas As Integer, CvePrePoliza As Integer, CveUsuario As Integer, CveEmpresa As Integer,
-                             Optional Propina As Double = -1, Optional CveVentaTerminal As Integer = -1, Optional AtencionA As String = "-1", Optional CveContrato As Integer = -1,
+                             Optional Propina As Decimal = -1, Optional CveVentaTerminal As Integer = -1, Optional AtencionA As String = "-1", Optional CveContrato As Integer = -1,
                              Optional CveVentaPadre As Integer = -1, Optional Det_OrdenCompra As String = "", Optional Det_FechaOrdenCompra As String = "", Optional otros As Decimal = 0,
                              Optional Entrega As String = "-1", Optional Vigencia As DateTime = MinFecha, Optional CveAlmacenTraspasoDestino As Integer = -1, Optional CveAlmacenTraspasoOrigen As Integer = -1, Optional CveDireccionEnvio As Integer = -1,
-                             Optional CveOC As Integer = -1, Optional IEPS As Double = 0, Optional Serie As String = "-1", Optional TelefonoGenerico As String = "", Optional CveCondicionEntrega As Integer = -1, Optional PedidoContrato As String = "-1",
+                             Optional CveOC As Integer = -1, Optional IEPS As Decimal = 0, Optional Serie As String = "-1", Optional TelefonoGenerico As String = "", Optional CveCondicionEntrega As Integer = -1, Optional PedidoContrato As String = "-1",
                              Optional ObservacionesAlmacen As String = "", Optional CveSubProyecto As Integer = -1, Optional CveSubProyectoEjecucion As Integer = -1, Optional CveSubProyectoCobranza As Integer = -1,
-                             Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1, Optional CveUsoCFDI As Integer = -1, Optional OrdenCompra As String = "-1", Optional CveCuentaTerminal As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ImpuestoLocal As Double = 0,
+                             Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1, Optional CveUsoCFDI As Integer = -1, Optional OrdenCompra As String = "-1", Optional CveCuentaTerminal As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ImpuestoLocal As Decimal = 0,
                              Optional CveTipoAmortizacionAnticipo As Integer = -1, Optional CveVentaRelacion As Integer = -1, Optional ImporteRelacion As Decimal = -1, Optional CveEmpresaCRM As Integer = -1, Optional EsInterno As Integer = -1, Optional CveAcercamientoCRM As Integer = -1,
-                             Optional DiasCredito As Integer = 0, Optional EsDiasCreditoFijo As Boolean = False, Optional AnticipoEspecial As Boolean = False, Optional Kilometraje As Double = 0, Optional EsAmortizacion As Boolean = False, Optional CveTipoRetencion As Integer = 0,
+                             Optional DiasCredito As Integer = 0, Optional EsDiasCreditoFijo As Boolean = False, Optional AnticipoEspecial As Boolean = False, Optional Kilometraje As Decimal = 0, Optional EsAmortizacion As Boolean = False, Optional CveTipoRetencion As Integer = 0,
                              Optional CorreoNotificacion As String = "", Optional FormaPaqueteria As Integer = 1, Optional FacturarSucursal As Boolean = False, Optional VentaDesglosaIEPS As Boolean = False, Optional ServicioDomicilio As Boolean = False, Optional RFCReceptor As String = "", Optional Adjunto As String = "-1",
                              Optional DevolucionImportePagado As Decimal = 0, Optional EsGarantia As Boolean = False, Optional CveLineaAdicional As Integer = -1, Optional DescripcionVenta As String = "",
                              Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional RequiereOS As Boolean = False,
                              Optional FechaParaSurtir As DateTime = MinFecha, Optional Paciente As String = "-1", Optional Episodio As String = "-1", Optional EsFacturaGlobal As Boolean = False, Optional CveSATPeriodicidad As Integer = -1, Optional CveSATMes As Integer = -1, Optional SATAnio As Integer = -1, Optional CveMotivoDevolucion As Integer = -1,
-                             Optional CveCobranzaEstatusTurno As Integer = -1, Optional Addenda As String = "") As Boolean
+                             Optional CveCobranzaEstatusTurno As Integer = -1, Optional Addenda As String = "", Optional Bloqueada As Boolean = False) As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_VentasAdd")
@@ -573,6 +573,7 @@ Public Class ClsVentas
             .Add("@CveMotivoDevolucion", SqlDbType.Int).Value = CveMotivoDevolucion
             .Add("@CveCobranzaEstatusTurno", SqlDbType.Int).Value = CveCobranzaEstatusTurno
             .Add("@Addenda", SqlDbType.VarChar).Value = Addenda
+            .Add("@Bloqueada", SqlDbType.Bit).Value = Bloqueada
         End With
         'SqlTypes.SqlDateTime.Null
         Try

App_Code/Modelos.vb

@@ -8037,9 +8037,9 @@ Namespace Modelos
         Public Property Fech2 As Date
         Public Property Fech3 As Date
 
-        Public Property Num1 As Double = 0
-        Public Property Num2 As Double = 0
-        Public Property Num3 As Double = 0
+        Public Property Num1 As Decimal = 0
+        Public Property Num2 As Decimal = 0
+        Public Property Num3 As Decimal = 0
         Public Property DiasCredito As Integer
         Public Property EsDiasCreditoFijo As Boolean
         Public Property CveVentaTerminal As Integer = 0
@@ -8200,6 +8200,7 @@ Namespace Modelos
         Public Property CveMotivoCancelacion As Integer = -1
         Public Property MotivoCancelacion As String = ""
         Public Property TipoContable As Integer = -1
+        Public Property Bloqueada As Boolean = False
         Public Property Addenda As String = ""
 
 #End Region

Ventas/PVCobranza.aspx.vb

@@ -383,7 +383,7 @@ Partial Class Ventas_PVCobranza
             If e.Row.DBCampo("CondicionesPago") = "1" Then ' remis de crédito
                 ' si es de crédito debe de estar autorizado.
                 e.Row.FCLinkButton("BtnPagar").Text = "Crédito"
-                If e.Row.DBCampo("CveEstatusAutorizacion") = "2" Then ' si es autorizada
+                If e.Row.DBCampo("CveEstatusAutorizacion").Contiene("", "2") Then ' si es vacío,significa que no requirió autorización, si es autorizada
                     e.Row.FCLinkButton("BtnPagar").CssClass = "btn btn-xs btn-warning"
                     e.Row.FCLinkButton("BtnPagar").Enabled = True
                 Else