AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://adsistemasof.sytes.net:8383/SIG

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2020-04-16 09:45:38 -07:00
parent 828265f5e6 210267e2df
commit b552789f8f
7 changed files with 2649 additions and 2640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
App_Code/ClsCRM.vb
View File

@@ -273,7 +273,7 @@ Public Class ClsCRM
Return Retorno
End Function
Public Function AddMedioCaptacion(MedioCaptacion As String, Descripcion As String, CveEmpresa As Integer, CveUsuarioIng As Integer) As Boolean
Public Function AddMedioCaptacion(MedioCaptacion As String, Descripcion As String, CveEmpresa As Integer, CveUsuarioIng As Integer, Optional CveTipoProceso As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_CRM_MedioCaptacionAdd")
With SqlAdapter.SelectCommand.Parameters
@@ -281,6 +281,7 @@ Public Class ClsCRM
.Add("@Descripcion", SqlDbType.VarChar).Value = Descripcion
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@CveUsuarioIng", SqlDbType.Int).Value = CveUsuarioIng
.Add("@CveTipoProceso", SqlDbType.Int).Value = CveTipoProceso
End With
Try
SqlAdapter.Fill(Data)
@@ -291,7 +292,8 @@ Public Class ClsCRM
Return Retorno
End Function
Public Function UpdateMedioCaptacion(MedioCaptacion As String, Descripcion As String, CveEstatus As Boolean, CveMedioCaptacion As Integer) As Boolean
Public Function UpdateMedioCaptacion(MedioCaptacion As String, Descripcion As String, CveEstatus As Boolean, CveMedioCaptacion As Integer,
Optional CveTipoProceso As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_CRM_MedioCaptacionUpdate")
With SqlAdapter.SelectCommand.Parameters
@@ -299,6 +301,7 @@ Public Class ClsCRM
.Add("@Descripcion", SqlDbType.VarChar).Value = Descripcion
.Add("@CveEstatus", SqlDbType.Bit).Value = CveEstatus
.Add("@CveMedioCaptacion", SqlDbType.Int).Value = CveMedioCaptacion
.Add("@CveTipoProceso", SqlDbType.Int).Value = CveTipoProceso
End With
Try
SqlAdapter.Fill(Data)
@@ -590,13 +593,14 @@ Public Class ClsCRM
Return Retorno
End Function
Public Function AddProbabilidadAcercamiento(ProbabilidadAcercamiento As String, CveEmpresa As Integer, CveUsuarioIng As Integer) As Boolean
Public Function AddProbabilidadAcercamiento(ProbabilidadAcercamiento As String, CveEmpresa As Integer, CveUsuarioIng As Integer, Optional CveTipoProceso As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_CRM_ProbabilidadAcercamientoAdd")
With SqlAdapter.SelectCommand.Parameters
.Add("@ProbabilidadAcercamiento", SqlDbType.VarChar).Value = ProbabilidadAcercamiento
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@CveUsuarioIng", SqlDbType.Int).Value = CveUsuarioIng
.Add("@CveTipoProceso", SqlDbType.Int).Value = CveTipoProceso
End With
Try
SqlAdapter.Fill(Data)
@@ -607,7 +611,8 @@ Public Class ClsCRM
Return Retorno
End Function
Public Function UpdateProbabilidadAcercamiento(ProbabilidadAcercamiento As String, CveEstatus As Boolean, CveProbabilidadAcercamiento As Integer) As Boolean
Public Function UpdateProbabilidadAcercamiento(ProbabilidadAcercamiento As String, CveEstatus As Boolean, CveProbabilidadAcercamiento As Integer,
Optional CveTipoProceso As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_CRM_ProbabilidadAcercamientoUpdate")
With SqlAdapter.SelectCommand.Parameters
@@ -615,6 +620,7 @@ Public Class ClsCRM
.Add("@CveEstatus", SqlDbType.Bit).Value = CveEstatus
.Add("@CveProbabilidadAcercamiento", SqlDbType.Int).Value = CveProbabilidadAcercamiento
.Add("@CveTipoProceso", SqlDbType.Int).Value = CveTipoProceso
End With
Try
SqlAdapter.Fill(Data)

4
App_Code/ClsPaginas.vb
View File

@@ -4123,8 +4123,8 @@ Public Class ClsPaginas
PaginaDict.Add("/CRM/RepAcercamientosEtapas.aspx".ToUpper(), 1310)
PaginaDict.Add("/CRM/RepAcercamientos.aspx".ToUpper(), 1311)
PaginaDict.Add("/CRM/PopUpBuscarAcercamiento.aspx".ToUpper(), 1312)
PaginaDict.Add("/CRM/RepAcercamientosProcesos.aspx".ToUpper(), -1)
PaginaDict.Add("/CRM/RepAcercamientosRechazos.aspx".ToUpper(), -1)
PaginaDict.Add("/CRM/RepAcercamientosProcesos.aspx".ToUpper(), 1313)
PaginaDict.Add("/CRM/RepAcercamientosRechazos.aspx".ToUpper(), 1314)
PaginaDict.Add("/CRM/RepAcercamientosProcesosDetalle.aspx".ToUpper(), -1)
PaginaDict.Add("/CRM/CatMetas.aspx".ToUpper(), 684)
#End Region

10
App_Code/ClsProductosServicios.vb
View File

@@ -385,7 +385,7 @@ Public Class ClsProductosServicios
AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveMetodoInventario As Integer, EsPaquete As Integer,
Optional CveTipoPS As Integer = -1, Optional FuePorXML As Boolean = True, Optional TipoServicio As Integer = -1, Optional CveClasificacion2 As Integer = -1,
Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1,
Optional CveConceptoContable As Integer = -1, Optional CveCompuesto As Integer = -1, Optional CveSATPS As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Integer = 0,
Optional CveConceptoContable As Integer = -1, Optional CveCompuesto As Integer = -1, Optional CveSATPS As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0,
Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1,
Optional CveFraccionArancelaria As Integer = -1, Optional CveClasificacionDetalle As Integer = -1, Optional CveTamaño As Integer = -1,
Optional CveModelo As Integer = -1, Optional CveMedida As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional ClaveImpuestoEmpaque As String = "", Optional ClaveImpuestoUM As String = "",
@@ -428,7 +428,7 @@ Public Class ClsProductosServicios
'Nuevo R: 26/09/2017'
.Add("@Inventariable", SqlDbType.Bit).Value = Inventariable
.Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedorCompra
.Add("@VentaMinima", SqlDbType.Int).Value = VentaMinima
.Add("@VentaMinima", SqlDbType.Decimal).Value = VentaMinima
'Nuevo R: 08/11/2017'
.Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda
@@ -522,7 +522,7 @@ Public Class ClsProductosServicios
'Nuevo R: 26/09/2017'
.Add("@Inventariable", SqlDbType.Bit).Value = PS.Inventariable
.Add("@CveProveedorCompra", SqlDbType.Int).Value = PS.CveProveedorCompra
.Add("@VentaMinima", SqlDbType.Int).Value = PS.VentaMinima
.Add("@VentaMinima", SqlDbType.Decimal).Value = PS.VentaMinima
'Nuevo R: 08/11/2017'
.Add("@CveMoneda", SqlDbType.Int).Value = PS.CveMoneda
@@ -604,7 +604,7 @@ Public Class ClsProductosServicios
Public Function UpdatePS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, Codigo2 As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer,
AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, Estado As Boolean, CveUsuario As Integer, CvePS As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, CveSATPS As Integer, Optional CveTipoPS As Integer = -1, Optional TipoServicio As Integer = -1,
Optional CveClasificacion2 As Integer = -1, Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1,
Optional CveConceptoContable As Integer = -1, Optional CveCompuesto As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Integer = 0,
Optional CveConceptoContable As Integer = -1, Optional CveCompuesto As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0,
Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1,
Optional CveFraccionArancelaria As Integer = -1, Optional CveUsuarioModifico As Integer = -1,
Optional CveClasificacionDetalle As Integer = -1, Optional CveTamaño As Integer = -1, Optional CveModelo As Integer = -1, Optional CveMedida As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional ClaveImpuestoEmpaque As String = "", Optional ClaveImpuestoUM As String = "",
@@ -646,7 +646,7 @@ Public Class ClsProductosServicios
'Nuevo R: 26/09/2017'
.Add("@Inventariable", SqlDbType.Bit).Value = Inventariable
.Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedorCompra
.Add("@VentaMinima", SqlDbType.Int).Value = VentaMinima
.Add("@VentaMinima", SqlDbType.Decimal).Value = VentaMinima
'Nuevo R: 08/11/2017'
.Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda

2
App_Code/Modelos.vb
View File

@@ -9849,7 +9849,7 @@ Namespace Modelos
Public Property Inventariable As Boolean?
Public Property CveProveedorCompra As Integer?
Public Property ProveedorCompra As String
Public Property VentaMinima As Integer?
Public Property VentaMinima As Decimal?
Public Property RetISR As Integer?
Public Property SATClaveProductoServicio As String
Public Property PrecioMinimo As Double?

5
Bancos/ProductosFinancieros.aspx.vb
View File

@@ -304,6 +304,7 @@ Partial Class Bancos_ProductosFinancieros
Dim CvePrePoliza = -1
Dim IdPoliza = -1
Dim FolioPoliza As Integer = -1
Dim CveIE As Integer = -1
CvePrePoliza = ObjMov.AddPrePolizas("ProductosFinancieros/Registrar", DdlTipoMovimiento.SelectedValue.ToEntero, Importe, Importe, CveMoneda, TxtFecha.Text.ToDate, TxtConcepto.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
@@ -406,6 +407,7 @@ Partial Class Bancos_ProductosFinancieros
IdPoliza = ObjContaAC.AddPoliza(3, TxtConcepto.Text.Trim, Importe, Importe, UsuarioActual.CveUsuario, TxtFecha.Text.ToDate)
If IdPoliza > 0 Then
FolioPoliza = ObjContaAC.Folio
Dim DtPresupuestosTemp As DataTable
Dim IdCuentaComprometido, IdCuentaPorEjercer, IdCuentaDevengado, IdCuentaMatriz, IdCuentaEjercido, IdCuentaPagado As Integer
@@ -493,6 +495,7 @@ Partial Class Bancos_ProductosFinancieros
IdPoliza = ObjContaAC.AddPoliza(1, TxtConcepto.Text.Trim, Importe, Importe, UsuarioActual.CveUsuario, Fecha)
If IdPoliza > 0 Then
FolioPoliza = ObjContaAC.Folio
Dim DtPresupuestosTemp As DataTable
Dim IdCuentaPorEjecutar, IdCuentaDevengado, IdCuentaRecaudado, IdCuentaMatriz As Integer
@@ -559,7 +562,7 @@ Partial Class Bancos_ProductosFinancieros
End If
If Not ErrorTransaccion AndAlso Not ErrorAC Then
If Not ObjMov.UpdatePrePoliza(TxtFecha.Text.ToDate, -1, -1, IdPoliza, CvePrePoliza, UsuarioActual.CveEmpresa) Then
If Not ObjMov.UpdatePrePoliza(TxtFecha.Text.ToDate, FolioPoliza, -1, IdPoliza, CvePrePoliza, UsuarioActual.CveEmpresa) Then
ErrorAC = True
ErrorTransaccion = True
End If

6
RH/Personal.aspx.vb
View File

@@ -298,11 +298,11 @@ Partial Class RH_Personal
End Set
End Property
Private Property PU As Double
Private Property PU As Decimal
Get
Return CInt(ViewState("PU"))
End Get
Set(value As Double)
Set(value As Decimal)
ViewState("PU") = value
End Set
End Property
@@ -4908,7 +4908,7 @@ Partial Class RH_Personal
CveAlmacenUniforme = rowInfo.Item("CveAlmacen").ToString.ToEntero
DescripcionUniforme = rowInfo.Item("CodigoPS").ToString
PU = rowInfo.Item("PU").ToString.ToDouble
PU = rowInfo.Item("PU").ToString.ToDecimal
CveUM = rowInfo.Item("CveUM").ToString.ToEntero
CvePS = rowInfo.Item("CvePS").ToString.ToEntero

5248
Ventas/ProductosServicios.aspx.vb
View File

File diff suppressed because it is too large Load Diff