diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 480201076..525209743 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -2086,7 +2086,7 @@ 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) As Boolean + Optional CveClasificacion As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional IncluyeImpuestos As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_PromocionesDetalleAdd") @@ -2111,6 +2111,7 @@ Public Class ClsVentas .Add("@CantidadMinima", SqlDbType.Int).Value = CantidadMinima .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion .Add("@CveRinTamaño", SqlDbType.Int).Value = CveRinTamaño + .Add("@IncluyeImpuestos", SqlDbType.Bit).Value = IncluyeImpuestos End With Try @@ -2125,7 +2126,7 @@ Public Class ClsVentas Public Function UpdatePromocionesDetalle(CvePromocionDetalle As Integer, 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) As Boolean + Optional CantidadMinima As Integer = 1, Optional CveClasificacion As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional IncluyeImpuestos As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_PromocionesDetalleUpdate") @@ -2151,6 +2152,7 @@ Public Class ClsVentas .Add("@CantidadMinima", SqlDbType.Int).Value = CantidadMinima .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion .Add("@CveRinTamaño", SqlDbType.Int).Value = CveRinTamaño + .Add("@IncluyeImpuestos", SqlDbType.Bit).Value = IncluyeImpuestos End With Try diff --git a/Empresas/72/Formatos/SolicitudVacaciones.docx b/Empresas/72/Formatos/SolicitudVacaciones.docx index 6ada065ec..84c037c87 100644 Binary files a/Empresas/72/Formatos/SolicitudVacaciones.docx and b/Empresas/72/Formatos/SolicitudVacaciones.docx differ diff --git a/Ventas/Promociones.aspx b/Ventas/Promociones.aspx index 55bbb30a8..d6b4ccc97 100644 --- a/Ventas/Promociones.aspx +++ b/Ventas/Promociones.aspx @@ -177,7 +177,7 @@