diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 0f4eea25a..18be4490a 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -2504,7 +2504,7 @@ Public Class ClsVentas End Function Public Function AddPromociones(Promocion As String, FechaInicio As Date, FechaFin As Date, CveVendedor As Integer, CveCliente As Integer, Estatus As Boolean, CveMoneda As Integer, CveUsuario As Integer, CveEmpresa As Integer, CveSubProyecto As Integer, TipoAplicacion As String, - Optional CveMarca As Integer = -1, Optional EsDistribuidor As Integer = -1) As Integer + Optional CveMarca As Integer = -1, Optional EsDistribuidor As Integer = -1, Optional ReqAutorizacion As Boolean = False) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Vta_PromocionesAdd") @@ -2522,6 +2522,7 @@ Public Class ClsVentas .Add("@TipoAplicacion", SqlDbType.VarChar).Value = TipoAplicacion .Add("@CveMarca", SqlDbType.Int).Value = CveMarca .Add("@EsDistribuidor", SqlDbType.Int).Value = EsDistribuidor + .Add("@ReqAutorizacion", SqlDbType.Bit).Value = ReqAutorizacion .Add("@CvePromocion", SqlDbType.Int).Direction = ParameterDirection.Output End With @@ -2668,7 +2669,8 @@ Public Class ClsVentas Public Function AddPromocionesDetalle(CvePromocion As Integer, CvePS As Integer, TipoPromocion As Integer, Promocion As Double, PUAnterior As Double, PUPromocion As Double, AplicaRestriccion As Boolean, AplicaLunes As Boolean, AplicaMartes As Boolean, AplicaMiercoles As Boolean, AplicaJueves As Boolean, AplicaViernes As Boolean, AplicaSabado As Boolean, AplicaDomingo As Boolean, HoraInicio As DateTime, HoraFin As DateTime, Optional CantidadMinima As Integer = 1, - Optional CveClasificacion As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional IncluyeImpuestos As Boolean = False, Optional Opcion As Integer = 1) As Boolean + Optional CveClasificacion As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional IncluyeImpuestos As Boolean = False, Optional Opcion As Integer = 1 + ) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_PromocionesDetalleAdd") @@ -2695,6 +2697,7 @@ Public Class ClsVentas .Add("@CveRinTamaño", SqlDbType.Int).Value = CveRinTamaño .Add("@IncluyeImpuestos", SqlDbType.Bit).Value = IncluyeImpuestos .Add("@Opcion", SqlDbType.Int).Value = Opcion + End With Try diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 87b1c600a..5213950cf 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -3140,6 +3140,7 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("FechaVencimiento", If(CveCompra > 0, dr("FechaVencimiento").ToString.ToDate().ToString("dd/MM/yyyy"), ""))) params.Add(New ReportParameter("NombreCapturo", If(CveCompra > 0, dr("NombreCapturo").ToString, ""))) + params.Add(New ReportParameter("NumeroOrden", If(CveCompra > 0, dr("OCSerieFolioVinculada").ToString, ""))) Else params.Add(New ReportParameter("NombreRecibio", String.Format(Recibio))) diff --git a/Empresas/189/Formatos/Entradas.rdlc b/Empresas/189/Formatos/Entradas.rdlc index 653b09464..b1f0e2451 100644 --- a/Empresas/189/Formatos/Entradas.rdlc +++ b/Empresas/189/Formatos/Entradas.rdlc @@ -179,22 +179,22 @@ - 1.0835cm + 0.97724cm - 1.53251cm + 1.40581cm 1.40148cm - 11.05821cm + 10.82525cm - 2.33994cm + 3.03882cm - 1.86685cm + 1.63389cm 1.96383cm @@ -222,7 +222,7 @@ @@ -275,7 +275,7 @@ @@ -478,7 +478,7 @@ - Costo Unit. + Cos.Unit. @@ -632,7 +632,7 @@ @@ -1899,7 +1899,7 @@ - =Parameters!OCVinculada.Value + =Parameters!NumeroOrden.Value + + + + + + Textbox12 + + + #e36c09 + 2pt + 2pt + 2pt + 2pt + + + + @@ -553,7 +596,6 @@ - true @@ -647,6 +689,35 @@ + + + + true + true + + + + + =Fields!NumeroParte.Value + + + + + + + + + @@ -790,6 +861,7 @@ + @@ -805,7 +877,7 @@ DsOC 0.04788in 0.34081in - 8.16912in + 8.21665in @@ -1700,7 +1772,7 @@ 3.83039in