en promociones se agrego el campo "Marca" y en promocion detalle "CveRinTamaño"

App_Code/ClsVentas.vb

@@ -1899,7 +1899,8 @@ Public Class ClsVentas
     End Function
 
 #Region "   PROMOCIONES   "
-    Public Function GetPromociones(CvePromocion As Integer, Fecha As String, CveVendedor As Integer, CveCliente As Integer, Estatus As Integer, CveEmpresa As Integer, CveSubProyecto As Integer) As Boolean
+    Public Function GetPromociones(CvePromocion As Integer, Fecha As String, CveVendedor As Integer, CveCliente As Integer, Estatus As Integer, CveEmpresa As Integer,
+                                   CveSubProyecto As Integer, Optional CveMarca As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_PromocionesGet")
 
@@ -1911,6 +1912,7 @@ Public Class ClsVentas
             .Add("@CveCliente", SqlDbType.Int).Value = CveCliente
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
             .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+            .Add("@CveMarca", SqlDbType.Int).Value = CveMarca
         End With
 
         Try
@@ -1922,7 +1924,9 @@ Public Class ClsVentas
 
         Return Retorno
     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) As Integer
+    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) As Integer
         Dim Retorno = -1
         DataAdapter("PA_Vta_PromocionesAdd")
 
@@ -1939,6 +1943,7 @@ Public Class ClsVentas
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
             .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
             .Add("@TipoAplicacion", SqlDbType.VarChar).Value = TipoAplicacion
+            .Add("@CveMarca", SqlDbType.Int).Value = CveMarca
             .Add("@CvePromocion", SqlDbType.Int).Direction = ParameterDirection.Output
         End With
 
@@ -1951,7 +1956,8 @@ Public Class ClsVentas
 
         Return Retorno
     End Function
-    Public Function UpdatePromociones(Promocion As String, FechaInicio As Date, FechaFin As Date, CveVendedor As Integer, CveCliente As Integer, Estatus As Boolean, CveMoneda As Integer, CveUsuario As Integer, CvePromocion As Integer, CveSubProyecto As Integer) As Boolean
+    Public Function UpdatePromociones(Promocion As String, FechaInicio As Date, FechaFin As Date, CveVendedor As Integer, CveCliente As Integer, Estatus As Boolean,
+                                      CveMoneda As Integer, CveUsuario As Integer, CvePromocion As Integer, CveSubProyecto As Integer, Optional CveMarca As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_PromocionesUpdate")
 
@@ -1967,6 +1973,7 @@ Public Class ClsVentas
             .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
             .Add("@CvePromocion", SqlDbType.Float).Value = CvePromocion
             .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+            .Add("@CveMarca", SqlDbType.Int).Value = CveMarca
         End With
 
         Try
@@ -2043,7 +2050,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) As Boolean
+                                          Optional CveClasificacion As Integer = -1, Optional CveRinTamaño As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_PromocionesDetalleAdd")
 
@@ -2067,6 +2074,7 @@ Public Class ClsVentas
             .Add("@HoraFin", SqlDbType.DateTime).Value = HoraFin
             .Add("@CantidadMinima", SqlDbType.Int).Value = CantidadMinima
             .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion
+            .Add("@CveRinTamaño", SqlDbType.Int).Value = CveRinTamaño
         End With
 
         Try
@@ -2081,7 +2089,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) As Boolean
+                                             Optional CantidadMinima As Integer = 1, Optional CveClasificacion As Integer = -1, Optional CveRinTamaño As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_PromocionesDetalleUpdate")
 
@@ -2106,6 +2114,7 @@ Public Class ClsVentas
             .Add("@CvePromocionDetalle", SqlDbType.Int).Value = CvePromocionDetalle
             .Add("@CantidadMinima", SqlDbType.Int).Value = CantidadMinima
             .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion
+            .Add("@CveRinTamaño", SqlDbType.Int).Value = CveRinTamaño
         End With
 
         Try