From 0030a5b81267255439e8e599cce212e3ab7472e2 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Mon, 17 Jun 2024 22:05:36 -0700
Subject: [PATCH] -- filial en cliente, filtro en repventas, y utilidad

---
 App_Code/ClsClientes.vb |  3 ++-
 App_Code/ClsVentas.vb   | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb
index a14a40b36..b415508c3 100644
--- a/App_Code/ClsClientes.vb
+++ b/App_Code/ClsClientes.vb
@@ -165,6 +165,7 @@ Public Class ClsClientes
     Public Property EnDemanda As Boolean = False
     Public Property EnQuebranto As Boolean = False
     Public Property GastosEnvio As Decimal = 0
+    Public Property EsFilial As Boolean = False
 
 
 #End Region
@@ -421,7 +422,7 @@ Public Class ClsClientes
                 _EnQuebranto = CBool(Data(0)("EnQuebranto"))
                 _CreditoRegistroFirmas = Data(0)("CreditoRegistroFirmas").ToString
                 _GastosEnvio = Data(0)("GastosEnvio").ToString.ToDecimal
-
+                _EsFilial = CBool(Data(0)("EsFilial"))
             End If
             Retorno = True
         Catch ex As Exception
diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb
index a79bf4f32..130afb4dd 100644
--- a/App_Code/ClsVentas.vb
+++ b/App_Code/ClsVentas.vb
@@ -1669,7 +1669,7 @@ Public Class ClsVentas
                                  CveVendedor As String, CveUsuario As Integer, CveEstatus As String, IVA As String, CveEmpresa As Integer, Gpo As Integer, Optional TipoDocto As String = "-1",
                                  Optional CveProyecto As Integer = -1, Optional CveSubProyecto As String = "-1", Optional TipoCambio As Integer = 1, Optional TCEspecifico As Decimal = -1, Optional CveUsuarioConsulta As Integer = -1,
                                  Optional CveClienteClasificacion As Integer = -1, Optional CveCondicionesPago As Integer = -1, Optional TipoCliente As Integer = -1, Optional ModalidadContable As Boolean = False,
-                                 Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1, Optional EsFacturaGlobal As Integer = -1) As Boolean
+                                 Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1, Optional EsFacturaGlobal As Integer = -1, Optional EsFilial As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_VentasGetRep")
 
@@ -1701,6 +1701,7 @@ Public Class ClsVentas
             .Add("@CveTipoRelacion", SqlDbType.Int).Value = CveTipoRelacion
             .Add("@ServicioDomicilio", SqlDbType.Int).Value = ServicioDomicilio
             .Add("@EsFacturaGlobal", SqlDbType.Int).Value = EsFacturaGlobal
+            .Add("@EsFilial", SqlDbType.Int).Value = EsFilial
         End With
 
         Try
@@ -1807,7 +1808,7 @@ Public Class ClsVentas
                                         CveSubProyectoEjecucion As Integer, CveEmpresa As Integer, FechaIEjec As Date, FechaFEjec As Date, Optional CveProyecto As Integer = -1,
                                         Optional CveSubProyecto As String = "-1", Optional TipoCambio As Integer = 1, Optional TCEspecifico As Decimal = -1, Optional CveMoneda As Integer = -1, Optional CveUsuarioConsulta As Integer = -1,
                                          Optional CveClienteClasificacion As Integer = -1, Optional CveCondicionesPago As Integer = -1, Optional TipoCliente As Integer = -1, Optional ModalidadContable As Boolean = False,
-                                        Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1, Optional EsFacturaGlobal As Integer = -1) As Boolean
+                                        Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1, Optional EsFacturaGlobal As Integer = -1, Optional EsFilial As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_VentasGetRepDetalle")
 
@@ -1844,6 +1845,7 @@ Public Class ClsVentas
             .Add("@CveTipoRelacion", SqlDbType.Int).Value = CveTipoRelacion
             .Add("@ServicioDomicilio", SqlDbType.Int).Value = ServicioDomicilio
             .Add("@EsFacturaGlobal", SqlDbType.Int).Value = EsFacturaGlobal
+            .Add("@EsFilial", SqlDbType.Int).Value = EsFilial
         End With
 
         Try
@@ -3179,7 +3181,8 @@ Public Class ClsVentas
 
         Return Retorno
     End Function
-    Public Function GetReportePadreVentasUtilidad(CveVendedor As String, CveCliente As Integer, CveSubProyecto As String, FechaInicio As Date, FechaFin As Date, CveEmpresa As Integer, Gpo As Integer, CvePS As Integer, CveCategoria As Integer, CveClasificacion As Integer, CveMarca As Integer, EsGarantia As Integer) As Boolean
+    Public Function GetReportePadreVentasUtilidad(CveVendedor As String, CveCliente As Integer, CveSubProyecto As String, FechaInicio As Date, FechaFin As Date, CveEmpresa As Integer, Gpo As Integer,
+                                                  CvePS As Integer, CveCategoria As Integer, CveClasificacion As Integer, CveMarca As Integer, EsGarantia As Integer, EsFilial As Integer) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Vta_RepVentasUtilidadGet")
 
@@ -3196,6 +3199,7 @@ Public Class ClsVentas
             .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion
             .Add("@CveMarca", SqlDbType.Int).Value = CveMarca
             .Add("@EsGarantia", SqlDbType.Int).Value = EsGarantia
+            .Add("@EsFilial", SqlDbType.Int).Value = EsFilial
         End With
         Try
             SqlAdapter.Fill(Data)
@@ -3528,7 +3532,6 @@ Public Class ClsVentas
         Return Retorno
     End Function
 
-
     'Public Function AddVtaCortesDetalles(CveCorte As Integer, CveMetodoPago As Integer, Importe As Double) As Boolean
     '    Dim Retorno As Boolean = False
     '    DataAdapter("PA_Vta_CortesDetallesAdd")