diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index 907d3f8ac..6cb3a0a26 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -563,7 +563,7 @@ Public Class ClsClientes Optional ObservacionRevsion As String = "-1", Optional ReferenciaFiscal As String = "-1", Optional Celular As String = "-1", Optional ExtOtros As String = "-1", Optional CveUsoCFDI As Integer = -1, Optional CveFormaPago33 As Integer = -1, Optional CveMetodoPago33 As Integer = -1, Optional DesglosaIEPS As Boolean = True, Optional AplicaComercioExterior As Boolean = False, Optional CveTipoOperacion As Integer = -1, Optional CvePedimento As Integer = -1, Optional CveIncoterm As Integer = -1, Optional CvePais As Integer = -1, Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1, Optional CveColonia As Integer = -1, Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False, - Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1) As Boolean + Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -695,6 +695,8 @@ Public Class ClsClientes .Add("@LG", SqlDbType.VarChar).Value = LG .Add("@EsDistribuidor", SqlDbType.Bit).Value = EsDistribuidor .Add("@TipoCliente", SqlDbType.Int).Value = TipoCliente + .Add("@CargoUsado", SqlDbType.Bit).Value = CargoUsado + .Add("@BonificacionUsado", SqlDbType.Bit).Value = BonificacionUsado .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue End With @@ -740,7 +742,7 @@ Public Class ClsClientes Optional AplicaComercioExterior As Boolean = False, Optional CveTipoOperacion As Integer = -1, Optional CvePedimento As Integer = -1, Optional CveIncoterm As Integer = -1, Optional CvePais As Integer = -1, Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1, Optional CveColonia As Integer = -1, Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "-1", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False, - Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1) As Boolean + Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -888,6 +890,8 @@ Public Class ClsClientes .Add("@LG", SqlDbType.VarChar).Value = LG .Add("@EsDistribuidor", SqlDbType.Bit).Value = EsDistribuidor .Add("@TipoCliente", SqlDbType.Int).Value = TipoCliente + .Add("@CargoUsado", SqlDbType.Bit).Value = CargoUsado + .Add("@BonificacionUsado", SqlDbType.Bit).Value = BonificacionUsado End With Try SqlAdapter.Fill(Data) diff --git a/Empresas/Grales/FormatoClientes.xlsx b/Empresas/Grales/FormatoClientes.xlsx index 2f8489a16..cec900055 100644 Binary files a/Empresas/Grales/FormatoClientes.xlsx and b/Empresas/Grales/FormatoClientes.xlsx differ diff --git a/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx b/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx index a5159403a..cec900055 100644 Binary files a/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx and b/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx differ diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb index be0979ef5..fd11cad67 100644 --- a/General/SaldosIniciales.aspx.vb +++ b/General/SaldosIniciales.aspx.vb @@ -761,6 +761,8 @@ Partial Class General_SaldosIniciales Dim CveVendedor As Integer = GlobalDTVendedores(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveVendedor", $"Vendedor = '{Vendedor}'").ToString.ToEntero Dim CveClasificación As Integer = GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveClasificacion", $"Clasificacion = '{Clasificacion}'").ToString.ToEntero Dim EsDistribuidor As Boolean = If(Row("Es distribuidor").ToString = "si", True, False) + Dim CargoUsado As Boolean = If(Row("CargoUsado").ToString = "si", True, False) + Dim BonificacionUsado As Boolean = If(Row("BonificacionUsado").ToString = "si", True, False) If CveCliente > 0 Then ExisteCliente = True @@ -773,7 +775,7 @@ Partial Class General_SaldosIniciales 'End If Else If Not ObjClientes.AddCliente(RazonSocial, RazonSocial, Calle, "", "", Colonia, "", "", Estado, Pais, RFC, CodigoPostal, "", "", Contacto, "", "", "", "", -1, False, 0, 0, False, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, "", CveVendedor, -1, -1, - "-1", "-1", -1, "-1", -1, "0", -1, "0", 0, "", 0, "", 0, "", 0, "", "", "", Codigo, 0, "", 1, False, "", "", "", False, "", "", "", "", "", False, "", "", "", False, 0, -1, EsDistribuidor:=EsDistribuidor, CveClienteClasificacion:=CveClasificación) Then + "-1", "-1", -1, "-1", -1, "0", -1, "0", 0, "", 0, "", 0, "", 0, "", "", "", Codigo, 0, "", 1, False, "", "", "", False, "", "", "", "", "", False, "", "", "", False, 0, -1, EsDistribuidor:=EsDistribuidor, CveClienteClasificacion:=CveClasificación, CargoUsado:=CargoUsado, BonificacionUsado:=BonificacionUsado) Then ErrorClientes = True RFC.GuardaLog Exit For diff --git a/Ventas/Clientes.aspx b/Ventas/Clientes.aspx index 371c4b76a..335313d22 100644 --- a/Ventas/Clientes.aspx +++ b/Ventas/Clientes.aspx @@ -584,7 +584,14 @@ - +
+ + +
+
+ + +